Fix to use FilePath in more unittests.

chrome/browser/importer/firefox_profile_lock_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
@@ skipping 62 matching lines @@
   EXPECT_FALSE(lock->HasAcquired());
   // In the posix code, we don't delete the file when releasing the lock.
 #if !defined(OS_POSIX)
   EXPECT_FALSE(file_util::PathExists(lock_file_path));
 #endif  // !defined(OS_POSIX)
 }
 
 // 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);
 
   // Create the orphaned lock file.
   FILE* lock_file = file_util::OpenFile(lock_file_path, "w");
   ASSERT_TRUE(lock_file);
   file_util::CloseFile(lock_file);
   EXPECT_TRUE(file_util::PathExists(lock_file_path));
 
   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());
 }
 
 // This is broken on POSIX since the same process is allowed to reacquire a
 // lock.
 #if !defined(OS_POSIX)
 // Tests two locks contending for the same lock file.
 TEST_F(FirefoxProfileLockTest, ProfileLockContention) {
@@ skipping 13 matching lines @@
 
   lock1->Unlock();
   EXPECT_FALSE(lock1->HasAcquired());
 
   lock2->Lock();
   EXPECT_TRUE(lock2->HasAcquired());
   lock2->Unlock();
   EXPECT_FALSE(lock2->HasAcquired());
 }
 #endif