[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 87 matching lines @@
     return;
   DictionaryPrefUpdate update(profile->GetPrefs(), prefs::kDevToolsPreferences);
   for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     if (!it.value().IsType(base::Value::TYPE_STRING))
       continue;
     update.Get()->SetWithoutPathExpansion(
         it.key(), it.value().CreateDeepCopy());
   }
 }
 
+std::string ConvertFlagsToQueryParams(const std::string flags) {

[pfeldman, 2016/10/11 20:51:34]

Lets assume it is already of the target form.

[dgozman, 2016/10/11 21:09:14]

Done.

+  std::vector<std::string> query;
+  std::unique_ptr<base::Value> json = base::JSONReader::Read(flags);
+  if (!json)
+    return std::string();
+  base::DictionaryValue* dict;
+  json->GetAsDictionary(&dict);
+  if (!dict)
+    return std::string();
+  base::DictionaryValue result;
+  for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
+      it.Advance()) {
+    if (!it.value().IsType(base::Value::TYPE_STRING))
+      return std::string();
+    std::string value;
+    it.value().GetAsString(&value);
+    query.push_back(
+        base::StringPrintf("%s=%s", it.key().c_str(), value.c_str()));
+  }
+  if (query.empty())
+    return std::string();
+  return base::JoinString(query, "&");
+}
+
 // DevToolsToolboxDelegate ----------------------------------------------------
 
 class DevToolsToolboxDelegate
     : public content::WebContentsObserver,
       public content::WebContentsDelegate {
  public:
   DevToolsToolboxDelegate(
       WebContents* toolbox_contents,
       DevToolsWindow::ObserverWithAccessor* web_contents_observer);
   ~DevToolsToolboxDelegate() override;
@@ skipping 81 matching lines @@
       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;
+    flags = ConvertFlagsToQueryParams(flags);
+    if (!flags.empty())
+      url_string += "&" + flags;
   }
 
 #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 455 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;
 }