Deprecate PathService::Get(..., wstring*) and use FilePath instead.

chrome/browser/importer/firefox_importer_unittest.cc

 // Copyright (c) 2006-2008 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_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/browser/importer/firefox_importer_unittest_utils.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/nss_decryptor.h"
 #include "chrome/common/chrome_paths.h"
 
 using base::Time;
 
 // The following 2 tests require the use of the NSSDecryptor, on OSX this needs
 // to run in a separate process, so we use a proxy object so we can share the
 // same test between platforms.
 TEST(FirefoxImporterTest, Firefox2NSS3Decryptor) {
-  std::wstring nss_path;
+  FilePath nss_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &nss_path));
 #ifdef OS_MACOSX
-  file_util::AppendToPath(&nss_path, L"firefox2_nss_mac");
+  nss_path = nss_path.AppendASCII("firefox2_nss_mac");
 #else
-  file_util::AppendToPath(&nss_path, L"firefox2_nss");
+  nss_path = nss_path.AppendASCII("firefox2_nss");
 #endif  // !OS_MACOSX
-  std::wstring db_path;
+  FilePath db_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &db_path));
-  file_util::AppendToPath(&db_path, L"firefox2_profile");
+  db_path = db_path.AppendASCII("firefox2_profile");
 
   FFUnitTestDecryptorProxy decryptor_proxy;
-  ASSERT_TRUE(decryptor_proxy.Setup(nss_path));
+  ASSERT_TRUE(decryptor_proxy.Setup(nss_path.ToWStringHack()));
 
-  EXPECT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
+  EXPECT_TRUE(decryptor_proxy.DecryptorInit(nss_path.ToWStringHack(),
+                                            db_path.ToWStringHack()));
   EXPECT_EQ(L"hello", decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAE"
       "wFAYIKoZIhvcNAwcECBJM63MpT9rtBAjMCm7qo/EhlA=="));
   // Test UTF-16 encoding.
   EXPECT_EQ(L"\x4E2D", decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAE"
       "wFAYIKoZIhvcNAwcECN9OQ5ZFmhb8BAiFo1Z+fUvaIQ=="));
 }
 
 TEST(FirefoxImporterTest, Firefox3NSS3Decryptor) {
-  std::wstring nss_path;
+  FilePath nss_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &nss_path));
 #ifdef OS_MACOSX
-  file_util::AppendToPath(&nss_path, L"firefox3_nss_mac");
+  nss_path = nss_path.AppendASCII("firefox3_nss_mac");
 #else
-  file_util::AppendToPath(&nss_path, L"firefox3_nss");
+  nss_path = nss_path.AppendASCII("firefox3_nss");
 #endif  // !OS_MACOSX
-  std::wstring db_path;
+  FilePath db_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &db_path));
-  file_util::AppendToPath(&db_path, L"firefox3_profile");
+  db_path = db_path.AppendASCII("firefox3_profile");
 
   FFUnitTestDecryptorProxy decryptor_proxy;
-  ASSERT_TRUE(decryptor_proxy.Setup(nss_path));
+  ASSERT_TRUE(decryptor_proxy.Setup(nss_path.ToWStringHack()));
 
-  EXPECT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
+  EXPECT_TRUE(decryptor_proxy.DecryptorInit(nss_path.ToWStringHack(),
+                                            db_path.ToWStringHack()));
   EXPECT_EQ(L"hello", decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAE"
       "wFAYIKoZIhvcNAwcECKajtRg4qFSHBAhv9luFkXgDJA=="));
   // Test UTF-16 encoding.
   EXPECT_EQ(L"\x4E2D", decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAE"
       "wFAYIKoZIhvcNAwcECLWqqiccfQHWBAie74hxnULxlw=="));
 }
 
 TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
   bool result;
 
@@ skipping 92 matching lines @@
   result = Firefox2Importer::ParseBookmarkFromLine(
       "<DT><A HREF=\"http://domain.com/?q=%22",
       charset, &title, &url, &favicon, &shortcut, &add_date, &post_data);
   EXPECT_FALSE(result);
   EXPECT_EQ(L"", title);
   EXPECT_EQ("", url.spec());
   EXPECT_EQ(L"", shortcut);
   EXPECT_EQ(L"", post_data);
   EXPECT_TRUE(Time() == add_date);
 }