| Index: chrome/utility/extensions/unpacker.cc
|
| diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc
|
| index 10b95b96d2e9622884d37946b1a6478821c62b6f..75c3741f5ec6e52d0caca96beb49bae47a99a92e 100644
|
| --- a/chrome/utility/extensions/unpacker.cc
|
| +++ b/chrome/utility/extensions/unpacker.cc
|
| @@ -289,7 +289,7 @@ bool Unpacker::ReadMessageCatalog(const base::FilePath& message_path) {
|
| 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 @@ void Unpacker::SetError(const std::string &error) {
|
| SetUTF16Error(UTF8ToUTF16(error));
|
| }
|
|
|
| -void Unpacker::SetUTF16Error(const string16 &error) {
|
| +void Unpacker::SetUTF16Error(const base::string16& error) {
|
| error_message_ = error;
|
| }
|
|
|
|
|