Componentize devtools_http_handler.

This moves DevToolsHttpHandler into it's own component.
It still depends on content::DevToolsTarget, which will be moved to
devtools_discovery component next.

BUG=476496

Review URL: https://codereview.chromium.org/1089413002

Cr-Commit-Position: refs/heads/master@{#325849}

15 files changed, 126 insertions, 124 deletions

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 80b2f9b..adb4c14 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -239,6 +239,7 @@ source_set("browser") {
       "//components/autofill/content/browser",
       "//components/browsing_data",
       "//components/data_reduction_proxy/content/browser",
+      "//components/devtools_http_handler",
       "//components/dom_distiller/content",
       "//components/favicon/content",
       "//components/history/content/browser",
diff --git a/chrome/browser/android/DEPS b/chrome/browser/android/DEPS
index a78dfeb..9838090 100644
--- a/chrome/browser/android/DEPS
+++ b/chrome/browser/android/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   "-components/devtools_bridge",
+  "+components/devtools_http_handler",
   "+components/service_tab_launcher",
   "+components/web_contents_delegate_android",
   "+cc/layers/layer.h"
diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
index e6d15aa..9a91c6b 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -18,18 +18,21 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/android/dev_tools_manager_delegate_android.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
+#include "chrome/common/chrome_content_client.h"
+#include "chrome/common/chrome_version_info.h"
+#include "components/devtools_http_handler/devtools_http_handler.h"
+#include "components/devtools_http_handler/devtools_http_handler_delegate.h"
 #include "components/history/core/browser/top_sites.h"
 #include "content/public/browser/android/devtools_auth.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_http_handler.h"
-#include "content/public/browser/devtools_http_handler_delegate.h"
 #include "content/public/browser/devtools_target.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
@@ -50,6 +53,7 @@
 using content::DevToolsAgentHost;
 using content::RenderViewHost;
 using content::WebContents;
+using devtools_http_handler::DevToolsHttpHandler;
 
 namespace {
 
@@ -81,7 +85,8 @@ bool AuthorizeSocketAccessWithDebugPermission(
 
 // Delegate implementation for the devtools http handler on android. A new
 // instance of this gets created each time devtools is enabled.
-class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
+class DevToolsServerDelegate :
+    public devtools_http_handler::DevToolsHttpHandlerDelegate {
  public:
   DevToolsServerDelegate() {
   }
@@ -97,12 +102,8 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
         IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
   }
 
-  bool BundlesFrontendResources() override {
-    return false;
-  }
-
-  base::FilePath GetDebugFrontendDir() override {
-    return base::FilePath();
+  std::string GetFrontendResource(const std::string& path) override {
+    return std::string();
   }
 
  private:
@@ -121,7 +122,7 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
 // Factory for UnixDomainServerSocket. It tries a fallback socket when
 // original socket doesn't work.
 class UnixDomainServerSocketFactory
-    : public content::DevToolsHttpHandler::ServerSocketFactory {
+    : public DevToolsHttpHandler::ServerSocketFactory {
  public:
   UnixDomainServerSocketFactory(
       const std::string& socket_name,
@@ -187,28 +188,36 @@ DevToolsServer::~DevToolsServer() {
 }
 
 void DevToolsServer::Start(bool allow_debug_permission) {
-  if (protocol_handler_)
+  if (devtools_http_handler_)
     return;
 
   net::UnixDomainServerSocket::AuthCallback auth_callback =
       allow_debug_permission ?
           base::Bind(&AuthorizeSocketAccessWithDebugPermission) :
           base::Bind(&content::CanUserConnectToDevTools);
-  scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory> factory(
+  manager_delegate_.reset(new DevToolsManagerDelegateAndroid());
+  chrome::VersionInfo version_info;
+
+  scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(
       new UnixDomainServerSocketFactory(socket_name_, auth_callback));
-  protocol_handler_.reset(content::DevToolsHttpHandler::Start(
+  devtools_http_handler_.reset(new DevToolsHttpHandler(
       factory.Pass(),
       base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str()),
       new DevToolsServerDelegate(),
-      base::FilePath()));
+      manager_delegate_.get(),
+      base::FilePath(),
+      base::FilePath(),
+      version_info.ProductNameAndVersionForUserAgent(),
+      ::GetUserAgent()));
 }
 
 void DevToolsServer::Stop() {
-  protocol_handler_.reset();
+  devtools_http_handler_.reset();
+  manager_delegate_.reset();
 }
 
 bool DevToolsServer::IsStarted() const {
-  return protocol_handler_;
+  return devtools_http_handler_;
 }
 
 bool RegisterDevToolsServer(JNIEnv* env) {
diff --git a/chrome/browser/android/dev_tools_server.h b/chrome/browser/android/dev_tools_server.h
index 614d4c9..2716ef3 100644
--- a/chrome/browser/android/dev_tools_server.h
+++ b/chrome/browser/android/dev_tools_server.h
@@ -10,10 +10,12 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
-namespace content {
+namespace devtools_http_handler {
 class DevToolsHttpHandler;
 }
 
+class DevToolsManagerDelegateAndroid;
+
 // This class controls Developer Tools remote debugging server.
 class DevToolsServer {
  public:
@@ -30,7 +32,9 @@ class DevToolsServer {
 
  private:
   std::string socket_name_;
-  scoped_ptr<content::DevToolsHttpHandler> protocol_handler_;
+  // TODO(dgozman): remove once devtools_discovery component is extracted.
+  scoped_ptr<DevToolsManagerDelegateAndroid> manager_delegate_;
+  scoped_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsServer);
 };
diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
index a7580cb..b4ab715 100644
--- a/chrome/browser/devtools/BUILD.gn
+++ b/chrome/browser/devtools/BUILD.gn
@@ -68,6 +68,7 @@ static_library("devtools") {
       "//chrome:extra_resources",
       "//chrome:resources",
       "//chrome:strings",
+      "//components/devtools_http_handler",
       "//net:http_server",
       "//skia",
       "//third_party/icu",
@@ -76,8 +77,6 @@ static_library("devtools") {
       ":webrtc_device_provider_resources",
     ]
     sources += [
-      "browser_list_tabcontents_provider.cc",
-      "browser_list_tabcontents_provider.h",
       "chrome_devtools_manager_delegate.cc",
       "chrome_devtools_manager_delegate.h",
       "device/adb/adb_client_socket.cc",
diff --git a/chrome/browser/devtools/DEPS b/chrome/browser/devtools/DEPS
new file mode 100644
index 0000000..8b64aaa
--- /dev/null
+++ b/chrome/browser/devtools/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+components/devtools_http_handler",
+]
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
deleted file mode 100644
index 5c4d4f7..0000000
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2012 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 "chrome/browser/devtools/browser_list_tabcontents_provider.h"
-
-#include "base/path_service.h"
-#include "chrome/browser/history/top_sites_factory.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_iterator.h"
-#include "chrome/common/chrome_paths.h"
-#include "components/history/core/browser/top_sites.h"
-#include "grit/browser_resources.h"
-#include "ui/base/resource/resource_bundle.h"
-
-BrowserListTabContentsProvider::BrowserListTabContentsProvider() {
-}
-
-BrowserListTabContentsProvider::~BrowserListTabContentsProvider() {
-}
-
-std::string BrowserListTabContentsProvider::GetDiscoveryPageHTML() {
-  std::set<Profile*> profiles;
-  for (chrome::BrowserIterator it; !it.done(); it.Next())
-    profiles.insert((*it)->profile());
-
-  for (std::set<Profile*>::iterator it = profiles.begin();
-       it != profiles.end(); ++it) {
-    scoped_refptr<history::TopSites> ts = TopSitesFactory::GetForProfile(*it);
-    if (ts) {
-      // TopSites updates itself after a delay. Ask TopSites to update itself
-      // when we're about to show the remote debugging landing page.
-      ts->SyncWithHistory();
-    }
-  }
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
-}
-
-bool BrowserListTabContentsProvider::BundlesFrontendResources() {
-  return true;
-}
-
-base::FilePath BrowserListTabContentsProvider::GetDebugFrontendDir() {
-#if defined(DEBUG_DEVTOOLS)
-  base::FilePath inspector_dir;
-  PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir);
-  return inspector_dir;
-#else
-  return base::FilePath();
-#endif
-}
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.h b/chrome/browser/devtools/browser_list_tabcontents_provider.h
deleted file mode 100644
index fa36ae1..0000000
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CHROME_BROWSER_DEVTOOLS_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
-#define CHROME_BROWSER_DEVTOOLS_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
-
-#include "chrome/browser/ui/host_desktop.h"
-#include "content/public/browser/devtools_http_handler_delegate.h"
-
-class BrowserListTabContentsProvider
-    : public content::DevToolsHttpHandlerDelegate {
- public:
-  BrowserListTabContentsProvider();
-  ~BrowserListTabContentsProvider() override;
-
-  // DevToolsHttpHandlerDelegate implementation.
-  std::string GetDiscoveryPageHTML() override;
-  bool BundlesFrontendResources() override;
-  base::FilePath GetDebugFrontendDir() override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BrowserListTabContentsProvider);
-};
-
-#endif  // CHROME_BROWSER_DEVTOOLS_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index db9eb50..382133c 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -14,7 +14,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/devtools/browser_list_tabcontents_provider.h"
 #include "chrome/browser/devtools/device/self_device_provider.h"
 #include "chrome/browser/devtools/devtools_window_testing.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ -39,7 +38,6 @@
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc
index 9805cd9..4fe1064 100644
--- a/chrome/browser/devtools/remote_debugging_server.cc
+++ b/chrome/browser/devtools/remote_debugging_server.cc
@@ -7,11 +7,22 @@
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
-#include "chrome/browser/devtools/browser_list_tabcontents_provider.h"
+#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
+#include "chrome/browser/history/top_sites_factory.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_iterator.h"
+#include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
-#include "content/public/browser/devtools_http_handler.h"
+#include "chrome/common/chrome_version_info.h"
+#include "components/devtools_http_handler/devtools_http_handler.h"
+#include "components/devtools_http_handler/devtools_http_handler_delegate.h"
+#include "components/history/core/browser/top_sites.h"
+#include "content/public/browser/devtools_frontend_host.h"
+#include "grit/browser_resources.h"
 #include "net/base/net_errors.h"
 #include "net/socket/tcp_server_socket.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
@@ -22,7 +33,7 @@ const uint16 kMaxTetheringPort = 9444;
 const int kBackLog = 10;
 
 class TCPServerSocketFactory
-    : public content::DevToolsHttpHandler::ServerSocketFactory {
+    : public devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory {
  public:
   TCPServerSocketFactory(const std::string& address, uint16 port)
       : address_(address),
@@ -31,7 +42,7 @@ class TCPServerSocketFactory
   }
 
  private:
-  // content::DevToolsHttpHandler::ServerSocketFactory.
+  // devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory.
   scoped_ptr<net::ServerSocket> CreateForHttpServer() override {
     scoped_ptr<net::ServerSocket> socket(
         new net::TCPServerSocket(nullptr, net::NetLog::Source()));
@@ -65,6 +76,49 @@ class TCPServerSocketFactory
   DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
 };
 
+class ChromeDevToolsHttpHandlerDelegate
+    : public devtools_http_handler::DevToolsHttpHandlerDelegate {
+ public:
+  ChromeDevToolsHttpHandlerDelegate();
+  ~ChromeDevToolsHttpHandlerDelegate() override;
+
+  // devtools_http_handler::DevToolsHttpHandlerDelegate implementation.
+  std::string GetDiscoveryPageHTML() override;
+  std::string GetFrontendResource(const std::string& path) override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ChromeDevToolsHttpHandlerDelegate);
+};
+
+ChromeDevToolsHttpHandlerDelegate::ChromeDevToolsHttpHandlerDelegate() {
+}
+
+ChromeDevToolsHttpHandlerDelegate::~ChromeDevToolsHttpHandlerDelegate() {
+}
+
+std::string ChromeDevToolsHttpHandlerDelegate::GetDiscoveryPageHTML() {
+  std::set<Profile*> profiles;
+  for (chrome::BrowserIterator it; !it.done(); it.Next())
+    profiles.insert((*it)->profile());
+
+  for (std::set<Profile*>::iterator it = profiles.begin();
+       it != profiles.end(); ++it) {
+    scoped_refptr<history::TopSites> ts = TopSitesFactory::GetForProfile(*it);
+    if (ts) {
+      // TopSites updates itself after a delay. Ask TopSites to update itself
+      // when we're about to show the remote debugging landing page.
+      ts->SyncWithHistory();
+    }
+  }
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+      IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
+}
+
+std::string ChromeDevToolsHttpHandlerDelegate::GetFrontendResource(
+    const std::string& path) {
+  return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
+}
+
 }  // namespace
 
 // static
@@ -85,11 +139,24 @@ RemoteDebuggingServer::RemoteDebuggingServer(
     DCHECK(result);
   }
 
-  devtools_http_handler_.reset(content::DevToolsHttpHandler::Start(
+  manager_delegate_.reset(new ChromeDevToolsManagerDelegate());
+
+  base::FilePath debug_frontend_dir;
+#if defined(DEBUG_DEVTOOLS)
+  PathService::Get(chrome::DIR_INSPECTOR, &debug_frontend_dir);
+#endif
+
+  chrome::VersionInfo version_info;
+
+  devtools_http_handler_.reset(new devtools_http_handler::DevToolsHttpHandler(
       make_scoped_ptr(new TCPServerSocketFactory(ip, port)),
       std::string(),
-      new BrowserListTabContentsProvider(),
-      output_dir));
+      new ChromeDevToolsHttpHandlerDelegate(),
+      manager_delegate_.get(),
+      output_dir,
+      debug_frontend_dir,
+      version_info.ProductNameAndVersionForUserAgent(),
+      ::GetUserAgent()));
 }
 
 RemoteDebuggingServer::~RemoteDebuggingServer() {
diff --git a/chrome/browser/devtools/remote_debugging_server.h b/chrome/browser/devtools/remote_debugging_server.h
index c8afa6f..c82565f 100644
--- a/chrome/browser/devtools/remote_debugging_server.h
+++ b/chrome/browser/devtools/remote_debugging_server.h
@@ -11,10 +11,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/host_desktop.h"
 
-namespace content {
+namespace devtools_http_handler {
 class DevToolsHttpHandler;
 }
 
+class ChromeDevToolsManagerDelegate;
+
 class RemoteDebuggingServer {
  public:
   static void EnableTetheringForDebug();
@@ -26,7 +28,9 @@ class RemoteDebuggingServer {
   virtual ~RemoteDebuggingServer();
 
  private:
-  scoped_ptr<content::DevToolsHttpHandler> devtools_http_handler_;
+  // TODO(dgozman): remove once devtools_discovery component is extracted.
+  scoped_ptr<ChromeDevToolsManagerDelegate> manager_delegate_;
+  scoped_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_;
   DISALLOW_COPY_AND_ASSIGN(RemoteDebuggingServer);
 };
 
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
index 9acec23..c5900b8 100644
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -32,7 +32,6 @@
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
@@ -54,7 +53,6 @@
 #include "ui/base/l10n/l10n_util.h"
 
 using content::DevToolsAgentHost;
-using content::DevToolsHttpHandler;
 using content::RenderProcessHost;
 using content::RenderViewHost;
 using content::RenderWidgetHost;
@@ -581,7 +579,7 @@ bool DebuggerAttachFunction::RunAsync() {
   if (!InitAgentHost())
     return false;
 
-  if (!DevToolsHttpHandler::IsSupportedProtocolVersion(
+  if (!DevToolsAgentHost::IsSupportedProtocolVersion(
           params->required_version)) {
     error_ = ErrorUtils::FormatErrorMessage(
         keys::kProtocolVersionNotSupportedError,
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index 6daac95..541fcc3 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/devtools_http_handler.h"
+#include "content/public/browser/devtools_frontend_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
@@ -18,7 +18,6 @@
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
 using content::WebContents;
@@ -184,17 +183,15 @@ void DevToolsDataSource::StartBundledDataRequest(
     int render_frame_id,
     const content::URLDataSource::GotDataCallback& callback) {
   std::string filename = PathWithoutParams(path);
+  base::StringPiece resource =
+      content::DevToolsFrontendHost::GetFrontendResource(filename);
 
-  int resource_id =
-      content::DevToolsHttpHandler::GetFrontendResourceId(filename);
-
-  DLOG_IF(WARNING, resource_id == -1)
+  DLOG_IF(WARNING, resource.empty())
       << "Unable to find dev tool resource: " << filename
       << ". If you compiled with debug_devtools=1, try running with "
          "--debug-devtools.";
-  const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  scoped_refptr<base::RefCountedStaticMemory> bytes(rb.LoadDataResourceBytes(
-      resource_id));
+  scoped_refptr<base::RefCountedStaticMemory> bytes(
+      new base::RefCountedStaticMemory(resource.data(), resource.length()));
   callback.Run(bytes.get());
 }
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 278066e..c2496be 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3089,6 +3089,7 @@
             '../components/components.gyp:autofill_content_browser',
             '../components/components.gyp:browsing_data',
             '../components/components.gyp:data_reduction_proxy_content_browser',
+            '../components/components.gyp:devtools_http_handler',
             '../components/components.gyp:dom_distiller_content',
             '../components/components.gyp:favicon_content',
             '../components/components.gyp:history_content_browser',
diff --git a/chrome/chrome_debugger.gypi b/chrome/chrome_debugger.gypi
index 09b182a..f91380b 100644
--- a/chrome/chrome_debugger.gypi
+++ b/chrome/chrome_debugger.gypi
@@ -41,6 +41,7 @@
       'conditions': [
         ['OS!="android"', {
           'dependencies': [
+            '../components/components.gyp:devtools_http_handler',
             '../net/net.gyp:http_server',
             '../skia/skia.gyp:skia',
             '../third_party/icu/icu.gyp:icui18n',
@@ -56,8 +57,6 @@
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/webrtc_device_provider_resources_map.cc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/webrtc_device_provider_resources_map.h',
-            'browser/devtools/browser_list_tabcontents_provider.cc',
-            'browser/devtools/browser_list_tabcontents_provider.h',
             'browser/devtools/chrome_devtools_manager_delegate.cc',
             'browser/devtools/chrome_devtools_manager_delegate.h',
             'browser/devtools/device/adb/adb_client_socket.cc',