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/browser_encoding_uitest.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/browser_encoding_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_encoding_uitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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, |