DevTools: merge devtools_http_handler into content - it is used in all the embedders anyways.

content/shell/browser/shell_browser_main_parts.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/shell/browser/shell_browser_main_parts.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
-#include "components/devtools_http_handler/devtools_http_handler.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/url_constants.h"
 #include "content/shell/android/shell_descriptors.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_access_token_store.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/browser/shell_devtools_manager_delegate.h"
 #include "content/shell/browser/shell_net_log.h"
@@ skipping 78 matching lines @@
     return html_data;
   }
   return base::StringPiece();
 }
 
 }  // namespace
 
 ShellBrowserMainParts::ShellBrowserMainParts(
     const MainFunctionParams& parameters)
     : parameters_(parameters),
-      run_message_loop_(true),
-      devtools_http_handler_(nullptr) {
+      run_message_loop_(true) {
 }
 
 ShellBrowserMainParts::~ShellBrowserMainParts() {
-  DCHECK(!devtools_http_handler_);
 #if defined(OS_ANDROID)
   breakpad::CrashDumpObserver::GetInstance()->UnregisterClient(
       crash_dump_manager_.get());
 #endif
 }
 
 #if !defined(OS_MACOSX)
 void ShellBrowserMainParts::PreMainMessageLoopStart() {
 #if defined(USE_AURA) && defined(USE_X11)
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
@@ skipping 58 matching lines @@
 }
 #endif
 
 void ShellBrowserMainParts::PreMainMessageLoopRun() {
   net_log_.reset(new ShellNetLog("content_shell"));
   InitializeBrowserContexts();
   device::GeolocationProvider::SetGeolocationDelegate(
       new ShellGeolocationDelegate(browser_context()));
   Shell::Initialize();
   net::NetModule::SetResourceProvider(PlatformResourceProvider);
-
-  devtools_http_handler_.reset(
-      ShellDevToolsManagerDelegate::CreateHttpHandler(browser_context_.get()));
-
+  ShellDevToolsManagerDelegate::StartHttpHandler(browser_context_.get());
   InitializeMessageLoopContext();
 
   if (parameters_.ui_task) {
     parameters_.ui_task->Run();
     delete parameters_.ui_task;
     run_message_loop_ = false;
   }
 }
 
 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code)  {
   return !run_message_loop_;
 }
 
 void ShellBrowserMainParts::PostMainMessageLoopRun() {
-  devtools_http_handler_.reset();
+  DevToolsAgentHost::StopRemoteDebuggingServer();

[dgozman, 2016/09/02 19:33:07]

Remove this.

+  ShellDevToolsManagerDelegate::StopHttpHandler();
   browser_context_.reset();
   off_the_record_browser_context_.reset();
 }
 
 void ShellBrowserMainParts::PostDestroyThreads() {
 #if defined(OS_CHROMEOS)
   device::BluetoothAdapterFactory::Shutdown();
   bluez::BluezDBusManager::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #elif defined(OS_LINUX)
   device::BluetoothAdapterFactory::Shutdown();
   bluez::DBusBluezManagerWrapperLinux::Shutdown();
 #endif
 }
 
 }  // namespace