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

chrome/browser/automation/automation_provider.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/automation/automation_provider.h"
 
 #include <set>
 
 #include "app/message_box_flags.h"
 #include "base/callback.h"
@@ skipping 2537 matching lines @@
   string16 password_element;
   string16 submit_element;
   string16 action_target_text;
   bool blacklist = false;
   string16 old_password_element;
   string16 old_password_value;
 
   // We don't care if any of these fail - they are either optional or checked
   // before this function is called.
   password_dict.GetString("signon_realm", &signon_realm);
-  password_dict.GetStringAsUTF16("username_value", &username_value);
-  password_dict.GetStringAsUTF16("password_value", &password_value);
-  password_dict.GetStringAsUTF16("origin_url", &origin_url_text);
-  password_dict.GetStringAsUTF16("username_element", &username_element);
-  password_dict.GetStringAsUTF16("password_element", &password_element);
-  password_dict.GetStringAsUTF16("submit_element", &submit_element);
-  password_dict.GetStringAsUTF16("action_target", &action_target_text);
+  password_dict.GetString("username_value", &username_value);
+  password_dict.GetString("password_value", &password_value);
+  password_dict.GetString("origin_url", &origin_url_text);
+  password_dict.GetString("username_element", &username_element);
+  password_dict.GetString("password_element", &password_element);
+  password_dict.GetString("submit_element", &submit_element);
+  password_dict.GetString("action_target", &action_target_text);
   password_dict.GetBoolean("blacklist", &blacklist);
 
   GURL origin_gurl(origin_url_text);
   GURL action_target(action_target_text);
 
   webkit_glue::PasswordForm password_form;
   password_form.signon_realm = signon_realm;
   password_form.username_value = username_value;
   password_form.password_value = password_value;
   password_form.origin = origin_gurl;
@@ skipping 548 matching lines @@
   for (int i = 0; i < num_profiles; i++) {
     profiles.GetDictionary(i, &profile_info);
     profile_info->GetString("label", &profile_label);
     // Choose an id of 0 so that a unique id will be created.
     AutoFillProfile profile(profile_label, 0);
     // Loop through the possible profile types and add those provided.
     for (std::map<AutoFillFieldType, std::wstring>::iterator type_it =
          autofill_type_to_string.begin();
          type_it != autofill_type_to_string.end(); ++type_it) {
       if (profile_info->HasKey(type_it->second)) {
-        if (profile_info->GetStringAsUTF16(type_it->second, &current_value)) {
+        if (profile_info->GetString(WideToUTF8(type_it->second),
+                                    &current_value)) {
           profile.SetInfo(AutoFillType(type_it->first), current_value);
         } else {
           *error_message= "All values must be strings";
           break;
         }
       }
     }
     autofill_profiles.push_back(profile);
   }
   return autofill_profiles;
@@ skipping 13 matching lines @@
   int num_credit_cards = cards.GetSize();
   for (int i = 0; i < num_credit_cards; i++) {
     cards.GetDictionary(i, &card_info);
     card_info->GetString("label", &card_label);
     CreditCard card(card_label, 0);
     // Loop through the possible credit card fields and add those provided.
     for (std::map<AutoFillFieldType, std::wstring>::iterator type_it =
         credit_card_type_to_string.begin();
         type_it != credit_card_type_to_string.end(); ++type_it) {
       if (card_info->HasKey(type_it->second)) {
-        if (card_info->GetStringAsUTF16(type_it->second, &current_value)) {
+        if (card_info->GetString(WideToUTF8(type_it->second), &current_value)) {
           card.SetInfo(AutoFillType(type_it->first), current_value);
         } else {
           *error_message= "All values must be strings";
           break;
         }
       }
     }
     credit_cards.push_back(card);
   }
   return credit_cards;
@@ skipping 1302 matching lines @@
 }
 
 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) {
   NOTIMPLEMENTED();
 }
 #endif  // !defined(TOOLKIT_VIEWS)
 
 void AutomationProvider::ResetToDefaultTheme() {
   profile_->ClearTheme();
 }