diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 08:56:47 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 08:56:47 +0000 |
| commit | 5a145436666621448c8eafab5006413986137934 (patch) | |
| tree | 76f165cabc2d6e4b3fa396598b435fceabae621d /chrome/browser/task_manager_browsertest.cc | |
| parent | df0a0bfe0ea219ede803adfd600d95584d6e8c0d (diff) | |
| download | chromium_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/task_manager_browsertest.cc')
| -rw-r--r-- | chrome/browser/task_manager_browsertest.cc | 9 |
1 files changed, 7 insertions, 2 deletions
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); |