Bug 1396493 - Part4 - Fix the include header name after renaming by Part3. r=cpearce
authorJames Cheng <jacheng@mozilla.com>
Wed, 27 Sep 2017 21:12:39 +0800
changeset 383439 8faa7ec9f5d34f06bd2560129e3454c0e9804c7a
parent 383438 8e98418e6c1b2998c9d497afce270442b75d41a9
child 383440 c41c0cd0601619150c3ea8948b9119cf305b9547
push id32594
push userkwierso@gmail.com
push dateThu, 28 Sep 2017 22:49:33 +0000
treeherdermozilla-central@6dea0ee45b66 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1396493
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1396493 - Part4 - Fix the include header name after renaming by Part3. r=cpearce MozReview-Commit-ID: 3dPKXXRqnUF
dom/media/gmp-plugin/cdm-fake.cpp
dom/media/gmp-plugin/cdm-test-decryptor.cpp
dom/media/gmp-plugin/cdm-test-output-protection.h
dom/media/gmp-plugin/cdm-test-storage.cpp
dom/media/gmp-plugin/cdm-test-storage.h
--- a/dom/media/gmp-plugin/cdm-fake.cpp
+++ b/dom/media/gmp-plugin/cdm-fake.cpp
@@ -29,19 +29,19 @@
  *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *     POSSIBILITY OF SUCH DAMAGE.
  *
  *
  *************************************************************************************
  */
 
 #include "stddef.h"
+#include "cdm-test-decryptor.h"
 #include "content_decryption_module.h"
 #include "content_decryption_module_ext.h"
-#include "gmp-test-decryptor.h"
 
 extern "C" {
 
 CDM_API
 void INITIALIZE_CDM_MODULE() {
 
 }
 
--- a/dom/media/gmp-plugin/cdm-test-decryptor.cpp
+++ b/dom/media/gmp-plugin/cdm-test-decryptor.cpp
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "gmp-test-decryptor.h"
-#include "gmp-test-storage.h"
-#include "gmp-test-output-protection.h"
+#include "cdm-test-decryptor.h"
+#include "cdm-test-storage.h"
+#include "cdm-test-output-protection.h"
 
 #include <mutex>
 #include <string>
 #include <vector>
 #include <iostream>
 #include <istream>
 #include <iterator>
 #include <sstream>
@@ -296,17 +296,17 @@ private:
   const string mTestID;
 };
 
 static void
 DoTestStorage(const string& aPrefix, TestManager* aTestManager)
 {
   MOZ_ASSERT(FakeDecryptor::sInstance->mHost, "FakeDecryptor::sInstance->mHost should not be null");
   // Basic I/O tests. We run three cases concurrently. The tests, like
-  // GMPStorage run asynchronously. When they've all passed, we send
+  // CDMStorage run asynchronously. When they've all passed, we send
   // a message back to the parent process, or a failure message if not.
 
   // Test 1: Basic I/O test, and test that writing 0 bytes in a record
   // deletes record.
   //
   // Write data to truncate record, then
   // read data, verify that we read what we wrote, then
   // write 0 bytes to truncate record, then
@@ -464,11 +464,11 @@ FakeDecryptor::UpdateSession(uint32_t aP
       sShutdownToken = tokens[2];
       Message("shutdown-token received " + sShutdownToken);
     }
   } else if (task == "retrieve-shutdown-token") {
     ReadRecord(FakeDecryptor::sInstance->mHost,
                "shutdown-token",
                ReportReadRecordContinuation("shutdown-token"));
   } else if (task == "test-op-apis") {
-    mozilla::gmptest::TestOuputProtectionAPIs();
+    mozilla::cdmtest::TestOuputProtectionAPIs();
   }
 }
--- a/dom/media/gmp-plugin/cdm-test-output-protection.h
+++ b/dom/media/gmp-plugin/cdm-test-output-protection.h
@@ -10,17 +10,17 @@
 #include <string>
 #include <vector>
 #include <windows.h>
 
 #include "opmapi.h"
 #endif
 
 namespace mozilla {
-namespace gmptest {
+namespace cdmtest {
 
 #if defined(XP_WIN)
 typedef HRESULT(STDAPICALLTYPE * OPMGetVideoOutputsFromHMONITORProc)
           (HMONITOR, OPM_VIDEO_OUTPUT_SEMANTICS, ULONG*, IOPMVideoOutput***);
 
 static OPMGetVideoOutputsFromHMONITORProc sOPMGetVideoOutputsFromHMONITORProc = nullptr;
 
 static BOOL CALLBACK EnumDisplayMonitorsCallback(HMONITOR hMonitor, HDC hdc,
@@ -120,10 +120,10 @@ RunOutputProtectionAPITests()
 
 static void
 TestOuputProtectionAPIs()
 {
   RunOutputProtectionAPITests();
   FakeDecryptor::Message("OP tests completed");
 }
 
-} // namespace gmptest
+} // namespace cdmtest
 } // namespace mozilla
--- a/dom/media/gmp-plugin/cdm-test-storage.cpp
+++ b/dom/media/gmp-plugin/cdm-test-storage.cpp
@@ -1,14 +1,14 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "gmp-test-storage.h"
+#include "cdm-test-storage.h"
 #include <vector>
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 
 using namespace cdm;
 using namespace std;
 
--- a/dom/media/gmp-plugin/cdm-test-storage.h
+++ b/dom/media/gmp-plugin/cdm-test-storage.h
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
-#ifndef TEST_GMP_STORAGE_H__
-#define TEST_GMP_STORAGE_H__
+#ifndef TEST_CDM_STORAGE_H__
+#define TEST_CDM_STORAGE_H__
 
 #include <functional>
 #include <string>
 #include <vector>
 // This include is required in order for content_decryption_module to work
 // on Unix systems.
 #include "stddef.h"
 #include "content_decryption_module.h"
@@ -46,9 +46,9 @@ class OpenContinuation {
 public:
   virtual ~OpenContinuation() {}
   virtual void operator()(bool aSuccess) = 0;
 };
 
 void OpenRecord(cdm::Host_8* aHost,
                 const std::string& aRecordName,
                 std::function<void(bool)>&& aOpenComplete);
-#endif // TEST_GMP_STORAGE_H__
+#endif // TEST_CDM_STORAGE_H__