Merge to 2743 "[DevTools] Whitelist remoteFrontendUrl and remoteBase params."

third_party/WebKit/Source/devtools/front_end/devtools.js

Index: third_party/WebKit/Source/devtools/front_end/devtools.js
diff --git a/third_party/WebKit/Source/devtools/front_end/devtools.js b/third_party/WebKit/Source/devtools/front_end/devtools.js
index 1e8c833e8a0ae576bb846e5f67470e8741ef818c..8733ac56cbc029c524cfe7717a346c1c7d046389 100644
--- a/third_party/WebKit/Source/devtools/front_end/devtools.js
+++ b/third_party/WebKit/Source/devtools/front_end/devtools.js
@@ -984,6 +984,8 @@ function installObjectObserve()
  */
 function sanitizeRemoteFrontendUrl()
 {
+    var remoteBaseRegexp = /^https:\/\/chrome-devtools-frontend\.appspot\.com\/serve_file\/@[0-9a-zA-Z]+\/?$/;
+    var remoteFrontendUrlRegexp = /^https:\/\/chrome-devtools-frontend\.appspot\.com\/serve_rev\/@?[0-9a-zA-Z]+\/(devtools|inspector)\.html$/;
     var queryParams = location.search;
     if (!queryParams)
         return;
@@ -992,7 +994,9 @@ function sanitizeRemoteFrontendUrl()
         var pair = params[i].split("=");
         var name = pair.shift();
         var value = pair.join("=");
-        if (name === "remoteFrontendUrl" && !value.startsWith("https://chrome-devtools-frontend.appspot.com/"))
+        if (name === "remoteFrontendUrl" && !remoteFrontendUrlRegexp.test(value))
+            location.search = "";
+        if (name === "remoteBase" && !remoteBaseRegexp.test(value))
             location.search = "";
     }
 }