Eliminate FrameMojoShell.

content/renderer/media/media_interface_provider.cc

 // Copyright 2016 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/renderer/media/media_interface_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/cpp/connect.h"
+#include "services/shell/public/cpp/interface_provider.h"
 
 namespace content {
 
 MediaInterfaceProvider::MediaInterfaceProvider(
-    const ConnectToApplicationCB& connect_to_app_cb)
-    : connect_to_app_cb_(connect_to_app_cb) {
-  DCHECK(!connect_to_app_cb_.is_null());
+    shell::InterfaceProvider* remote_interfaces)
+    : remote_interfaces_(remote_interfaces) {
 }
 
 MediaInterfaceProvider::~MediaInterfaceProvider() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void MediaInterfaceProvider::GetInterface(const mojo::String& interface_name,
                                           mojo::ScopedMessagePipeHandle pipe) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 15 matching lines @@
   } else {
     NOTREACHED();
   }
 }
 
 media::mojom::ServiceFactory* MediaInterfaceProvider::GetMediaServiceFactory() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!media_service_factory_) {
-    shell::mojom::InterfaceProviderPtr interface_provider =
-        connect_to_app_cb_.Run(GURL("mojo:media"));
-    shell::GetInterface(interface_provider.get(), &media_service_factory_);
+    remote_interfaces_->GetInterface(&media_service_factory_);
     media_service_factory_.set_connection_error_handler(base::Bind(
         &MediaInterfaceProvider::OnConnectionError, base::Unretained(this)));
   }
 
   return media_service_factory_.get();
 }
 
 void MediaInterfaceProvider::OnConnectionError() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   media_service_factory_.reset();
 }
 
 }  // namespace content