[Chromecast] Moves remote debugging start decision into CastContentBrowserClient.

This makes it a runtime decision based on CCBC rather than linking in separate
method definition.

R=halliwell@chromium.org,slan@chromium.org
BUG=None

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

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

8 files changed, 14 insertions, 26 deletions

diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn
index 4022d19..f787f03 100644
--- a/chromecast/browser/BUILD.gn
+++ b/chromecast/browser/BUILD.gn
@@ -55,7 +55,6 @@ source_set("browser") {
     sources += [
       "cast_content_browser_client_simple.cc",
       "cast_network_delegate_simple.cc",
-      "devtools/remote_debugging_server_simple.cc",
       "pref_service_helper_simple.cc",
     ]
   }
diff --git a/chromecast/browser/cast_browser_main_parts.cc b/chromecast/browser/cast_browser_main_parts.cc
index 80e17d8..69ecc4a 100644
--- a/chromecast/browser/cast_browser_main_parts.cc
+++ b/chromecast/browser/cast_browser_main_parts.cc
@@ -331,8 +331,9 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
   if (!PlatformClientAuth::Initialize())
     LOG(ERROR) << "PlatformClientAuth::Initialize failed.";
 
-  cast_browser_process_->SetRemoteDebuggingServer(
-      make_scoped_ptr(new RemoteDebuggingServer()));
+  cast_browser_process_->SetRemoteDebuggingServer(make_scoped_ptr(
+      new RemoteDebuggingServer(cast_browser_process_->browser_client()->
+          EnableRemoteDebuggingImmediately())));
 
   media::MediaMessageLoop::GetTaskRunner()->PostTask(
       FROM_HERE,
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
index 6ef2d5b..b8d576b 100644
--- a/chromecast/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -106,6 +106,10 @@ void CastContentBrowserClient::RegisterMetricsProviders(
     ::metrics::MetricsService* metrics_service) {
 }
 
+bool CastContentBrowserClient::EnableRemoteDebuggingImmediately() {
+  return true;
+}
+
 content::BrowserMainParts* CastContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams& parameters) {
   content::BrowserMainParts* parts = new CastBrowserMainParts(
diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h
index 36ffae0..14df5e3 100644
--- a/chromecast/browser/cast_content_browser_client.h
+++ b/chromecast/browser/cast_content_browser_client.h
@@ -83,6 +83,10 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
   virtual void RegisterMetricsProviders(
       ::metrics::MetricsService* metrics_service);
 
+  // Returns whether or not the remote debugging service should be started
+  // on browser startup.
+  virtual bool EnableRemoteDebuggingImmediately();
+
   // content::ContentBrowserClient implementation:
   content::BrowserMainParts* CreateBrowserMainParts(
       const content::MainFunctionParams& parameters) override;
diff --git a/chromecast/browser/devtools/remote_debugging_server.cc b/chromecast/browser/devtools/remote_debugging_server.cc
index 2387bbe..494d3c4 100644
--- a/chromecast/browser/devtools/remote_debugging_server.cc
+++ b/chromecast/browser/devtools/remote_debugging_server.cc
@@ -113,7 +113,7 @@ std::string GetFrontendUrl() {
 
 }  // namespace
 
-RemoteDebuggingServer::RemoteDebuggingServer()
+RemoteDebuggingServer::RemoteDebuggingServer(bool start_immediately)
     : port_(kDefaultRemoteDebuggingPort) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   pref_enabled_.Init(prefs::kEnableRemoteDebugging,
@@ -135,7 +135,7 @@ RemoteDebuggingServer::RemoteDebuggingServer()
 
   // Starts new dev tools, clearing port number saved in config.
   // Remote debugging in production must be triggered only by config server.
-  pref_enabled_.SetValue(ShouldStartImmediately() && port_ != 0);
+  pref_enabled_.SetValue(start_immediately && port_ != 0);
   OnEnabledChanged();
 }
 
diff --git a/chromecast/browser/devtools/remote_debugging_server.h b/chromecast/browser/devtools/remote_debugging_server.h
index 146f137..ba32cc7 100644
--- a/chromecast/browser/devtools/remote_debugging_server.h
+++ b/chromecast/browser/devtools/remote_debugging_server.h
@@ -19,17 +19,13 @@ class CastDevToolsManagerDelegate;
 
 class RemoteDebuggingServer {
  public:
-  RemoteDebuggingServer();
+  explicit RemoteDebuggingServer(bool start_immediately);
   ~RemoteDebuggingServer();
 
  private:
   // Called when pref_enabled_ is changed.
   void OnEnabledChanged();
 
-  // Returns whether or not the remote debugging server should be available
-  // on device startup.
-  bool ShouldStartImmediately();
-
   scoped_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_;
 
   BooleanPrefMember pref_enabled_;
diff --git a/chromecast/browser/devtools/remote_debugging_server_simple.cc b/chromecast/browser/devtools/remote_debugging_server_simple.cc
deleted file mode 100644
index 3c5f5b7..0000000
--- a/chromecast/browser/devtools/remote_debugging_server_simple.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 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 "chromecast/browser/devtools/remote_debugging_server.h"
-
-namespace chromecast {
-namespace shell {
-
-bool RemoteDebuggingServer::ShouldStartImmediately() {
-  return true;
-}
-
-}  // namespace shell
-}  // namespace chromecast
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index 432c396..24bcb67 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -409,7 +409,6 @@
           'sources': [
             'browser/cast_content_browser_client_simple.cc',
             'browser/cast_network_delegate_simple.cc',
-            'browser/devtools/remote_debugging_server_simple.cc',
             'browser/pref_service_helper_simple.cc',
             'common/platform_client_auth_simple.cc',
             'renderer/cast_content_renderer_client_simple.cc',