summaryrefslogtreecommitdiffstats
path: root/chrome/browser
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/browser
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/browser')
-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
9 files changed, 61 insertions, 25 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);
generated by cgit v1.1 at 2025-10-14 15:16:51 +0000