DevTools: allow query parameters and fragments in remote debugging command urls.

Review URL: https://chromiumcodereview.appspot.com/11591016

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

2 files changed, 10 insertions, 1 deletions

diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc
index 377ec1c..a9feb7e 100644
--- a/content/browser/debugger/devtools_http_handler_impl.cc
+++ b/content/browser/debugger/devtools_http_handler_impl.cc
@@ -479,6 +479,15 @@ void DevToolsHttpHandlerImpl::OnJsonRequestUI(
     path = path.substr(0, jsonp_pos);
   }
 
+  // Trim fragment and query
+  size_t query_pos = path.find("?");
+  if (query_pos != std::string::npos)
+    path = path.substr(0, query_pos);
+
+  size_t fragment_pos = path.find("#");
+  if (fragment_pos != std::string::npos)
+    path = path.substr(0, fragment_pos);
+
   std::string command;
   std::string target_id;
   if (!ParseJsonPath(path, &command, &target_id)) {
diff --git a/content/shell/shell_devtools_discovery_page.html b/content/shell/shell_devtools_discovery_page.html
index e8a730a..9aa4c30 100644
--- a/content/shell/shell_devtools_discovery_page.html
+++ b/content/shell/shell_devtools_discovery_page.html
@@ -7,7 +7,7 @@
 <script>
 function onLoad() {
   var tabs_list_request = new XMLHttpRequest();
-  tabs_list_request.open("GET", "/json" + new Date().getTime(), true);
+  tabs_list_request.open("GET", "/json/list?t=" + new Date().getTime(), true);
   tabs_list_request.onreadystatechange = onReady;
   tabs_list_request.send();
 }