Remove MOJO_SHELL_CLIENT define.

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/render_frame_host_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 63 matching lines @@
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/common/isolated_world_ids.h"
 #include "content/public/common/url_constants.h"
 #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"
 #include "ui/accessibility/ax_tree_update.h"
 #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)
 #include "content/browser/media/android/provision_fetcher_impl.h"
 #endif
 #endif
 
 #if defined(OS_MACOSX)
 #include "content/browser/frame_host/popup_menu_helper_mac.h"
 #endif
@@ skipping 67 matching lines @@
                      const std::vector<base::FilePath>& file_paths) {
   ChildProcessSecurityPolicyImpl* policy =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
   for (const auto& file : file_paths) {
     if (!policy->CanReadFile(child_id, file))
       policy->GrantReadFile(child_id, file);
   }
 }
 
-#if defined(MOJO_SHELL_CLIENT)
 // media::mojom::ServiceFactory is generated in GN builds only.
 void CreateMediaServiceFactory(
     BrowserContext* browser_context,
     RenderFrameHost* render_frame_host,
     media::mojom::ServiceFactoryRequest request) {
   shell::Connector* connector =
       BrowserContext::GetShellConnectorFor(browser_context);
   std::unique_ptr<shell::Connection> connection =
       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
 
 // static
 RenderFrameHost* RenderFrameHost::FromID(int render_process_id,
                                          int render_frame_id) {
   return RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
 }
 
 #if defined(OS_ANDROID)
@@ skipping 1890 matching lines @@
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX)
   enable_web_bluetooth = true;
 #endif
 
   if (enable_web_bluetooth) {
     GetInterfaceRegistry()->AddInterface(base::Bind(
         base::IgnoreResult(&RenderFrameHostImpl::CreateWebBluetoothService),
         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 =
       *base::CommandLine::ForCurrentProcess();
 
   if (browser_command_line.HasSwitch(switches::kEnableWebVR)) {
     GetInterfaceRegistry()->AddInterface<device::VRService>(
         base::Bind(&device::VRServiceImpl::BindRequest));
   }
 #endif
@@ skipping 901 matching lines @@
   web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
       &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
   return web_bluetooth_service_.get();
 }
 
 void RenderFrameHostImpl::DeleteWebBluetoothService() {
   web_bluetooth_service_.reset();
 }
 
 }  // namespace content