Eliminate ShellClientFactoryConnection & just have the ApplicationManager do it.

content/renderer/render_frame_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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 596 matching lines @@
 
 bool IsReload(FrameMsg_Navigate_Type::Value navigation_type) {
   return navigation_type == FrameMsg_Navigate_Type::RELOAD ||
          navigation_type == FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE ||
          navigation_type == FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL;
 }
 
 RenderFrameImpl::CreateRenderFrameImplFunction g_create_render_frame_impl =
     nullptr;
 
-void OnGotRemoteIDs(uint32_t remote_id, uint32_t content_handler_id) {}
+void OnGotInstanceID(uint32_t instance_id) {}
 
 WebString ConvertRelativePathToHtmlAttribute(const base::FilePath& path) {
   DCHECK(!path.IsAbsolute());
   return WebString::fromUTF8(
       std::string("./") +
       path.NormalizePathSeparatorsTo(FILE_PATH_LITERAL('/')).AsUTF8Unsafe());
 }
 
 // Implementation of WebFrameSerializer::LinkRewritingDelegate that responds
 // based on the payload of FrameMsg_GetSerializedHtmlWithLocalLinks.
@@ skipping 5423 matching lines @@
   mojo::shell::mojom::InterfaceProviderPtr interface_provider;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From(url);
   mojo::shell::mojom::CapabilityFilterPtr filter(
       mojo::shell::mojom::CapabilityFilter::New());
   mojo::Array<mojo::String> all_interfaces;
   all_interfaces.push_back("*");
   filter->filter.insert("*", std::move(all_interfaces));
   mojo_shell_->ConnectToApplication(
       std::move(request), GetProxy(&interface_provider), nullptr,
-      std::move(filter), base::Bind(&OnGotRemoteIDs));
+      std::move(filter), base::Bind(&OnGotInstanceID));
   return interface_provider;
 }
 
 media::RendererWebMediaPlayerDelegate*
 RenderFrameImpl::GetWebMediaPlayerDelegate() {
   if (!media_player_delegate_)
     media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this);
   return media_player_delegate_;
 }
 
@@ skipping 30 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content