Issue 71980: Extensions code should use UTF-16 for user-visible Unicode strings

chrome/common/extensions/extension_unpacker.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_UNPACKER_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_UNPACKER_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 41 matching lines @@
   // data. Returns true on success.
   static bool ReadImagesFromFile(const FilePath& extension_path,
                                  DecodedImages* images);
 
   // Read the decoded message catalogs back from the file we saved them to.
   // |extension_path| is the path to the extension we unpacked that wrote the
   // data. Returns true on success.
   static bool ReadMessageCatalogsFromFile(const FilePath& extension_path,
                                           base::DictionaryValue* catalogs);
 
-  const std::string& error_message() { return error_message_; }
+  const string16& error_message() { return error_message_; }
   base::DictionaryValue* parsed_manifest() {
     return parsed_manifest_.get();
   }
   const DecodedImages& decoded_images() { return decoded_images_; }
   base::DictionaryValue* parsed_catalogs() { return parsed_catalogs_.get(); }
 
  private:
   // Parse the manifest.json file inside the extension (not in the header).
   // Caller takes ownership of return value.
   base::DictionaryValue* ReadManifest();
@@ skipping 29 matching lines @@
 
   // A list of decoded images and the paths where those images came from.  Paths
   // are relative to the manifest file.
   DecodedImages decoded_images_;
 
   // Dictionary of relative paths and catalogs per path. Paths are in the form
   // of _locales/locale, without messages.json base part.
   scoped_ptr<base::DictionaryValue> parsed_catalogs_;
 
   // The last error message that was set.  Empty if there were no errors.
-  std::string error_message_;
+  string16 error_message_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionUnpacker);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_UNPACKER_H_