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

Unified Diff: chrome/browser/importer/firefox_profile_lock_unittest.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 | « chrome/browser/browser_focus_uitest.cc ('k') | chrome/browser/printing/printing_layout_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/firefox_profile_lock_unittest.cc
===================================================================
--- chrome/browser/importer/firefox_profile_lock_unittest.cc (revision 26080)
+++ chrome/browser/importer/firefox_profile_lock_unittest.cc (working copy)
@@ -80,9 +80,10 @@
// If for some reason the lock file is left behind by the previous owner, we
// should still be able to lock it, at least in the Windows implementation.
TEST_F(FirefoxProfileLockTest, ProfileLockOrphaned) {
- std::wstring test_path;
- file_util::CreateNewTempDirectory(L"firefox_profile", &test_path);
- FilePath lock_file_path = FilePath::FromWStringHack(test_path);
+ FilePath test_path;
+ file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("firefox_profile"),
+ &test_path);
+ FilePath lock_file_path = test_path;
FileAutoDeleter deleter(lock_file_path);
lock_file_path = lock_file_path.Append(FirefoxProfileLock::kLockFileName);
@@ -94,7 +95,7 @@
scoped_ptr<FirefoxProfileLock> lock;
EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock.get());
- lock.reset(new FirefoxProfileLock(test_path));
+ lock.reset(new FirefoxProfileLock(test_path.ToWStringHack()));
EXPECT_TRUE(lock->HasAcquired());
lock->Unlock();
EXPECT_FALSE(lock->HasAcquired());
« no previous file with comments | « chrome/browser/browser_focus_uitest.cc ('k') | chrome/browser/printing/printing_layout_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698