diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 19:36:31 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 19:36:31 +0000 |
commit | b65de8b9d5bfa020d97122c1eff2115fa8e97561 (patch) | |
tree | 3eb86aed4e3352cbca7cc4b78e76f5ee26d7388c /chrome/browser/browser_focus_uitest.cc | |
parent | 5e70f14644629b7f9fe9126553758aed25e17128 (diff) | |
download | chromium_src-b65de8b9d5bfa020d97122c1eff2115fa8e97561.zip chromium_src-b65de8b9d5bfa020d97122c1eff2115fa8e97561.tar.gz chromium_src-b65de8b9d5bfa020d97122c1eff2115fa8e97561.tar.bz2 |
Fix to use FilePath in more unittests.
Landing patch for Thiago Farina, original review: http://codereview.chromium.org/187005
BUG=None
TEST=run unit_tests.exe, base_unittests.exe.
Review URL: http://codereview.chromium.org/193101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
-rw-r--r-- | chrome/browser/browser_focus_uitest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 87290dd..d2cab01 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -48,7 +48,7 @@ const int kActionDelayMs = 500; const wchar_t kSimplePage[] = L"files/focus/page_with_focus.html"; const wchar_t kStealFocusPage[] = L"files/focus/page_steals_focus.html"; const wchar_t kTypicalPage[] = L"files/focus/typical_page.html"; -const wchar_t kTypicalPageName[] = L"typical_page.html"; +const char kTypicalPageName[] = "typical_page.html"; class BrowserFocusTest : public InProcessBrowserTest { public: @@ -148,11 +148,11 @@ class TestInterstitialPage : public InterstitialPage { TestInterstitialPage(TabContents* tab, bool new_navigation, const GURL& url) : InterstitialPage(tab, new_navigation, url), waiting_for_dom_response_(false) { - std::wstring file_path; + FilePath file_path; bool r = PathService::Get(chrome::DIR_TEST_DATA, &file_path); EXPECT_TRUE(r); - file_util::AppendToPath(&file_path, L"focus"); - file_util::AppendToPath(&file_path, kTypicalPageName); + file_path = file_path.AppendASCII("focus"); + file_path = file_path.AppendASCII(kTypicalPageName); r = file_util::ReadFileToString(file_path, &html_contents_); EXPECT_TRUE(r); } |