Remove MOJO_SHELL_CLIENT define.

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 78325e8117f4ad28c7d21b605bf2bfae106f587f..12d8472f2a59d43ec2f97c32d0c844a06bafe5c7 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -81,6 +81,7 @@
 #include "content/public/common/url_utils.h"
 #include "device/geolocation/geolocation_service_context.h"
 #include "device/vibration/vibration_manager_impl.h"
+#include "media/mojo/interfaces/service_factory.mojom.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "ui/accessibility/ax_tree.h"
@@ -88,11 +89,6 @@
 #include "ui/gfx/geometry/quad_f.h"
 #include "url/gurl.h"
 
-// media::mojom::ServiceFactory is generated in GN builds only.
-#if defined(MOJO_SHELL_CLIENT)
-#include "media/mojo/interfaces/service_factory.mojom.h"
-#endif
-
 #if defined(OS_ANDROID)
 #include "content/browser/mojo/interface_registrar_android.h"
 #if defined(ENABLE_MOJO_CDM)
@@ -180,7 +176,6 @@ void GrantFileAccess(int child_id,
   }
 }
 
-#if defined(MOJO_SHELL_CLIENT)
 // media::mojom::ServiceFactory is generated in GN builds only.
 void CreateMediaServiceFactory(
     BrowserContext* browser_context,
@@ -192,13 +187,12 @@ void CreateMediaServiceFactory(
       connector->Connect("mojo:media");
 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_CDM)
   connection->GetInterfaceRegistry()->AddInterface(
-      base::Bind(&ProvisionFetcherImpl::Create, this));
+      base::Bind(&ProvisionFetcherImpl::Create, render_frame_host));
 #endif
   GetContentClient()->browser()->ExposeInterfacesToMediaService(
       connection->GetInterfaceRegistry(), render_frame_host);
   connection->GetInterface(std::move(request));
 }
-#endif  // defined(MOJO_SHELL_CLIENT)
 
 }  // namespace
 
@@ -2109,12 +2103,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
         base::Unretained(this)));
   }
 
-#if defined(MOJO_SHELL_CLIENT)
-  // media::mojom::ServiceFactory is generated in GN builds only.
   GetInterfaceRegistry()->AddInterface<media::mojom::ServiceFactory>(
       base::Bind(&CreateMediaServiceFactory,
                  GetProcess()->GetBrowserContext(), this));
-#endif  // defined(MOJO_SHELL_CLIENT)
 
 #if defined(ENABLE_WEBVR)
   const base::CommandLine& browser_command_line =