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

2 files changed, 18 insertions, 14 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));
diff --git a/chrome/test/ui/dromaeo_benchmark_uitest.cc b/chrome/test/ui/dromaeo_benchmark_uitest.cc
index a7b0af1..59a780e 100644
--- a/chrome/test/ui/dromaeo_benchmark_uitest.cc
+++ b/chrome/test/ui/dromaeo_benchmark_uitest.cc
@@ -12,6 +12,7 @@
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
+#include "chrome/test/ui_test_utils.h"
 #include "chrome/test/ui/javascript_test_util.h"
 #include "chrome/test/ui/ui_perf_test.h"
 #include "content/common/json_value_serializer.h"
@@ -31,13 +32,11 @@ class DromaeoTest : public UIPerfTest {
     show_window_ = true;
   }
 
-  void RunTest(const FilePath::CharType* suite) {
+  void RunTest(const std::string& suite) {
     FilePath test_path = GetDromaeoDir();
-    test_path = test_path.Append(
-        FilePath::StringType(FILE_PATH_LITERAL("index.html?")) +
-        FilePath::StringType(suite) +
-        FilePath::StringType(FILE_PATH_LITERAL("&automated")));
-    GURL test_url(net::FilePathToFileURL(test_path));
+    std::string query_string = suite + "&automated";
+    test_path = test_path.Append(FILE_PATH_LITERAL("index.html"));
+    GURL test_url(ui_test_utils::GetFileUrlWithQuery(test_path, query_string));
 
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(test_url));
@@ -149,28 +148,28 @@ TEST_F(DromaeoTest, DOMCorePerf) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
     return;
 
-  RunTest(FILE_PATH_LITERAL("dom"));
+  RunTest("dom");
 }
 
 TEST_F(DromaeoTest, JSLibPerf) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
     return;
 
-  RunTest(FILE_PATH_LITERAL("jslib"));
+  RunTest("jslib");
 }
 
 TEST_F(DromaeoReferenceTest, DOMCorePerf) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
     return;
 
-  RunTest(FILE_PATH_LITERAL("dom"));
+  RunTest("dom");
 }
 
 TEST_F(DromaeoReferenceTest, JSLibPerf) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
     return;
 
-  RunTest(FILE_PATH_LITERAL("jslib"));
+  RunTest("jslib");
 }