Merge to 2883 "[DevTools] Move sanitize url to devtools_ui.cc."

chrome/browser/devtools/devtools_window.cc

 // 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/devtools_window.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 186 matching lines @@
   std::string frontend_url = base_url.spec();
   std::string url_string(
       frontend_url +
       ((frontend_url.find("?") == std::string::npos) ? "?" : "&") +
       "dockSide=undocked"); // TODO(dgozman): remove this support in M38.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableDevToolsExperiments))
     url_string += "&experiments=true";
 
   if (command_line->HasSwitch(switches::kDevToolsFlags)) {
-    std::string flags = command_line->GetSwitchValueASCII(
-                            switches::kDevToolsFlags);
-    flags = net::EscapeQueryParamValue(flags, false);
-    url_string += "&flags=" + flags;
+    url_string += "&" + command_line->GetSwitchValueASCII(
+        switches::kDevToolsFlags);
   }
 
 #if defined(DEBUG_DEVTOOLS)
   url_string += "&debugFrontend=true";
 #endif  // defined(DEBUG_DEVTOOLS)
 
   return GURL(url_string);
 }
 
 }  // namespace
@@ skipping 674 matching lines @@
     url_string += "&isSharedWorker=true";
   if (v8_only_frontend)
     url_string += "&v8only=true";
   if (remote_frontend.size()) {
     url_string += "&remoteFrontend=true";
   } else {
     url_string += "&remoteBase=" + DevToolsUI::GetRemoteBaseURL().spec();
   }
   if (can_dock)
     url_string += "&can_dock=true";
-  return GURL(url_string);
+  return DevToolsUI::SanitizeFrontendURL(GURL(url_string));
 }
 
 // static
 DevToolsWindow* DevToolsWindow::FindDevToolsWindow(
     DevToolsAgentHost* agent_host) {
   if (!agent_host || g_instances == NULL)
     return NULL;
   DevToolsWindows* instances = g_instances.Pointer();
   for (DevToolsWindows::iterator it(instances->begin()); it != instances->end();
        ++it) {
@@ skipping 461 matching lines @@
 bool DevToolsWindow::ReloadInspectedWebContents(bool bypass_cache) {
   // Only route reload via front-end if the agent is attached.
   WebContents* wc = GetInspectedWebContents();
   if (!wc || wc->GetCrashedStatus() != base::TERMINATION_STATUS_STILL_RUNNING)
     return false;
   base::FundamentalValue bypass_cache_value(bypass_cache);
   bindings_->CallClientFunction("DevToolsAPI.reloadInspectedPage",
                                 &bypass_cache_value, nullptr, nullptr);
   return true;
 }