--- a/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
@@ -146,17 +146,17 @@ MediaEngineGonkVideoSource::NumCapabilit
   return mHardcodedCapabilities.Length();
 }
 
 nsresult
 MediaEngineGonkVideoSource::Allocate(const dom::MediaTrackConstraints& aConstraints,
                                      const MediaEnginePrefs& aPrefs,
                                      const nsString& aDeviceId,
                                      const nsACString& aOrigin,
-                                     BaseAllocationHandle** aOutHandle,
+                                     AllocationHandle** aOutHandle,
                                      const char** aOutBadConstraint)
 {
   LOG((__FUNCTION__));
 
   ReentrantMonitorAutoEnter sync(mCallbackMonitor);
   if (mState == kReleased && mInitDone) {
     NormalizedConstraints constraints(aConstraints);
     ChooseCapability(constraints, aPrefs, aDeviceId);
@@ -168,17 +168,17 @@ MediaEngineGonkVideoSource::Allocate(con
     }
   }
 
   aOutHandle = nullptr;
   return NS_OK;
 }
 
 nsresult
-MediaEngineGonkVideoSource::Deallocate(BaseAllocationHandle* aHandle)
+MediaEngineGonkVideoSource::Deallocate(AllocationHandle* aHandle)
 {
   LOG((__FUNCTION__));
   AssertIsOnOwningThread();
   MOZ_ASSERT(!aHandle);
 
   bool empty;
   {
     MonitorAutoLock lock(mMonitor);
@@ -334,17 +334,17 @@ MediaEngineGonkVideoSource::Stop(SourceM
 
   NS_DispatchToMainThread(WrapRunnable(RefPtr<MediaEngineGonkVideoSource>(this),
                                        &MediaEngineGonkVideoSource::StopImpl));
 
   return NS_OK;
 }
 
 nsresult
-MediaEngineGonkVideoSource::Restart(BaseAllocationHandle* aHandle,
+MediaEngineGonkVideoSource::Restart(AllocationHandle* aHandle,
                                     const dom::MediaTrackConstraints& aConstraints,
                                     const MediaEnginePrefs& aPrefs,
                                     const nsString& aDeviceId,
                                     const char** aOutBadConstraint)
 {
   return NS_OK;
 }
 

--- a/dom/media/webrtc/MediaEngineGonkVideoSource.h
+++ b/dom/media/webrtc/MediaEngineGonkVideoSource.h
@@ -59,23 +59,23 @@ public:
     {
       Init();
     }
 
   nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                     const MediaEnginePrefs &aPrefs,
                     const nsString& aDeviceId,
                     const nsACString& aOrigin,
-                    BaseAllocationHandle** aOutHandle,
+                    AllocationHandle** aOutHandle,
                     const char** aOutBadConstraint) override;
-  nsresult Deallocate(BaseAllocationHandle* aHandle) override;
+  nsresult Deallocate(AllocationHandle* aHandle) override;
   nsresult Start(SourceMediaStream* aStream, TrackID aID,
                  const PrincipalHandle& aPrincipalHandle) override;
   nsresult Stop(SourceMediaStream* aSource, TrackID aID) override;
-  nsresult Restart(BaseAllocationHandle* aHandle,
+  nsresult Restart(AllocationHandle* aHandle,
                    const dom::MediaTrackConstraints& aConstraints,
                    const MediaEnginePrefs &aPrefs,
                    const nsString& aDeviceId,
                    const char** aOutBadConstraint) override;
   void NotifyPull(MediaStreamGraph* aGraph,
                   SourceMediaStream* aSource,
                   TrackID aId,
                   StreamTime aDesiredTime,