Added command line flag for enabling DevTools experiments.

BUG=108691


Review URL: http://codereview.chromium.org/9047004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115838 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 19 insertions, 7 deletions

diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index f1f2399..fdde969 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -27,6 +27,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
@@ -530,13 +531,18 @@ GURL DevToolsWindow::GetDevToolsUrl(Profile* profile, bool docked,
   SkColor color_tab_text =
       tp->GetColor(ThemeService::COLOR_BOOKMARK_TEXT);
 
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  bool experiments_enabled =
+      command_line.HasSwitch(switches::kEnableDevToolsExperiments);
+
   std::string url_string = StringPrintf(
-      "%sdevtools.html?docked=%s&toolbarColor=%s&textColor=%s%s",
+      "%sdevtools.html?docked=%s&toolbarColor=%s&textColor=%s%s%s",
       chrome::kChromeUIDevToolsURL,
       docked ? "true" : "false",
       SkColorToRGBAString(color_toolbar).c_str(),
       SkColorToRGBAString(color_tab_text).c_str(),
-      shared_worker_frontend ? "&isSharedWorker=true" : "");
+      shared_worker_frontend ? "&isSharedWorker=true" : "",
+      experiments_enabled ? "&experiments=true" : "");
   return GURL(url_string);
 }
 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index f9a8cd6..377b1f6 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -473,6 +473,9 @@ const char kEnableCRLSets[]                 = "enable-crl-sets";
 // Enables web developers to create apps for Chrome without using crx packages.
 const char kEnableCrxlessWebApps[]          = "enable-crxless-web-apps";
 
+// If true devtools experimental settings are enabled.
+const char kEnableDevToolsExperiments[]     = "enable-devtools-experiments";
+
 // Enables extension APIs that are in development.
 const char kEnableExperimentalExtensionApis[] =
     "enable-experimental-extension-apis";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 8c2629f..eb75552 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -138,6 +138,7 @@ extern const char kEnableCompositeToTexture[];
 extern const char kEnableConnectBackupJobs[];
 extern const char kEnableCRLSets[];
 extern const char kEnableCrxlessWebApps[];
+extern const char kEnableDevToolsExperiments[];
 extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExtensionActivityLogging[];
 extern const char kEnableExtensionAlerts[];
diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc
index eee97c5..73a9e67 100644
--- a/content/browser/debugger/devtools_http_handler_impl.cc
+++ b/content/browser/debugger/devtools_http_handler_impl.cc
@@ -324,11 +324,13 @@ void DevToolsHttpHandlerImpl::OnJsonRequestUI(
                            base::StringPrintf("ws://%s/devtools/page/%d",
                                               host.c_str(),
                                               i->id));
-      page_info->SetString("devtoolsFrontendUrl",
-                           base::StringPrintf("%s?host=%s&page=%d",
-                                              overridden_frontend_url_.c_str(),
-                                              host.c_str(),
-                                              i->id));
+      std::string devtools_frontend_url = base::StringPrintf(
+          "%s%shost=%s&page=%d",
+          overridden_frontend_url_.c_str(),
+          overridden_frontend_url_.find("?") == std::string::npos ? "?" : "&",
+          host.c_str(),
+          i->id);
+      page_info->SetString("devtoolsFrontendUrl", devtools_frontend_url);
     }
   }