Add base:: to string16s in chrome/.
[email protected]
BUG=329295
Review URL: https://codereview.chromium.org/94013004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242048 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc
index 10b95b96..75c3741 100644
--- a/chrome/utility/extensions/unpacker.cc
+++ b/chrome/utility/extensions/unpacker.cc
@@ -289,7 +289,7 @@
scoped_ptr<base::DictionaryValue> root(static_cast<base::DictionaryValue*>(
serializer.Deserialize(NULL, &error)));
if (!root.get()) {
- string16 messages_file = message_path.LossyDisplayName();
+ base::string16 messages_file = message_path.LossyDisplayName();
if (error.empty()) {
// If file is missing, Deserialize will fail with empty error.
SetError(base::StringPrintf("%s %s", errors::kLocalesMessagesFileMissing,
@@ -323,7 +323,7 @@
SetUTF16Error(UTF8ToUTF16(error));
}
-void Unpacker::SetUTF16Error(const string16 &error) {
+void Unpacker::SetUTF16Error(const base::string16& error) {
error_message_ = error;
}
