--- a/dom/media/ipc/VideoDecoderManagerChild.h
+++ b/dom/media/ipc/VideoDecoderManagerChild.h
@@ -47,19 +47,18 @@ public:
     return PVideoDecoderManagerChild::AllocUnsafeShmem(aSize, aShmType, aShmem);
   }
 
   // Can be called from any thread, dispatches the request to the IPDL thread internally
   // and will be ignored if the IPDL actor has been destroyed.
   bool DeallocShmem(mozilla::ipc::Shmem& aShmem) override;
 
   // Main thread only
-  // TODO: the default value is used to make this patch compilable, will be removed in next patch. 
   static void InitForContent(Endpoint<PVideoDecoderManagerChild>&& aVideoManager,
-                             const bool aDecodeVideoOnGPUProcess = true);
+                             const bool aDecodeVideoOnGPUProcess);
   static void Shutdown();
 
   // Run aTask (on the manager thread) when we next attempt to create a new manager
   // (even if creation fails). Intended to be called from ActorDestroy when we get
   // notified that the old manager is being destroyed.
   // Can only be called from the manager thread.
   void RunWhenRecreated(already_AddRefed<Runnable> aTask);
 

--- a/gfx/ipc/GPUProcessManager.h
+++ b/gfx/ipc/GPUProcessManager.h
@@ -177,16 +177,20 @@ public:
     return mGPUChild;
   }
 
   // Returns whether or not a GPU process was ever launched.
   bool AttemptedGPUProcess() const {
     return mNumProcessAttempts > 0;
   }
 
+  bool DecodeVideoOnGpuProcess() const {
+    return mDecodeVideoOnGpuProcess;
+  }
+
 private:
   // Called from our xpcom-shutdown observer.
   void OnXPCOMShutdown();
 
   bool CreateContentCompositorManager(base::ProcessId aOtherProcess,
                                       mozilla::ipc::Endpoint<PCompositorManagerChild>* aOutEndpoint);
   bool CreateContentImageBridge(base::ProcessId aOtherProcess,
                                 mozilla::ipc::Endpoint<PImageBridgeChild>* aOutEndpoint);