Remove deprecated wstring Get(As)String() methods from Value, etc.

chrome/common/extensions/extension_message_bundle.cc

 // Copyright (c) 2010 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/extension_message_bundle.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/hash_tables.h"
 #include "base/i18n/rtl.h"
 #include "base/linked_ptr.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 
 namespace errors = extension_manifest_errors;
 
-const wchar_t* ExtensionMessageBundle::kContentKey = L"content";
-const wchar_t* ExtensionMessageBundle::kMessageKey = L"message";
-const wchar_t* ExtensionMessageBundle::kPlaceholdersKey = L"placeholders";
+const char* ExtensionMessageBundle::kContentKey = "content";
+const char* ExtensionMessageBundle::kMessageKey = "message";
+const char* ExtensionMessageBundle::kPlaceholdersKey = "placeholders";
 
 const char* ExtensionMessageBundle::kPlaceholderBegin = "$";
 const char* ExtensionMessageBundle::kPlaceholderEnd = "$";
 const char* ExtensionMessageBundle::kMessageBegin = "__MSG_";
 const char* ExtensionMessageBundle::kMessageEnd = "__";
 
 // Reserved messages names.
 const char* ExtensionMessageBundle::kUILocaleKey = "@@ui_locale";
 const char* ExtensionMessageBundle::kBidiDirectionKey = "@@bidi_dir";
 const char* ExtensionMessageBundle::kBidiReversedDirectionKey =
@@ skipping 93 matching lines @@
                                              std::string* value,
                                              std::string* error) const {
   // Get the top level tree for given key (name part).
   DictionaryValue* name_tree;
   if (!catalog.GetDictionaryWithoutPathExpansion(key, &name_tree)) {
     *error = StringPrintf("Not a valid tree for key %s.", key.c_str());
     return false;
   }
   // Extract message from it.
   if (!name_tree->GetString(kMessageKey, value)) {
-    *error = StringPrintf("There is no \"%s\" element for key %s.",
-                          WideToUTF8(kMessageKey).c_str(),
+    *error = StringPrintf("There is no \"%s\" element for key %s.", kMessageKey,
                           key.c_str());
     return false;
   }
 
   SubstitutionMap placeholders;
   if (!GetPlaceholders(*name_tree, key, &placeholders, error))
     return false;
 
   if (!ReplacePlaceholders(placeholders, value, error))
     return false;
 
   return true;
 }
 
 ExtensionMessageBundle::ExtensionMessageBundle() {
 }
 
 bool ExtensionMessageBundle::GetPlaceholders(const DictionaryValue& name_tree,
                                              const std::string& name_key,
                                              SubstitutionMap* placeholders,
                                              std::string* error) const {
   if (!name_tree.HasKey(kPlaceholdersKey))
     return true;
 
   DictionaryValue* placeholders_tree;
   if (!name_tree.GetDictionary(kPlaceholdersKey, &placeholders_tree)) {
     *error = StringPrintf("Not a valid \"%s\" element for key %s.",
-                          WideToUTF8(kPlaceholdersKey).c_str(),
-                          name_key.c_str());
+                          kPlaceholdersKey, name_key.c_str());
     return false;
   }
 
   for (DictionaryValue::key_iterator key_it = placeholders_tree->begin_keys();
        key_it != placeholders_tree->end_keys(); ++key_it) {
     DictionaryValue* placeholder;
     const std::string& content_key(*key_it);
     if (!IsValidName(content_key))
       return BadKeyMessage(content_key, error);
     if (!placeholders_tree->GetDictionaryWithoutPathExpansion(content_key,
                                                               &placeholder)) {
       *error = StringPrintf("Invalid placeholder %s for key %s",
                             content_key.c_str(),
                             name_key.c_str());
       return false;
     }
     std::string content;
     if (!placeholder->GetString(kContentKey, &content)) {
       *error = StringPrintf("Invalid \"%s\" element for key %s.",
-                            WideToUTF8(kContentKey).c_str(),
-                            name_key.c_str());
+                            kContentKey, name_key.c_str());
       return false;
     }
     (*placeholders)[StringToLowerASCII(content_key)] = content;
   }
 
   return true;
 }
 
 bool ExtensionMessageBundle::ReplacePlaceholders(
     const SubstitutionMap& placeholders,
@@ skipping 100 matching lines @@
 }
 
 L10nMessagesMap* GetL10nMessagesMap(const std::string extension_id) {
   ExtensionToL10nMessagesMap::iterator it =
       Singleton<ExtensionToMessagesMap>()->messages_map.find(extension_id);
   if (it != Singleton<ExtensionToMessagesMap>()->messages_map.end())
     return &(it->second);
 
   return NULL;
 }