From f09d7b2a50232c4caadb052347b9c911053ac30c Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Fri, 20 Feb 2015 14:37:55 +1300
Subject: [PATCH] Bug 1124031 part 2 - Rename EMELog.h to EMEUtils.h. r=bz

--HG--
rename : dom/media/eme/EMELog.cpp => dom/media/eme/EMEUtils.cpp
rename : dom/media/eme/EMELog.h => dom/media/eme/EMEUtils.h
---
 dom/media/eme/CDMCallbackProxy.cpp         | 2 +-
 dom/media/eme/CDMCaps.cpp                  | 4 ++--
 dom/media/eme/CDMProxy.cpp                 | 2 +-
 dom/media/eme/{EMELog.cpp => EMEUtils.cpp} | 2 +-
 dom/media/eme/{EMELog.h => EMEUtils.h}     | 0
 dom/media/eme/MediaKeySystemAccess.cpp     | 1 +
 dom/media/eme/MediaKeys.cpp                | 2 +-
 dom/media/eme/moz.build                    | 4 ++--
 8 files changed, 9 insertions(+), 8 deletions(-)
 rename dom/media/eme/{EMELog.cpp => EMEUtils.cpp} (95%)
 rename dom/media/eme/{EMELog.h => EMEUtils.h} (100%)

diff --git a/dom/media/eme/CDMCallbackProxy.cpp b/dom/media/eme/CDMCallbackProxy.cpp
index 29471fba7541..c8c6252a70c8 100644
--- a/dom/media/eme/CDMCallbackProxy.cpp
+++ b/dom/media/eme/CDMCallbackProxy.cpp
@@ -13,7 +13,7 @@
 #include "nsContentCID.h"
 #include "nsServiceManagerUtils.h"
 #include "MainThreadUtils.h"
-#include "EMELog.h"
+#include "mozilla/EMEUtils.h"
 
 namespace mozilla {
 
diff --git a/dom/media/eme/CDMCaps.cpp b/dom/media/eme/CDMCaps.cpp
index 9882116450a8..bc0bf6628630 100644
--- a/dom/media/eme/CDMCaps.cpp
+++ b/dom/media/eme/CDMCaps.cpp
@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "CDMCaps.h"
-#include "EMELog.h"
+#include "mozilla/CDMCaps.h"
+#include "mozilla/EMEUtils.h"
 #include "nsThreadUtils.h"
 #include "SamplesWaitingForKey.h"
 
diff --git a/dom/media/eme/CDMProxy.cpp b/dom/media/eme/CDMProxy.cpp
index e0f2115d8875..6332a8e9bf25 100644
--- a/dom/media/eme/CDMProxy.cpp
+++ b/dom/media/eme/CDMProxy.cpp
@@ -12,7 +12,7 @@
 #include "nsContentCID.h"
 #include "nsServiceManagerUtils.h"
 #include "MainThreadUtils.h"
-#include "mozilla/EMELog.h"
+#include "mozilla/EMEUtils.h"
 #include "nsIConsoleService.h"
 #include "prenv.h"
 #include "mozilla/PodOperations.h"
diff --git a/dom/media/eme/EMELog.cpp b/dom/media/eme/EMEUtils.cpp
similarity index 95%
rename from dom/media/eme/EMELog.cpp
rename to dom/media/eme/EMEUtils.cpp
index a4bd498b7eb1..c801469f1cfa 100644
--- a/dom/media/eme/EMELog.cpp
+++ b/dom/media/eme/EMEUtils.cpp
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "EMELog.h"
+#include "mozilla/EMEUtils.h"
 
 namespace mozilla {
 
diff --git a/dom/media/eme/EMELog.h b/dom/media/eme/EMEUtils.h
similarity index 100%
rename from dom/media/eme/EMELog.h
rename to dom/media/eme/EMEUtils.h
diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp
index eed7f54c820e..549b3d74889d 100644
--- a/dom/media/eme/MediaKeySystemAccess.cpp
+++ b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -20,6 +20,7 @@
 #include "VideoUtils.h"
 #include "mozilla/Services.h"
 #include "nsIObserverService.h"
+#include "mozilla/EMEUtils.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/media/eme/MediaKeys.cpp b/dom/media/eme/MediaKeys.cpp
index e6e52742e9a2..1a40d1e17525 100644
--- a/dom/media/eme/MediaKeys.cpp
+++ b/dom/media/eme/MediaKeys.cpp
@@ -13,7 +13,7 @@
 #include "mozilla/dom/DOMException.h"
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/CDMProxy.h"
-#include "mozilla/EMELog.h"
+#include "mozilla/EMEUtils.h"
 #include "nsContentUtils.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "mozilla/Preferences.h"
diff --git a/dom/media/eme/moz.build b/dom/media/eme/moz.build
index 84fcad0b90f9..4bf70dffefd5 100644
--- a/dom/media/eme/moz.build
+++ b/dom/media/eme/moz.build
@@ -18,14 +18,14 @@ EXPORTS.mozilla += [
     'CDMCallbackProxy.h',
     'CDMCaps.h',
     'CDMProxy.h',
-    'EMELog.h'
+    'EMEUtils.h'
 ]
 
 UNIFIED_SOURCES += [
     'CDMCallbackProxy.cpp',
     'CDMCaps.cpp',
     'CDMProxy.cpp',
-    'EMELog.cpp',
+    'EMEUtils.cpp',
     'MediaEncryptedEvent.cpp',
     'MediaKeyError.cpp',
     'MediaKeyMessageEvent.cpp',