Commit f8fc8377 authored by Pavel Feldman's avatar Pavel Feldman Committed by Commit Bot

DevTools headless harness: allow loadScript.

TBR: kvitekp
Change-Id: Ib8fec97ff936788c9e783686531a98929c4b801f
Reviewed-on: https://chromium-review.googlesource.com/1132621Reviewed-by: default avatarPavel Feldman <pfeldman@chromium.org>
Commit-Queue: Pavel Feldman <pfeldman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574035}
parent 426a53b7
...@@ -26,13 +26,6 @@ DevToolsHost.dummyPageURL = `http://127.0.0.1:${window.location.port}/protocol/i ...@@ -26,13 +26,6 @@ DevToolsHost.dummyPageURL = `http://127.0.0.1:${window.location.port}/protocol/i
<script src="../../resources/inspector-protocol-test.js"></script> <script src="../../resources/inspector-protocol-test.js"></script>
<script> <script>
DevToolsAPI._log = text => output.push(text); DevToolsAPI._log = text => output.push(text);
DevToolsAPI._fetch = url => {
var params = new URLSearchParams(window.location.search);
var testScriptURL = params.get('test');
if (url === testScriptURL)
return Promise.resolve(decodeURIComponent(params.get('script')));
throw new Error('Can not fetch ' + url);
};
function onmessage(json) { DevToolsAPI.dispatchMessage(json); } function onmessage(json) { DevToolsAPI.dispatchMessage(json); }
</script> </script>
......
...@@ -50,12 +50,6 @@ class HeadlessProtocolBrowserTest ...@@ -50,12 +50,6 @@ class HeadlessProtocolBrowserTest
browser_devtools_client_->SetRawProtocolListener(this); browser_devtools_client_->SetRawProtocolListener(this);
} }
std::string EncodeQuery(const std::string& query) {
url::RawCanonOutputT<char> buffer;
url::EncodeURIComponent(query.data(), query.size(), &buffer);
return std::string(buffer.data(), buffer.length());
}
void RunDevTooledTest() override { void RunDevTooledTest() override {
base::ScopedAllowBlockingForTesting allow_blocking; base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath src_dir; base::FilePath src_dir;
...@@ -70,10 +64,11 @@ class HeadlessProtocolBrowserTest ...@@ -70,10 +64,11 @@ class HeadlessProtocolBrowserTest
FinishTest(); FinishTest();
return; return;
} }
GURL test_url = embedded_test_server()->GetURL("/protocol/" + script_name_); GURL test_url = embedded_test_server()->GetURL("harness.test",
"/protocol/" + script_name_);
GURL page_url = embedded_test_server()->GetURL( GURL page_url = embedded_test_server()->GetURL(
"harness.test", "/protocol/inspector-protocol-test.html?test=" + "harness.test",
test_url.spec() + "&script=" + EncodeQuery(script)); "/protocol/inspector-protocol-test.html?test=" + test_url.spec());
devtools_client_->GetPage()->Navigate(page_url.spec()); devtools_client_->GetPage()->Navigate(page_url.spec());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment