diff options
| author | asanka@chromium.org <asanka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 17:29:22 +0000 |
|---|---|---|
| committer | asanka@chromium.org <asanka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 17:29:22 +0000 |
| commit | 35179d3b5e435b0cec811f778c162ce318f73167 (patch) | |
| tree | 5a38a61570d7db026178bb62da223ac7f509a23e /chrome/browser/gpu_crash_browsertest.cc | |
| parent | dc84cd67030349253c5ee2cdb48071cfa9234740 (diff) | |
| download | chromium_src-35179d3b5e435b0cec811f778c162ce318f73167.zip chromium_src-35179d3b5e435b0cec811f778c162ce318f73167.tar.gz chromium_src-35179d3b5e435b0cec811f778c162ce318f73167.tar.bz2 | |
Fix test bustage after FilePathToFileURL change.
r86836 changed the implementation of FilePathToFileURL to escape the '?' in paths. The '?' is a valid character in Posix paths. This broke a few tests which used the '?' as a way to pass in query strings to file:// URLs.
BUG=tests fail
TEST=gpu_tests && ui_tests --gtest_filter=Dromaeo*Test.* --run-dromaeo-benchmark
Review URL: http://codereview.chromium.org/7062049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_crash_browsertest.cc')
| -rw-r--r-- | chrome/browser/gpu_crash_browsertest.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/gpu_crash_browsertest.cc b/chrome/browser/gpu_crash_browsertest.cc index f333155..35719a3 100644 --- a/chrome/browser/gpu_crash_browsertest.cc +++ b/chrome/browser/gpu_crash_browsertest.cc @@ -59,8 +59,10 @@ class GPUCrashTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(GPUCrashTest, Kill) { ui_test_utils::DOMMessageQueue message_queue; - ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL( - gpu_test_dir_.AppendASCII("webgl.html?query=kill"))); + ui_test_utils::NavigateToURL( + browser(), + ui_test_utils::GetFileUrlWithQuery( + gpu_test_dir_.AppendASCII("webgl.html"), "query=kill")); SimulateGPUCrash(browser()); std::string m; @@ -72,8 +74,11 @@ IN_PROC_BROWSER_TEST_F(GPUCrashTest, Kill) { IN_PROC_BROWSER_TEST_F(GPUCrashTest, WebkitLoseContext) { ui_test_utils::DOMMessageQueue message_queue; - ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL( - gpu_test_dir_.AppendASCII("webgl.html?query=WEBKIT_lose_context"))); + ui_test_utils::NavigateToURL( + browser(), + ui_test_utils::GetFileUrlWithQuery( + gpu_test_dir_.AppendASCII("webgl.html"), + "query=WEBKIT_lose_context")); std::string m; ASSERT_TRUE(message_queue.WaitForMessage(&m)); |