Bug 1335250 - Fix an ambiguous ipc header in MediaEngine.h, r=ehsan
authorAndrea Marchesini <amarchesini@mozilla.com>
Thu, 02 Feb 2017 08:04:13 +0100
changeset 332124 224d71d1532afa4501a42be4b7c3918c362c9c10
parent 332123 af51cb06905b31231af338952f0a5f4e9f89b6d5
child 332125 04d1a9455d3cdee5668117c3ffea9345568192c1
push id86457
push useramarchesini@mozilla.com
push dateThu, 02 Feb 2017 07:04:26 +0000
treeherdermozilla-inbound@224d71d1532a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1335250
milestone54.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 1335250 - Fix an ambiguous ipc header in MediaEngine.h, r=ehsan
dom/media/webrtc/MediaEngine.h
--- a/dom/media/webrtc/MediaEngine.h
+++ b/dom/media/webrtc/MediaEngine.h
@@ -221,27 +221,27 @@ public:
   class AllocationHandle
   {
   public:
     NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AllocationHandle);
   protected:
     ~AllocationHandle() {}
   public:
     AllocationHandle(const dom::MediaTrackConstraints& aConstraints,
-                     const ipc::PrincipalInfo& aPrincipalInfo,
+                     const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
                      const MediaEnginePrefs& aPrefs,
                      const nsString& aDeviceId)
 
     : mConstraints(aConstraints),
       mPrincipalInfo(aPrincipalInfo),
       mPrefs(aPrefs),
       mDeviceId(aDeviceId) {}
   public:
     NormalizedConstraints mConstraints;
-    ipc::PrincipalInfo mPrincipalInfo;
+    mozilla::ipc::PrincipalInfo mPrincipalInfo;
     MediaEnginePrefs mPrefs;
     nsString mDeviceId;
   };
 
   /* Release the device back to the system. */
   virtual nsresult Deallocate(AllocationHandle* aHandle)
   {
     MOZ_ASSERT(aHandle);