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

chrome/common/extensions/manifest.cc

 // 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.
 
 #include "chrome/common/extensions/manifest.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_split.h"
@@ skipping 96 matching lines @@
   std::set<std::string> keys;
   const RestrictionMap& map = g_restrictions.Get().map;
   for (RestrictionMap::const_iterator i = map.begin(); i != map.end(); i++)
     keys.insert(i->first);
   return keys;
 }
 
 Manifest::Manifest(DictionaryValue* value) : value_(value) {}
 Manifest::~Manifest() {}
 
-bool Manifest::ValidateManifest(std::string* error) const {
+bool Manifest::ValidateManifest(string16* error) const {
   Restrictions restrictions = g_restrictions.Get();
   Type type = GetType();
 
   for (DictionaryValue::key_iterator key = value_->begin_keys();
        key != value_->end_keys(); ++key) {
     // When validating the extension manifests, we ignore keys that are not
     // recognized for forward compatibility.
     if (!restrictions.IsKnownKey(*key)) {
       // TODO(aa): Consider having an error here in the case of strict error
       // checking to let developers know when they screw up.
       continue;
     }
 
     if (!restrictions.CanAccessKey(*key, type)) {
-      *error = ExtensionErrorUtils::FormatErrorMessage(
+      *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
           errors::kFeatureNotAllowed, *key);
       return false;
     }
   }
 
   return true;
 }
 
 bool Manifest::HasKey(const std::string& key) const {
   Restrictions restrictions = g_restrictions.Get();
@@ skipping 79 matching lines @@
 
 bool Manifest::CanAccessPath(const std::string& path) const {
   std::vector<std::string> components;
   base::SplitString(path, '.', &components);
 
   Restrictions restrictions = g_restrictions.Get();
   return restrictions.CanAccessKey(components[0], GetType());
 }
 
 }  // namespace extensions