Rename GetStringAsUTF16() to GetString() (and overload), etc.

chrome/browser/extensions/extension_omnibox_api.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/browser/extensions/extension_omnibox_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/notification_service.h"
 
 namespace events {
 const char kOnInputStarted[] = "experimental.omnibox.onInputStarted";
 const char kOnInputChanged[] = "experimental.omnibox.onInputChanged";
 const char kOnInputEntered[] = "experimental.omnibox.onInputEntered";
 const char kOnInputCancelled[] = "experimental.omnibox.onInputCancelled";
 };  // namespace events
 
 namespace {
 const char kDescriptionStylesOrderError[] =
     "Suggestion descriptionStyles must be in increasing non-overlapping order.";
 const char kDescriptionStylesLengthError[] =
     "Suggestion descriptionStyles contains an offset longer than the"
     " description text";
 
-const wchar_t kSuggestionContent[] = L"content";
-const wchar_t kSuggestionDescription[] = L"description";
-const wchar_t kSuggestionDescriptionStyles[] = L"descriptionStyles";
-const wchar_t kDescriptionStylesType[] = L"type";
-const wchar_t kDescriptionStylesOffset[] = L"offset";
+const char kSuggestionContent[] = "content";
+const char kSuggestionDescription[] = "description";
+const char kSuggestionDescriptionStyles[] = "descriptionStyles";
+const char kDescriptionStylesType[] = "type";
+const char kDescriptionStylesOffset[] = "offset";
 };  // namespace
 
 // static
 void ExtensionOmniboxEventRouter::OnInputStarted(
     Profile* profile, const std::string& extension_id) {
   profile->GetExtensionMessageService()->DispatchEventToExtension(
       extension_id, events::kOnInputStarted, "[]", profile->IsOffTheRecord(),
       GURL());
 }
 
@@ skipping 51 matching lines @@
   ListValue* suggestions_value;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &suggestions.request_id));
   EXTENSION_FUNCTION_VALIDATE(args_->GetList(1, &suggestions_value));
 
   suggestions.suggestions.resize(suggestions_value->GetSize());
   for (size_t i = 0; i < suggestions_value->GetSize(); ++i) {
     ExtensionOmniboxSuggestion& suggestion = suggestions.suggestions[i];
     DictionaryValue* suggestion_value;
     EXTENSION_FUNCTION_VALIDATE(suggestions_value->GetDictionary(
         i, &suggestion_value));
-    EXTENSION_FUNCTION_VALIDATE(suggestion_value->GetStringAsUTF16(
+    EXTENSION_FUNCTION_VALIDATE(suggestion_value->GetString(
         kSuggestionContent, &suggestion.content));
-    EXTENSION_FUNCTION_VALIDATE(suggestion_value->GetStringAsUTF16(
+    EXTENSION_FUNCTION_VALIDATE(suggestion_value->GetString(
         kSuggestionDescription, &suggestion.description));
 
     if (suggestion_value->HasKey(kSuggestionDescriptionStyles)) {
       ListValue* styles;
       EXTENSION_FUNCTION_VALIDATE(
           suggestion_value->GetList(kSuggestionDescriptionStyles, &styles));
 
       suggestion.description_styles.clear();
 
       int last_offset = -1;
@@ skipping 38 matching lines @@
     }
   }
 
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_OMNIBOX_SUGGESTIONS_READY,
       Source<Profile>(profile_),
       Details<ExtensionOmniboxSuggestions>(&suggestions));
 
   return true;
 }