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

Unified Diff: chrome/utility/importer/firefox_importer_unittest_utils.h

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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
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

Powered by Google App Engine
This is Rietveld 408576698