| Index: chrome/utility/importer/firefox_importer_unittest_utils.h
|
| diff --git a/chrome/utility/importer/firefox_importer_unittest_utils.h b/chrome/utility/importer/firefox_importer_unittest_utils.h
|
| index 3bff323792980c7a238d0018f3ddfeec563835eb..2c20991629b8620b85ec0e6a19ee38582b0d095a 100644
|
| --- a/chrome/utility/importer/firefox_importer_unittest_utils.h
|
| +++ b/chrome/utility/importer/firefox_importer_unittest_utils.h
|
| @@ -43,7 +43,7 @@ class FFUnitTestDecryptorProxy {
|
| // This match the parallel functions in NSSDecryptor.
|
| bool DecryptorInit(const base::FilePath& dll_path,
|
| const base::FilePath& db_path);
|
| - string16 Decrypt(const std::string& crypt);
|
| + base::string16 Decrypt(const std::string& crypt);
|
|
|
| private:
|
| #if defined(OS_MACOSX)
|
| @@ -81,7 +81,7 @@ bool FFUnitTestDecryptorProxy::DecryptorInit(const base::FilePath& dll_path,
|
| return decryptor_.Init(dll_path, db_path);
|
| }
|
|
|
| -string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
|
| +base::string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
|
| return decryptor_.Decrypt(crypt);
|
| }
|
| #endif // !OS_MACOSX
|
|
|