Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1572)

Unified Diff: chrome/browser/browser_focus_uitest.cc

Issue 187005: Fix to use FilePath in more unittests.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: fix linux/mac Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/sys_info_unittest.cc ('k') | chrome/browser/importer/firefox_profile_lock_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_focus_uitest.cc
===================================================================
--- chrome/browser/browser_focus_uitest.cc (revision 26080)
+++ chrome/browser/browser_focus_uitest.cc (working copy)
@@ -48,7 +48,7 @@
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 @@
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);
}
« no previous file with comments | « base/sys_info_unittest.cc ('k') | chrome/browser/importer/firefox_profile_lock_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698