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

components/devtools_service/devtools_http_server.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/devtools_service/devtools_http_server.h"
 
 #include <stddef.h>
 #include <string.h>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "components/devtools_service/devtools_agent_host.h"
 #include "components/devtools_service/devtools_registry_impl.h"
 #include "components/devtools_service/devtools_service.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/services/network/public/cpp/web_socket_read_queue.h"
 #include "mojo/services/network/public/cpp/web_socket_write_queue.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 
 namespace devtools_service {
 
 namespace {
 
 const char kPageUrlPrefix[] = "/devtools/page/";
 const char kBrowserUrlPrefix[] = "/devtools/browser";
 const char kJsonRequestUrlPrefix[] = "/json";
 
 const char kActivateCommand[] = "activate";
@@ skipping 291 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HttpConnectionDelegateImpl);
 };
 
 DevToolsHttpServer::DevToolsHttpServer(DevToolsService* service,
                                        uint16_t remote_debugging_port)
     : service_(service), remote_debugging_port_(remote_debugging_port) {
   VLOG(1) << "Remote debugging HTTP server is started on port "
           << remote_debugging_port << ".";
   mojo::NetworkServicePtr network_service;
-  service_->application()->ConnectToService("mojo:network_service",
-                                            &network_service);
+  service_->shell()->ConnectToService("mojo:network_service", &network_service);
 
   mojo::NetAddressPtr local_address(mojo::NetAddress::New());
   local_address->family = mojo::NetAddressFamily::IPV4;
   local_address->ipv4 = mojo::NetAddressIPv4::New();
   local_address->ipv4->port = remote_debugging_port;
   local_address->ipv4->addr.resize(4);
   local_address->ipv4->addr[0] = 127;
   local_address->ipv4->addr[1] = 0;
   local_address->ipv4->addr[2] = 0;
   local_address->ipv4->addr[3] = 1;
@@ skipping 142 matching lines @@
                              iter.value()->id().c_str()));
       list_value.Append(std::move(dict_value));
     }
     return MakeJsonResponse(200, &list_value, std::string());
   }
 
   return MakeJsonResponse(404, nullptr, "Unknown command: " + command);
 }
 
 }  // namespace devtools_service