summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 08:56:47 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 08:56:47 +0000
commit5a145436666621448c8eafab5006413986137934 (patch)
tree76f165cabc2d6e4b3fa396598b435fceabae621d /chrome
parentdf0a0bfe0ea219ede803adfd600d95584d6e8c0d (diff)
downloadchromium_src-5a145436666621448c8eafab5006413986137934.zip
chromium_src-5a145436666621448c8eafab5006413986137934.tar.gz
chromium_src-5a145436666621448c8eafab5006413986137934.tar.bz2
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
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_browsertest.cc25
-rw-r--r--chrome/browser/browser_encoding_uitest.cc6
-rw-r--r--chrome/browser/child_process_security_policy_browser_test.cc4
-rw-r--r--chrome/browser/crash_recovery_browsertest.cc6
-rw-r--r--chrome/browser/download/save_page_uitest.cc19
-rw-r--r--chrome/browser/in_process_webkit/dom_storage_uitest.cc6
-rw-r--r--chrome/browser/renderer_host/test/web_cache_manager_browsertest.cc4
-rw-r--r--chrome/browser/sessions/session_restore_browsertest.cc7
-rw-r--r--chrome/browser/task_manager_browsertest.cc9
-rw-r--r--chrome/test/interactive_ui/npapi_interactive_test.cc15
-rw-r--r--chrome/test/ui/fast_shutdown_uitest.cc8
-rw-r--r--chrome/test/ui/history_uitest.cc36
-rw-r--r--chrome/test/ui/layout_plugin_uitest.cc3
-rw-r--r--chrome/test/ui/mouseleave_uitest.cc17
-rw-r--r--chrome/test/ui/npapi_uitest.cc120
-rw-r--r--chrome/test/ui/pepper_uitest.cc6
-rw-r--r--chrome/test/ui/ui_test.cc16
-rw-r--r--chrome/test/ui/ui_test.h18
-rw-r--r--chrome/test/ui_test_utils.cc11
-rw-r--r--chrome/test/ui_test_utils.h12
-rw-r--r--chrome/worker/worker_uitest.cc85
21 files changed, 256 insertions, 177 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 0d102fb..a73d1b5 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -6,6 +6,7 @@
#include "app/l10n_util.h"
#include "base/i18n/rtl.h"
+#include "base/file_path.h"
#include "base/sys_info.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/app_modal_dialog.h"
@@ -32,6 +33,8 @@
#include "grit/generated_resources.h"
#include "net/base/mock_host_resolver.h"
+namespace {
+
const std::string BEFORE_UNLOAD_HTML =
"<html><head><title>beforeunload</title></head><body>"
"<script>window.onbeforeunload=function(e){return 'foo'}</script>"
@@ -40,7 +43,8 @@ const std::string BEFORE_UNLOAD_HTML =
const std::wstring OPEN_NEW_BEFOREUNLOAD_PAGE =
L"w=window.open(); w.onbeforeunload=function(e){return 'foo'};";
-namespace {
+const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html");
+const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html");
// Given a page title, returns the expected window caption string.
std::wstring WindowCaptionFromPageTitle(std::wstring page_title) {
@@ -165,7 +169,8 @@ class BrowserTest : public ExtensionBrowserTest {
// correctly.
IN_PROC_BROWSER_TEST_F(BrowserTest, NoTitle) {
ui_test_utils::NavigateToURL(browser(),
- ui_test_utils::GetTestUrl(L".", L"title1.html"));
+ ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kTitle1File)));
EXPECT_EQ(LocaleWindowCaptionFromPageTitle(L"title1.html"),
UTF16ToWideHack(browser()->GetWindowTitleForCurrentTab()));
string16 tab_title;
@@ -177,7 +182,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NoTitle) {
// was set correctly.
IN_PROC_BROWSER_TEST_F(BrowserTest, Title) {
ui_test_utils::NavigateToURL(browser(),
- ui_test_utils::GetTestUrl(L".", L"title2.html"));
+ ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kTitle2File)));
const std::wstring test_title(L"Title Of Awesomeness");
EXPECT_EQ(LocaleWindowCaptionFromPageTitle(test_title),
UTF16ToWideHack(browser()->GetWindowTitleForCurrentTab()));
@@ -194,7 +200,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, Title) {
#endif
IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) {
- GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html"));
+ GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kTitle1File)));
ui_test_utils::NavigateToURL(browser(), url);
browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED,
true, 0, false, NULL);
@@ -215,7 +222,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) {
// had a hard limit of 31 processes and this test is mainly directed at
// verifying that we don't crash when we pass this limit.
IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) {
- GURL url(ui_test_utils::GetTestUrl(L".", L"title2.html"));
+ GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kTitle2File)));
// There is one initial tab.
for (int ix = 0; ix != 33; ++ix) {
@@ -277,7 +285,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, FLAKY_SingleBeforeUnloadAfterWindowClose) {
IN_PROC_BROWSER_TEST_F(BrowserTest, RenderIdleTime) {
base::TimeTicks start = base::TimeTicks::Now();
ui_test_utils::NavigateToURL(browser(),
- ui_test_utils::GetTestUrl(L".", L"title1.html"));
+ ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kTitle1File)));
RenderProcessHost::iterator it(RenderProcessHost::AllHostsIterator());
for (; !it.IsAtEnd(); it.Advance()) {
base::TimeDelta renderer_td =
@@ -294,11 +303,13 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RenderIdleTime) {
#if !defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcut) {
static const wchar_t kDocRoot[] = L"chrome/test/data";
+ static const FilePath::CharType* kEmptyFile = FILE_PATH_LITERAL("empty.html");
CommandUpdater* command_updater = browser()->command_updater();
// Urls that are okay to have shortcuts.
- GURL file_url(ui_test_utils::GetTestUrl(L".", L"empty.html"));
+ GURL file_url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kEmptyFile)));
ASSERT_TRUE(file_url.SchemeIs(chrome::kFileScheme));
ui_test_utils::NavigateToURL(browser(), file_url);
EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index 5ed496c..1669136 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -11,6 +11,7 @@
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_test.h"
+#include "chrome/test/ui_test_utils.h"
static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("encoding_tests");
@@ -23,9 +24,8 @@ class BrowserEncodingTest : public UITest {
void CheckFile(const FilePath& generated_file,
const FilePath& expected_result_file,
bool check_equal) {
- FilePath expected_result_filepath = UITest::GetTestFilePath(
- FilePath(kTestDir).ToWStringHack(),
- expected_result_file.ToWStringHack());
+ FilePath expected_result_filepath = ui_test_utils::GetTestFilePath(
+ FilePath(kTestDir), expected_result_file);
ASSERT_TRUE(file_util::PathExists(expected_result_filepath));
WaitForGeneratedFileAndCheck(generated_file,
diff --git a/chrome/browser/child_process_security_policy_browser_test.cc b/chrome/browser/child_process_security_policy_browser_test.cc
index c5475af..41ec56a 100644
--- a/chrome/browser/child_process_security_policy_browser_test.cc
+++ b/chrome/browser/child_process_security_policy_browser_test.cc
@@ -31,7 +31,9 @@ class ChildProcessSecurityPolicyInProcessBrowserTest
};
IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) {
- GURL url(ui_test_utils::GetTestUrl(L"google", L"google.html"));
+ const FilePath kTestDir(FILE_PATH_LITERAL("google"));
+ const FilePath kTestFile(FILE_PATH_LITERAL("google.html"));
+ GURL url(ui_test_utils::GetTestUrl(kTestDir, kTestFile));
ui_test_utils::NavigateToURL(browser(), url);
EXPECT_EQ(
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index 96c4c39..846ddfe 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -2,6 +2,7 @@
// 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/browser/browser.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/tab_contents.h"
@@ -92,8 +93,11 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_Reload) {
// ID of the RenderProcessHost was stale, so the NavigationEntry in the new tab
// was not committed. This prevents regression of that bug.
IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_LoadInNewTab) {
+ const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html");
+
ui_test_utils::NavigateToURL(browser(),
- ui_test_utils::GetTestUrl(L".", L"title2.html"));
+ ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kTitle2File)));
string16 title_before_crash;
string16 title_after_crash;
diff --git a/chrome/browser/download/save_page_uitest.cc b/chrome/browser/download/save_page_uitest.cc
index 563333c..07fd78c 100644
--- a/chrome/browser/download/save_page_uitest.cc
+++ b/chrome/browser/download/save_page_uitest.cc
@@ -14,9 +14,12 @@
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_test.h"
+#include "chrome/test/ui_test_utils.h"
#include "net/url_request/url_request_unittest.h"
-const char* const kTestDir = "save_page";
+namespace {
+
+const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("save_page");
const char* const kAppendedExtension =
#if defined(OS_WIN)
@@ -25,14 +28,16 @@ const char* const kAppendedExtension =
".html";
#endif
+} // namespace
+
class SavePageTest : public UITest {
protected:
SavePageTest() : UITest() {}
void CheckFile(const FilePath& generated_file,
const FilePath& expected_result_file) {
- FilePath expected_result_filepath = UITest::GetTestFilePath(
- UTF8ToWide(kTestDir), expected_result_file.ToWStringHack());
+ FilePath expected_result_filepath = ui_test_utils::GetTestFilePath(
+ FilePath(kTestDir), expected_result_file);
ASSERT_TRUE(file_util::PathExists(expected_result_filepath));
WaitForGeneratedFileAndCheck(generated_file,
expected_result_filepath,
@@ -63,13 +68,13 @@ class SavePageTest : public UITest {
// We probably don't care to handle this on Linux or Mac.
#if defined(OS_WIN)
TEST_F(SavePageTest, CleanFilenameFromPageTitle) {
- std::string file_name = "c.htm";
+ const FilePath file_name(FILE_PATH_LITERAL("c.htm"));
FilePath full_file_name =
download_dir_.AppendASCII(std::string("test.exe") + kAppendedExtension);
FilePath dir = download_dir_.AppendASCII("test.exe_files");
- GURL url = URLRequestMockHTTPJob::GetMockUrl(FilePath(ASCIIToWide(
- std::string(kTestDir) + "/" + file_name)));
+ GURL url = URLRequestMockHTTPJob::GetMockUrl(
+ FilePath(kTestDir).Append(file_name));
scoped_refptr<TabProxy> tab(GetActiveTab());
ASSERT_TRUE(tab.get());
ASSERT_TRUE(tab->NavigateToURL(url));
@@ -82,7 +87,7 @@ TEST_F(SavePageTest, CleanFilenameFromPageTitle) {
EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
automation()->SavePackageShouldPromptUser(true);
- CheckFile(full_file_name, FilePath::FromWStringHack(UTF8ToWide(file_name)));
+ CheckFile(full_file_name, file_name);
EXPECT_TRUE(file_util::DieFileDie(full_file_name, false));
EXPECT_TRUE(file_util::DieFileDie(dir, true));
}
diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index 2da6e66..1618d50 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -2,9 +2,11 @@
// 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/automation/tab_proxy.h"
#include "chrome/test/ui/ui_layout_test.h"
+#include "chrome/test/ui_test_utils.h"
static const char* kRootFiles[] = {
"clear.html",
@@ -68,7 +70,9 @@ class DOMStorageTest : public UILayoutTest {
scoped_refptr<TabProxy> tab(GetActiveTab());
ASSERT_TRUE(tab.get());
- GURL url = GetTestUrl(L"layout_tests", L"clear_dom_storage.html");
+ const FilePath dir(FILE_PATH_LITERAL("layout_tests"));
+ const FilePath file(FILE_PATH_LITERAL("clear_dom_storage.html"));
+ GURL url = ui_test_utils::GetTestUrl(dir, file);
ASSERT_TRUE(tab->SetCookie(url, ""));
ASSERT_TRUE(tab->NavigateToURL(url));
diff --git a/chrome/browser/renderer_host/test/web_cache_manager_browsertest.cc b/chrome/browser/renderer_host/test/web_cache_manager_browsertest.cc
index b32ffd8..953dfb10 100644
--- a/chrome/browser/renderer_host/test/web_cache_manager_browsertest.cc
+++ b/chrome/browser/renderer_host/test/web_cache_manager_browsertest.cc
@@ -20,7 +20,9 @@ class WebCacheManagerBrowserTest : public InProcessBrowserTest {
// user navigates to another tab and back, the browser doesn't crash.
// TODO(jam): http://crbug.com/15288 disabled because it fails on the build bot.
IN_PROC_BROWSER_TEST_F(WebCacheManagerBrowserTest, DISABLED_CrashOnceOnly) {
- GURL url(ui_test_utils::GetTestUrl(L"google", L"google.html"));
+ const FilePath kTestDir(FILE_PATH_LITERAL("google"));
+ const FilePath kTestFile(FILE_PATH_LITERAL("google.html"));
+ GURL url(ui_test_utils::GetTestUrl(kTestDir, kTestFile));
ui_test_utils::NavigateToURL(browser(), url);
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index c75d3cb..b9440cb0 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/defaults.h"
+#include "base/file_path.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
+#include "chrome/browser/defaults.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
@@ -24,7 +25,9 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
if (browser_defaults::kRestorePopups)
return;
- GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html"));
+ const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html");
+ GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kTitle1File)));
ui_test_utils::NavigateToURL(browser(), url);
// Turn on session restore.
diff --git a/chrome/browser/task_manager_browsertest.cc b/chrome/browser/task_manager_browsertest.cc
index d9f99cf..84d4e80 100644
--- a/chrome/browser/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager_browsertest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/task_manager.h"
#include "app/l10n_util.h"
+#include "base/file_path.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/extensions/crashed_extension_infobar.h"
@@ -20,6 +21,8 @@
namespace {
+const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html");
+
class ResourceChangeObserver : public TaskManagerModelObserver {
public:
ResourceChangeObserver(const TaskManagerModel* model,
@@ -88,7 +91,8 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) {
EXPECT_EQ(2, model()->ResourceCount());
// Open a new tab and make sure we notice that.
- GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html"));
+ GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kTitle1File)));
browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED,
true, 0, false, NULL);
WaitForResourceChange(3);
@@ -225,7 +229,8 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, PopulateWebCacheFields) {
EXPECT_EQ(2, model()->ResourceCount());
// Open a new tab and make sure we notice that.
- GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html"));
+ GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+ FilePath(kTitle1File)));
browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED,
true, 0, false, NULL);
WaitForResourceChange(3);
diff --git a/chrome/test/interactive_ui/npapi_interactive_test.cc b/chrome/test/interactive_ui/npapi_interactive_test.cc
index 3549d71..3f6ca97 100644
--- a/chrome/test/interactive_ui/npapi_interactive_test.cc
+++ b/chrome/test/interactive_ui/npapi_interactive_test.cc
@@ -31,14 +31,13 @@
// NPAPI interactive UI tests.
//
-#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"
#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"
const char kTestCompleteCookie[] = "status";
const char kTestCompleteSuccess[] = "OK";
@@ -55,15 +54,17 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInvokeInSynchronousMouseMove) {
EXPECT_TRUE(IsWindow(tab_window));
show_window_ = true;
- std::wstring test_case = L"execute_script_delete_in_mouse_move.html";
- GURL url = GetTestUrl(L"npapi", test_case);
+ const FilePath kTestDir(FILE_PATH_LITERAL("npapi"));
+ const FilePath test_case(
+ FILE_PATH_LITERAL("execute_script_delete_in_mouse_move.html"));
+ GURL url = ui_test_utils::GetTestUrl(kTestDir, test_case);
NavigateToURL(url);
POINT cursor_position = {130, 130};
ClientToScreen(tab_window, &cursor_position);
- double screen_width = ::GetSystemMetrics( SM_CXSCREEN ) - 1;
- double screen_height = ::GetSystemMetrics( SM_CYSCREEN ) - 1;
+ double screen_width = ::GetSystemMetrics(SM_CXSCREEN) - 1;
+ double screen_height = ::GetSystemMetrics(SM_CYSCREEN) - 1;
double location_x = cursor_position.x * (65535.0f / screen_width);
double location_y = cursor_position.y * (65535.0f / screen_height);
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,
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index 4dd4859..96d04b6 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -6,6 +6,7 @@
#include <vector>
+#include "base/file_path.h"
#include "base/json/json_reader.h"
#include "base/message_loop.h"
#include "base/path_service.h"
@@ -550,12 +551,14 @@ bool ExecuteJavaScriptAndExtractString(RenderViewHost* render_view_host,
return value->GetAsString(result);
}
-GURL GetTestUrl(const std::wstring& dir, const std::wstring file) {
+FilePath GetTestFilePath(const FilePath& dir, const FilePath& file) {
FilePath path;
PathService::Get(chrome::DIR_TEST_DATA, &path);
- path = path.Append(FilePath::FromWStringHack(dir));
- path = path.Append(FilePath::FromWStringHack(file));
- return net::FilePathToFileURL(path);
+ return path.Append(dir).Append(file);
+}
+
+GURL GetTestUrl(const FilePath& dir, const FilePath& file) {
+ return net::FilePathToFileURL(GetTestFilePath(dir, file));
}
void WaitForDownloadCount(DownloadManager* download_manager, size_t count) {
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h
index 16ce2c2..b247a19 100644
--- a/chrome/test/ui_test_utils.h
+++ b/chrome/test/ui_test_utils.h
@@ -127,7 +127,17 @@ bool ExecuteJavaScriptAndExtractString(RenderViewHost* render_view_host,
const std::wstring& script,
std::string* result);
-GURL GetTestUrl(const std::wstring& dir, const std::wstring file);
+// Generate the file path for testing a particular test.
+// The file for the tests is all located in
+// test_root_directory/dir/<file>
+// The returned path is FilePath format.
+FilePath GetTestFilePath(const FilePath& dir, const FilePath& file);
+
+// Generate the URL for testing a particular test.
+// HTML for the tests is all located in
+// test_root_directory/dir/<file>
+// The returned path is GURL format.
+GURL GetTestUrl(const FilePath& dir, const FilePath& file);
// Creates an observer that waits for |download_manager| to report that it
// has a total of |count| downloads that have been handles
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index a356e96..00c7f85 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -2,6 +2,7 @@
// 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 "base/string_util.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/worker_host/worker_service.h"
@@ -12,18 +13,36 @@
#include "chrome/test/ui_test_utils.h"
#include "net/url_request/url_request_unittest.h"
-static const char kTestCompleteCookie[] = "status";
-static const char kTestCompleteSuccess[] = "OK";
+namespace {
+
+const char kTestCompleteCookie[] = "status";
+const char kTestCompleteSuccess[] = "OK";
+const FilePath::CharType* kTestDir =
+ FILE_PATH_LITERAL("workers");
+const FilePath::CharType* kManySharedWorkersFile =
+ FILE_PATH_LITERAL("many_shared_workers.html");
+const FilePath::CharType* kManyWorkersFile =
+ FILE_PATH_LITERAL("many_workers.html");
+const FilePath::CharType* kQuerySharedWorkerShutdownFile =
+ FILE_PATH_LITERAL("queued_shared_worker_shutdown.html");
+const FilePath::CharType* kShutdownSharedWorkerFile =
+ FILE_PATH_LITERAL("shutdown_shared_worker.html");
+const FilePath::CharType* kSingleSharedWorkersFile =
+ FILE_PATH_LITERAL("single_shared_worker.html");
+const FilePath::CharType* kWorkerClose =
+ FILE_PATH_LITERAL("worker_close.html");
+
+} // anonymous namespace
class WorkerTest : public UILayoutTest {
protected:
virtual ~WorkerTest() { }
- void RunTest(const std::wstring& test_case) {
+ void RunTest(const FilePath& test_case) {
scoped_refptr<TabProxy> tab(GetActiveTab());
ASSERT_TRUE(tab.get());
- GURL url = GetTestUrl(L"workers", test_case);
+ GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
ASSERT_TRUE(tab->NavigateToURL(url));
std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
@@ -31,7 +50,7 @@ class WorkerTest : public UILayoutTest {
ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
}
- void RunIncognitoTest(const std::wstring& test_case) {
+ void RunIncognitoTest(const FilePath& test_case) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
@@ -46,7 +65,7 @@ class WorkerTest : public UILayoutTest {
scoped_refptr<TabProxy> tab(incognito->GetTab(0));
ASSERT_TRUE(tab.get());
- GURL url = GetTestUrl(L"workers", test_case);
+ GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
ASSERT_TRUE(tab->NavigateToURL(url));
std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
@@ -97,7 +116,7 @@ class WorkerTest : public UILayoutTest {
resource_dir = resource_dir.AppendASCII("resources");
AddResourceForLayoutTest(js_dir, resource_dir);
- printf ("Test: %s\n", test_case_file_name.c_str());
+ printf("Test: %s\n", test_case_file_name.c_str());
RunLayoutTest(test_case_file_name, kNoHttpPort);
// Navigate to a blank page so that any workers are cleaned up.
@@ -118,7 +137,7 @@ class WorkerTest : public UILayoutTest {
TEST_F(WorkerTest, SingleWorker) {
- RunTest(L"single_worker.html");
+ RunTest(FilePath(FILE_PATH_LITERAL("single_worker.html")));
}
#if defined(OS_LINUX)
@@ -128,15 +147,15 @@ TEST_F(WorkerTest, SingleWorker) {
#endif
TEST_F(WorkerTest, MultipleWorkers) {
- RunTest(L"multi_worker.html");
+ RunTest(FilePath(FILE_PATH_LITERAL("multi_worker.html")));
}
TEST_F(WorkerTest, SingleSharedWorker) {
- RunTest(L"single_worker.html?shared=true");
+ RunTest(FilePath(FILE_PATH_LITERAL("single_worker.html?shared=true")));
}
TEST_F(WorkerTest, MultipleSharedWorkers) {
- RunTest(L"multi_worker.html?shared=true");
+ RunTest(FilePath(FILE_PATH_LITERAL("multi_worker.html?shared=true")));
}
#if defined(OS_LINUX)
@@ -146,9 +165,9 @@ TEST_F(WorkerTest, MultipleSharedWorkers) {
// Incognito windows should not share workers with non-incognito windows
TEST_F(WorkerTest, IncognitoSharedWorkers) {
// Load a non-incognito tab and have it create a shared worker
- RunTest(L"incognito_worker.html");
+ RunTest(FilePath(FILE_PATH_LITERAL("incognito_worker.html")));
// Incognito worker should not share with non-incognito
- RunIncognitoTest(L"incognito_worker.html");
+ RunIncognitoTest(FilePath(FILE_PATH_LITERAL("incognito_worker.html")));
}
const wchar_t kDocRoot[] = L"chrome/test/data/workers";
@@ -424,14 +443,14 @@ TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) {
#endif
// These tests (and the shared-worker versions below) are disabled due to
// limitations in lighttpd (doesn't handle all of the HTTP methods).
- //"methods-async.html",
- //"methods.html",
+ // "methods-async.html",
+ // "methods.html",
"shared-worker-close.html",
// Disabled due to limitations in lighttpd (does not handle methods other
// than GET/PUT/POST).
- //"shared-worker-methods-async.html",
- //"shared-worker-methods.html",
+ // "shared-worker-methods-async.html",
+ // "shared-worker-methods.html",
"shared-worker-xhr-file-not-found.html",
"xmlhttprequest-file-not-found.html"
@@ -469,7 +488,7 @@ TEST_F(WorkerTest, FLAKY_MessagePorts) {
"message-port-multi.html",
"message-port-no-wrapper.html",
// Only works with run-webkit-tests --leaks.
- //"message-channel-listener-circular-ownership.html",
+ // "message-channel-listener-circular-ownership.html",
};
FilePath fast_test_dir;
@@ -495,7 +514,8 @@ TEST_F(WorkerTest, FLAKY_MessagePorts) {
// http://crbug.com/36630. Termination issues, disabled on all platforms.
TEST_F(WorkerTest, DISABLED_LimitPerPage) {
int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
- GURL url = GetTestUrl(L"workers", L"many_workers.html");
+ GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
+ FilePath(kManyWorkersFile));
url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab + 1));
NavigateToURL(url);
@@ -511,7 +531,8 @@ TEST_F(WorkerTest, DISABLED_LimitTotal) {
int total_workers = WorkerService::kMaxWorkersWhenSeparate;
int tab_count = (total_workers / max_workers_per_tab) + 1;
- GURL url = GetTestUrl(L"workers", L"many_workers.html");
+ GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
+ FilePath(kManyWorkersFile));
url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab));
scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -526,8 +547,11 @@ TEST_F(WorkerTest, DISABLED_LimitTotal) {
ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
// Now close a page and check that the queued workers were started.
+ const FilePath::CharType* kGoogleDir = FILE_PATH_LITERAL("google");
+ const FilePath::CharType* kGoogleFile = FILE_PATH_LITERAL("google.html");
ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
- tab->NavigateToURL(GetTestUrl(L"google", L"google.html")));
+ tab->NavigateToURL(ui_test_utils::GetTestUrl(FilePath(kGoogleDir),
+ FilePath(kGoogleFile))));
ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
#endif
@@ -537,7 +561,8 @@ TEST_F(WorkerTest, DISABLED_LimitTotal) {
TEST_F(WorkerTest, DISABLED_WorkerClose) {
scoped_refptr<TabProxy> tab(GetActiveTab());
ASSERT_TRUE(tab.get());
- GURL url = GetTestUrl(L"workers", L"worker_close.html");
+ GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
+ FilePath(kWorkerClose));
ASSERT_TRUE(tab->NavigateToURL(url));
std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
kTestCompleteCookie, action_max_timeout_ms());
@@ -549,7 +574,8 @@ TEST_F(WorkerTest, QueuedSharedWorkerShutdown) {
// Tests to make sure that queued shared workers are started up when
// shared workers shut down.
int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
- GURL url = GetTestUrl(L"workers", L"queued_shared_worker_shutdown.html");
+ GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
+ FilePath(kQuerySharedWorkerShutdownFile));
url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab));
scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -565,7 +591,8 @@ TEST_F(WorkerTest, MultipleTabsQueuedSharedWorker) {
// Tests to make sure that only one instance of queued shared workers are
// started up even when those instances are on multiple tabs.
int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
- GURL url = GetTestUrl(L"workers", L"many_shared_workers.html");
+ GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
+ FilePath(kManySharedWorkersFile));
url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab+1));
scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -582,7 +609,9 @@ TEST_F(WorkerTest, MultipleTabsQueuedSharedWorker) {
// Now shutdown one of the shared workers - this will fire both queued
// workers, but only one instance should be started
- GURL url2 = GetTestUrl(L"workers", L"shutdown_shared_worker.html?id=0");
+ GURL url2 = ui_test_utils::GetTestUrl(FilePath(kTestDir),
+ FilePath(kShutdownSharedWorkerFile));
+ url2 = GURL(url2.spec() + "?id=0");
ASSERT_TRUE(window->AppendTab(url2));
std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
@@ -596,7 +625,8 @@ TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerStartedFromOtherTab) {
// Tests to make sure that queued shared workers are started up when
// an instance is launched from another tab.
int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
- GURL url = GetTestUrl(L"workers", L"many_shared_workers.html");
+ GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
+ FilePath(kManySharedWorkersFile));
url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab+1));
scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -608,7 +638,8 @@ TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerStartedFromOtherTab) {
// connected to the first window too.
scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
ASSERT_TRUE(window.get());
- GURL url2 = GetTestUrl(L"workers", L"single_shared_worker.html");
+ GURL url2 = ui_test_utils::GetTestUrl(FilePath(kTestDir),
+ FilePath(kSingleSharedWorkersFile));
url2 = GURL(url2.spec() + StringPrintf("?id=%d", max_workers_per_tab));
ASSERT_TRUE(window->AppendTab(url2));
generated by cgit v1.1 at 2025-01-17 20:32:39 +0000