| Index: content/shell/browser/layout_test/layout_test_devtools_frontend.cc
|
| diff --git a/content/shell/browser/layout_test/layout_test_devtools_frontend.cc b/content/shell/browser/layout_test/layout_test_devtools_frontend.cc
|
| index 64d8035b428d2512ce0eef08b86ac759d716d073..7b87fcb6c571737c262e7d3b22a1edc58faabed7 100644
|
| --- a/content/shell/browser/layout_test/layout_test_devtools_frontend.cc
|
| +++ b/content/shell/browser/layout_test/layout_test_devtools_frontend.cc
|
| @@ -17,7 +17,7 @@ namespace content {
|
| // static
|
| LayoutTestDevToolsFrontend* LayoutTestDevToolsFrontend::Show(
|
| WebContents* inspected_contents,
|
| - const std::string& settings,
|
| + const std::string& test_path,
|
| const std::string& frontend_url) {
|
| Shell* shell = Shell::CreateNewWindow(inspected_contents->GetBrowserContext(),
|
| GURL(),
|
| @@ -25,15 +25,15 @@ LayoutTestDevToolsFrontend* LayoutTestDevToolsFrontend::Show(
|
| gfx::Size());
|
| LayoutTestDevToolsFrontend* devtools_frontend =
|
| new LayoutTestDevToolsFrontend(shell, inspected_contents);
|
| -
|
| - shell->LoadURL(GetDevToolsPathAsURL(settings, frontend_url));
|
| + devtools_frontend->preferences()->
|
| + SetStringWithoutPathExpansion("testPath", "\"" + test_path + "\"");
|
| + shell->LoadURL(GetDevToolsPathAsURL(frontend_url));
|
|
|
| return devtools_frontend;
|
| }
|
|
|
| // static.
|
| GURL LayoutTestDevToolsFrontend::GetDevToolsPathAsURL(
|
| - const std::string& settings,
|
| const std::string& frontend_url) {
|
| if (!frontend_url.empty())
|
| return GURL(frontend_url);
|
| @@ -51,18 +51,16 @@ GURL LayoutTestDevToolsFrontend::GetDevToolsPathAsURL(
|
| base::FilePath dev_tools_path =
|
| dir_exe.AppendASCII("resources/inspector/devtools.html");
|
|
|
| - GURL result = net::FilePathToFileURL(dev_tools_path);
|
| - if (!settings.empty())
|
| - result = GURL(base::StringPrintf("%s?settings=%s&experiments=true",
|
| - result.spec().c_str(),
|
| - settings.c_str()));
|
| - return result;
|
| + return net::FilePathToFileURL(dev_tools_path);
|
| }
|
|
|
| -void LayoutTestDevToolsFrontend::ReuseFrontend(const std::string& settings,
|
| +void LayoutTestDevToolsFrontend::ReuseFrontend(const std::string& test_path,
|
| const std::string frontend_url) {
|
| DisconnectFromTarget();
|
| - frontend_shell()->LoadURL(GetDevToolsPathAsURL(settings, frontend_url));
|
| + preferences()->Clear();
|
| + preferences()->SetStringWithoutPathExpansion("testPath",
|
| + "\"" + test_path + "\"");
|
| + frontend_shell()->LoadURL(GetDevToolsPathAsURL(frontend_url));
|
| }
|
|
|
| LayoutTestDevToolsFrontend::LayoutTestDevToolsFrontend(
|
|
|