Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

components/web_view/frame_devtools_agent.cc

 // Copyright 2015 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 "components/web_view/frame_devtools_agent.h"
 
 #include <string.h>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/values.h"
 #include "components/web_view/frame_devtools_agent_delegate.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "url/gurl.h"
 
 namespace web_view {
 
 using devtools_service::DevToolsAgentClientPtr;
 using devtools_service::DevToolsAgentPtr;
 using devtools_service::DevToolsRegistryPtr;
 
 using mojo::String;
 
@@ skipping 49 matching lines @@
   FrameDevToolsAgent* const owner_;
   mojo::Binding<DevToolsAgentClient> binding_;
   // The DevToolsAgentClient interface provided by the DevTools service. This
   // class will forward DevToolsAgentClient method calls it receives to
   // |forward_client_|.
   DevToolsAgentClientPtr forward_client_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameDevToolsAgentClient);
 };
 
-FrameDevToolsAgent::FrameDevToolsAgent(mojo::ApplicationImpl* app,
+FrameDevToolsAgent::FrameDevToolsAgent(mojo::Shell* shell,
                                        FrameDevToolsAgentDelegate* delegate)
-    : app_(app),
+    : shell_(shell),
       delegate_(delegate),
       id_(base::GenerateGUID()),
       binding_(this) {
-  DCHECK(app_);
+  DCHECK(shell_);
   DCHECK(delegate_);
 }
 
 FrameDevToolsAgent::~FrameDevToolsAgent() {}
 
 void FrameDevToolsAgent::AttachFrame(
     DevToolsAgentPtr forward_agent,
     Frame::ClientPropertyMap* devtools_properties) {
   RegisterAgentIfNecessary();
   forward_agent_ = std::move(forward_agent);
 
   StringToVector(id_, &(*devtools_properties)["devtools-id"]);
   if (client_impl_) {
     StringToVector(state_, &(*devtools_properties)["devtools-state"]);
     client_impl_->OnAttachedFrame();
   }
 
   // This follows Chrome's logic and relies on the fact that call IDs increase
   // monotonously so iterating over |pending_messages_| preserves the order in
   // which they were received.
   for (const auto& item : pending_messages_)
     forward_agent_->DispatchProtocolMessage(item.second);
 }
 
 void FrameDevToolsAgent::RegisterAgentIfNecessary() {
   if (binding_.is_bound())
     return;
 
   DevToolsRegistryPtr devtools_registry;
-  app_->ConnectToService("mojo:devtools_service", &devtools_registry);
+  shell_->ConnectToService("mojo:devtools_service", &devtools_registry);
 
   devtools_registry->RegisterAgent(id_, binding_.CreateInterfacePtrAndBind());
 }
 
 void FrameDevToolsAgent::HandlePageNavigateRequest(
     const base::DictionaryValue* request) {
   std::string method;
   if (!request->GetString("method", &method) || method != "Page.navigate")
     return;
 
@@ skipping 51 matching lines @@
   pending_messages_.erase(call_id);
 }
 
 void FrameDevToolsAgent::OnForwardClientClosed() {
   client_impl_.reset();
   state_.clear();
   pending_messages_.clear();
 }
 
 }  // namespace web_view