Merge UiTest::GetTest* and ui_test_utils::GetTest*. Convert these utility functions to use FilePaths.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1567009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43190 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 111 insertions, 113 deletions

diff --git a/chrome/test/ui/fast_shutdown_uitest.cc b/chrome/test/ui/fast_shutdown_uitest.cc
index 6f4e174..6cb01aa 100644
--- a/chrome/test/ui/fast_shutdown_uitest.cc
+++ b/chrome/test/ui/fast_shutdown_uitest.cc
@@ -3,13 +3,15 @@
 // found in the LICENSE file.
 
 #include "app/message_box_flags.h"
+#include "base/file_path.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/test/ui/ui_test.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
+#include "chrome/test/ui/ui_test.h"
+#include "chrome/test/ui_test_utils.h"
 #include "gfx/rect.h"
 #include "views/event.h"
 
@@ -26,7 +28,9 @@ TEST_F(FastShutdown, DISABLED_SlowTermination) {
   ASSERT_TRUE(window.get());
 
   // This page has an unload handler.
-  NavigateToURL(GetTestUrl(L"fast_shutdown", L"on_unloader.html"));
+  const FilePath dir(FILE_PATH_LITERAL("fast_shutdown"));
+  const FilePath file(FILE_PATH_LITERAL("on_unloader.html"));
+  NavigateToURL(ui_test_utils::GetTestUrl(dir, file));
   gfx::Rect bounds;
   ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_CONTAINER, &bounds, true));
   // This click will launch a popup which has a before unload handler.
diff --git a/chrome/test/ui/history_uitest.cc b/chrome/test/ui/history_uitest.cc
index 22c1aee..47f18a2 100644
--- a/chrome/test/ui/history_uitest.cc
+++ b/chrome/test/ui/history_uitest.cc
@@ -4,20 +4,23 @@
 
 // History UI tests
 
-#include "base/file_util.h"
+#include "base/file_path.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "gfx/point.h"
+#include "chrome/test/ui_test_utils.h"
 #include "gfx/rect.h"
-#include "net/base/net_util.h"
 #include "views/event.h"
 
+namespace {
+
 const char kTestCompleteCookie[] = "status";
 const char kTestCompleteSuccess[] = "OK";
+const FilePath::CharType* kHistoryDir = FILE_PATH_LITERAL("History");
+
+}  // namespace
 
 class HistoryTester : public UITest {
  protected:
@@ -38,8 +41,9 @@ TEST_F(HistoryTester, FLAKY_VerifyHistoryLength1) {
   // Test the history length for the following page transitions.
   //   -open-> Page 1.
 
-  std::wstring test_case_1 = L"history_length_test_page_1.html";
-  GURL url_1 = GetTestUrl(L"History", test_case_1);
+  const FilePath test_case_1(
+      FILE_PATH_LITERAL("history_length_test_page_1.html"));
+  GURL url_1 = ui_test_utils::GetTestUrl(FilePath(kHistoryDir), test_case_1);
   NavigateToURL(url_1);
   WaitForFinish("History_Length_Test_1", "1", url_1, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
@@ -50,8 +54,9 @@ TEST_F(HistoryTester, DISABLED_VerifyHistoryLength2) {
   // Test the history length for the following page transitions.
   //   -open-> Page 2 -redirect-> Page 3.
 
-  std::wstring test_case_2 = L"history_length_test_page_2.html";
-  GURL url_2 = GetTestUrl(L"History", test_case_2);
+  const FilePath test_case_2(
+      FILE_PATH_LITERAL("history_length_test_page_2.html"));
+  GURL url_2 = ui_test_utils::GetTestUrl(FilePath(kHistoryDir), test_case_2);
   NavigateToURL(url_2);
   WaitForFinish("History_Length_Test_2", "1", url_2, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
@@ -63,8 +68,9 @@ TEST_F(HistoryTester, DISABLED_VerifyHistoryLength3) {
   //   -open-> Page 4 -navigate_backward-> Page 3 -navigate_backward->Page 1
   //   -navigate_forward-> Page 3 -navigate_forward-> Page 4
 
-  std::wstring test_case_3 = L"history_length_test_page_4.html";
-  GURL url_3 = GetTestUrl(L"History", test_case_3);
+  const FilePath test_case_3(
+      FILE_PATH_LITERAL("history_length_test_page_4.html"));
+  GURL url_3 = ui_test_utils::GetTestUrl(FilePath(kHistoryDir), test_case_3);
   NavigateToURL(url_3);
   WaitForFinish("History_Length_Test_3", "1", url_3, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
@@ -81,8 +87,9 @@ TEST_F(HistoryTester, FLAKY_ConsiderRedirectAfterGestureAsUserInitiated) {
   // redirect is more likely to be user-initiated rather than automatic.
   // Therefore, Page 11 should be in the history in addition to Page 12.
 
-  std::wstring test_case = L"history_length_test_page_11.html";
-  GURL url = GetTestUrl(L"History", test_case);
+  const FilePath test_case(
+      FILE_PATH_LITERAL("history_length_test_page_11.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kHistoryDir), test_case);
   NavigateToURL(url);
   WaitForFinish("History_Length_Test_11", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
@@ -115,8 +122,9 @@ TEST_F(HistoryTester, FLAKY_ConsiderSlowRedirectAsUserInitiated) {
   // the redirect is likely to be user-initiated.
   // Therefore, Page 21 should be in the history in addition to Page 22.
 
-  std::wstring test_case = L"history_length_test_page_21.html";
-  GURL url = GetTestUrl(L"History", test_case);
+  const FilePath test_case(
+      FILE_PATH_LITERAL("history_length_test_page_21.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kHistoryDir), test_case);
   NavigateToURL(url);
   WaitForFinish("History_Length_Test_21", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
diff --git a/chrome/test/ui/layout_plugin_uitest.cc b/chrome/test/ui/layout_plugin_uitest.cc
index e5c10f4..911ae58 100644
--- a/chrome/test/ui/layout_plugin_uitest.cc
+++ b/chrome/test/ui/layout_plugin_uitest.cc
@@ -29,7 +29,8 @@
 
 #include "chrome/test/ui/ui_test.h"
 
-#include "base/file_util.h"
+#include "base/file_path.h"
+#include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/test/ui/mouseleave_uitest.cc b/chrome/test/ui/mouseleave_uitest.cc
index be647b2..29e4f1c 100644
--- a/chrome/test/ui/mouseleave_uitest.cc
+++ b/chrome/test/ui/mouseleave_uitest.cc
@@ -2,24 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/command_line.h"
-#include "base/file_util.h"
-#include "base/path_service.h"
-#include "base/string_util.h"
-#include "base/values.h"
-#include "chrome/browser/view_ids.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
+#include "base/file_path.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
-#include "chrome/test/ui/javascript_test_util.h"
 #include "chrome/test/ui/ui_test.h"
+#include "chrome/test/ui_test_utils.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/net_util.h"
-#include "views/event.h"
 
 #if defined(OS_MACOSX)
 // window->GetViewBounds is not implemented
@@ -45,7 +36,9 @@ class MouseLeaveTest : public UITest {
 };
 
 TEST_F(MouseLeaveTest, MAYBE_TestOnMouseOut) {
-  GURL test_url = GetTestUrl(L"", L"mouseleave.html");
+  GURL test_url = ui_test_utils::GetTestUrl(
+      FilePath(FilePath::kCurrentDirectory),
+      FilePath(FILE_PATH_LITERAL("mouseleave.html")));
 
   scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(0);
   ASSERT_TRUE(browser.get());
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index c43bad4..7b61abd 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -2,22 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
+
 #if defined(OS_WIN)
 // windows headers
-#include <windows.h>
+#include <comutil.h>
 #include <shellapi.h>
 #include <shlobj.h>
-#include <comutil.h>
+#include <windows.h>
 #endif
 
 // runtime headers
+#include <memory.h>
 #include <stdlib.h>
 #include <string.h>
-#include <memory.h>
 
 #include <ostream>
 
-#include "base/file_util.h"
+#include "base/file_path.h"
 #include "base/keyboard_codes.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/common/chrome_paths.h"
@@ -26,17 +28,19 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/npapi_test_helper.h"
-#include "net/base/net_util.h"
+#include "chrome/test/ui_test_utils.h"
 
 using npapi_test::kTestCompleteCookie;
 using npapi_test::kTestCompleteSuccess;
 using npapi_test::kLongWaitTimeout;
 using npapi_test::kShortWaitTimeout;
 
+static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("npapi");
+
 // Test passing arguments to a plugin.
 TEST_F(NPAPITester, Arguments) {
-  std::wstring test_case = L"arguments.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("arguments.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("arguments", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -45,8 +49,8 @@ TEST_F(NPAPITester, Arguments) {
 // Test invoking many plugins within a single page.
 // Flaky, http://crbug.com/28372
 TEST_F(NPAPITester, FLAKY_ManyPlugins) {
-  std::wstring test_case = L"many_plugins.html";
-  GURL url(GetTestUrl(L"npapi", test_case));
+  const FilePath test_case(FILE_PATH_LITERAL("many_plugins.html"));
+  GURL url(ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case));
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
 
   for (int i = 1; i <= 15; i++) {
@@ -58,8 +62,8 @@ TEST_F(NPAPITester, FLAKY_ManyPlugins) {
 
 // Test various calls to GetURL from a plugin.
 TEST_F(NPAPITester, GetURL) {
-  std::wstring test_case = L"geturl.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("geturl.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("geturl", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -68,8 +72,8 @@ TEST_F(NPAPITester, GetURL) {
 // Test various calls to GetURL for javascript URLs with
 // non NULL targets from a plugin.
 TEST_F(NPAPITester, GetJavaScriptURL) {
-  std::wstring test_case = L"get_javascript_url.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("get_javascript_url.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("getjavascripturl", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -79,8 +83,8 @@ TEST_F(NPAPITester, GetJavaScriptURL) {
 // Test that calling GetURL with a javascript URL and target=_self
 // works properly when the plugin is embedded in a subframe.
 TEST_F(NPAPITester, FLAKY_GetJavaScriptURL2) {
-  std::wstring test_case = L"get_javascript_url2.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("get_javascript_url2.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("getjavascripturl2", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -90,8 +94,8 @@ TEST_F(NPAPITester, FLAKY_GetJavaScriptURL2) {
 // original pointer is returned and not a proxy.  If this fails the plugin
 // will crash.
 TEST_F(NPAPITester, NPObjectProxy) {
-  std::wstring test_case = L"npobject_proxy.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("npobject_proxy.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("npobject_proxy", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -100,8 +104,8 @@ TEST_F(NPAPITester, NPObjectProxy) {
 // Tests if a plugin executing a self deleting script using NPN_GetURL
 // works without crashing or hanging
 TEST_F(NPAPITester, SelfDeletePluginGetUrl) {
-  std::wstring test_case = L"self_delete_plugin_geturl.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("self_delete_plugin_geturl.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("self_delete_plugin_geturl", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -112,8 +116,8 @@ TEST_F(NPAPITester, SelfDeletePluginGetUrl) {
 // works without crashing or hanging
 // Flaky. See http://crbug.com/30702
 TEST_F(NPAPITester, FLAKY_SelfDeletePluginInvoke) {
-  std::wstring test_case = L"self_delete_plugin_invoke.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("self_delete_plugin_invoke.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("self_delete_plugin_invoke", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -123,8 +127,9 @@ TEST_F(NPAPITester, FLAKY_SelfDeletePluginInvoke) {
 // Tests if a plugin executing a self deleting script using Invoke with
 // a modal dialog showing works without crashing or hanging
 TEST_F(NPAPITester, DISABLED_SelfDeletePluginInvokeAlert) {
-  std::wstring test_case = L"self_delete_plugin_invoke_alert.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(
+      FILE_PATH_LITERAL("self_delete_plugin_invoke_alert.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
 
   // Wait for the alert dialog and then close it.
@@ -147,8 +152,9 @@ TEST_F(NPAPIVisiblePluginTester,
     return;
 
   show_window_ = true;
-  std::wstring test_case = L"execute_script_delete_in_paint.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(
+      FILE_PATH_LITERAL("execute_script_delete_in_paint.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("execute_script_delete_in_paint", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -161,8 +167,8 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNewStream) {
     return;
 
   show_window_ = true;
-  std::wstring test_case = L"self_delete_plugin_stream.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("self_delete_plugin_stream.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("self_delete_plugin_stream", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -173,8 +179,8 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNewStream) {
 // Tests if a plugin has a non zero window rect.
 TEST_F(NPAPIVisiblePluginTester, VerifyPluginWindowRect) {
   show_window_ = true;
-  std::wstring test_case = L"verify_plugin_window_rect.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("verify_plugin_window_rect.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("checkwindowrect", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -184,8 +190,8 @@ TEST_F(NPAPIVisiblePluginTester, VerifyPluginWindowRect) {
 // a paint message doesn't cause deadlock.
 TEST_F(NPAPIVisiblePluginTester, CreateInstanceInPaint) {
   show_window_ = true;
-  std::wstring test_case = L"create_instance_in_paint.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("create_instance_in_paint.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("create_instance_in_paint", "2", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -194,8 +200,8 @@ TEST_F(NPAPIVisiblePluginTester, CreateInstanceInPaint) {
 // Tests that putting up an alert in response to a paint doesn't deadlock.
 TEST_F(NPAPIVisiblePluginTester, AlertInWindowMessage) {
   show_window_ = true;
-  std::wstring test_case = L"alert_in_window_message.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("alert_in_window_message.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
 
   bool modal_dialog_showing = false;
@@ -223,8 +229,8 @@ TEST_F(NPAPIVisiblePluginTester, VerifyNPObjectLifetimeTest) {
     return;
 
   show_window_ = true;
-  std::wstring test_case = L"npobject_lifetime_test.html";
-  GURL url = GetTestUrl(L"npapi", test_case);
+  const FilePath test_case(FILE_PATH_LITERAL("npobject_lifetime_test.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("npobject_lifetime_test", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -233,7 +239,8 @@ TEST_F(NPAPIVisiblePluginTester, VerifyNPObjectLifetimeTest) {
 
 // Tests that we don't crash or assert if NPP_New fails
 TEST_F(NPAPIVisiblePluginTester, NewFails) {
-  GURL url = GetTestUrl(L"npapi", L"new_fails.html");
+  const FilePath test_case(FILE_PATH_LITERAL("new_fails.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("new_fails", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -243,8 +250,9 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNPNEvaluate) {
   if (UITest::in_process_renderer())
     return;
 
-  GURL url = GetTestUrl(L"npapi",
-                        L"execute_script_delete_in_npn_evaluate.html");
+  const FilePath test_case(
+      FILE_PATH_LITERAL("execute_script_delete_in_npn_evaluate.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("npobject_delete_plugin_in_evaluate", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -254,8 +262,9 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNPNEvaluate) {
 
 // Flaky. See http://crbug.com/17645
 TEST_F(NPAPIVisiblePluginTester, DISABLED_OpenPopupWindowWithPlugin) {
-  GURL url = GetTestUrl(L"npapi",
-                        L"get_javascript_open_popup_with_plugin.html");
+  const FilePath test_case(
+      FILE_PATH_LITERAL("get_javascript_open_popup_with_plugin.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("plugin_popup_with_plugin_target", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -267,21 +276,24 @@ TEST_F(NPAPITester, PrivateDisabled) {
   if (UITest::in_process_renderer())
     return;
 
-  GURL url = GetTestUrl(L"npapi", L"private.html");
+  const FilePath test_case(FILE_PATH_LITERAL("private.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("private", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
 TEST_F(NPAPITester, ScheduleTimer) {
-  GURL url = GetTestUrl(L"npapi", L"schedule_timer.html");
+  const FilePath test_case(FILE_PATH_LITERAL("schedule_timer.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("schedule_timer", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
 TEST_F(NPAPITester, PluginThreadAsyncCall) {
-  GURL url = GetTestUrl(L"npapi", L"plugin_thread_async_call.html");
+  const FilePath test_case(FILE_PATH_LITERAL("plugin_thread_async_call.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("plugin_thread_async_call", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -292,7 +304,8 @@ TEST_F(NPAPIIncognitoTester, PrivateEnabled) {
   if (UITest::in_process_renderer())
     return;
 
-  GURL url = GetTestUrl(L"npapi", L"private.html?private");
+  const FilePath test_case(FILE_PATH_LITERAL("private.html?private"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("private", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -305,7 +318,9 @@ TEST_F(NPAPIVisiblePluginTester, MultipleInstancesSyncCalls) {
   if (UITest::in_process_renderer())
     return;
 
-  GURL url = GetTestUrl(L"npapi", L"multiple_instances_sync_calls.html");
+  const FilePath test_case(
+      FILE_PATH_LITERAL("multiple_instances_sync_calls.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("multiple_instances_sync_calls", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ -331,7 +346,9 @@ TEST_F(NPAPITester, EnsureScriptingWorksInDestroy) {
   if (UITest::in_process_renderer())
     return;
 
-  GURL url = GetTestUrl(L"npapi", L"ensure_scripting_works_in_destroy.html");
+  const FilePath test_case(
+      FILE_PATH_LITERAL("ensure_scripting_works_in_destroy.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("ensure_scripting_works_in_destroy", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -352,7 +369,8 @@ TEST_F(NPAPITester, FLAKY_NoHangIfInitCrashes) {
 
   HANDLE crash_event = CreateEvent(NULL, TRUE, FALSE, L"TestPluginCrashOnInit");
   SetEvent(crash_event);
-  GURL url = GetTestUrl(L"npapi", L"no_hang_if_init_crashes.html");
+  const FilePath test_case(FILE_PATH_LITERAL("no_hang_if_init_crashes.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   NavigateToURL(url);
   WaitForFinish("no_hang_if_init_crashes", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -366,7 +384,9 @@ TEST_F(NPAPITester, NPObjectReleasedOnDestruction) {
   if (UITest::in_process_renderer())
     return;
 
-  GURL url = GetTestUrl(L"npapi", L"npobject_released_on_destruction.html");
+  const FilePath test_case(
+      FILE_PATH_LITERAL("npobject_released_on_destruction.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
 
   scoped_refptr<BrowserProxy> window_proxy(automation()->GetBrowserWindow(0));
@@ -383,7 +403,8 @@ TEST_F(NPAPITester, NPObjectReleasedOnDestruction) {
 // the more interesting case is out of process, where we must route
 // the exception to the correct renderer.
 TEST_F(NPAPITester, NPObjectSetException) {
-  GURL url = GetTestUrl(L"npapi", L"npobject_set_exception.html");
+  const FilePath test_case(FILE_PATH_LITERAL("npobject_set_exception.html"));
+  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("npobject_set_exception", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
@@ -427,4 +448,3 @@ TEST_F(NPAPIVisiblePluginTester, FLAKY_PluginConvertPointTest) {
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 #endif
-
diff --git a/chrome/test/ui/pepper_uitest.cc b/chrome/test/ui/pepper_uitest.cc
index d7b1a933..01b14e3 100644
--- a/chrome/test/ui/pepper_uitest.cc
+++ b/chrome/test/ui/pepper_uitest.cc
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/file_path.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/ui/npapi_test_helper.h"
+#include "chrome/test/ui_test_utils.h"
 
 #if defined(OS_WIN)
 static const char kPepperTestPluginName[] = "npapi_pepper_test_plugin.dll";
@@ -36,7 +38,9 @@ class PepperTester : public NPAPITesterBase {
 // TODO(alokp): Enable the test after making sure it works on all platforms
 // and buildbots have OpenGL support.
 TEST_F(PepperTester, DISABLED_Pepper3D) {
-  GURL url = GetTestUrl(L"pepper", L"pepper_3d.html");
+  const FilePath dir(FILE_PATH_LITERAL("pepper"));
+  const FilePath file(FILE_PATH_LITERAL("pepper_3d.html"));
+  GURL url = ui_test_utils::GetTestUrl(dir, file);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("pepper_3d", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index cd1a81b..ff952ba 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -859,22 +859,6 @@ bool UITestBase::CloseBrowser(BrowserProxy* browser,
   return result;
 }
 
-// Static
-FilePath UITestBase::GetTestFilePath(const std::wstring& test_directory,
-                                 const std::wstring& test_case) {
-  FilePath path;
-  PathService::Get(chrome::DIR_TEST_DATA, &path);
-  path = path.Append(FilePath::FromWStringHack(test_directory));
-  path = path.Append(FilePath::FromWStringHack(test_case));
-  return path;
-}
-
-// Static
-GURL UITestBase::GetTestUrl(const std::wstring& test_directory,
-                        const std::wstring &test_case) {
-  return net::FilePathToFileURL(GetTestFilePath(test_directory, test_case));
-}
-
 void UITestBase::WaitForFinish(const std::string &name,
                            const std::string &id,
                            const GURL &url,
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 940e061..50ab471 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -17,16 +17,14 @@
 // Tests which need to launch the browser with a particular set of command-line
 // arguments should set the value of launch_arguments_ in their constructors.
 
-#include "build/build_config.h"
-
 #include <string>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
-#include "base/path_service.h"
 #include "base/process.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
+#include "build/build_config.h"
 // TODO(evanm): we should be able to just forward-declare
 // AutomationProxy here, but many files that #include this one don't
 // themselves #include automation_proxy.h.
@@ -456,20 +454,6 @@ class UITestBase {
   // error.
   DictionaryValue* GetDefaultProfilePreferences();
 
-  // Generate the file path for testing a particular test.
-  // The file for the tests is all located in
-  // test_root_directory\test_directory\<testcase>
-  // The returned path is FilePath format.
-  static FilePath GetTestFilePath(const std::wstring& test_directory,
-                                  const std::wstring& test_case);
-
-  // Generate the URL for testing a particular test.
-  // HTML for the tests is all located in
-  // test_root_directory\test_directory\<testcase>
-  // The returned path is GURL format.
-  static GURL GetTestUrl(const std::wstring& test_directory,
-                         const std::wstring &test_case);
-
   // Waits for the test case to finish.
   // ASSERTS if there are test failures.
   void WaitForFinish(const std::string &name,