AutoFill -> Autofill Part N

BUG=72758
TEST=none

Review URL: http://codereview.chromium.org/6713095

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79617 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 46 insertions, 46 deletions

diff --git a/chrome/browser/autofill/form_structure.cc b/chrome/browser/autofill/form_structure.cc
index 888d3a5..d6c2577 100644
--- a/chrome/browser/autofill/form_structure.cc
+++ b/chrome/browser/autofill/form_structure.cc
@@ -94,15 +94,15 @@ void FormStructure::DetermineHeuristicTypes() {
     DCHECK(field);
     FieldTypeMap::iterator iter = field_type_map.find(field->unique_name());
 
-    AutofillFieldType heuristic_auto_fill_type;
+    AutofillFieldType heuristic_autofill_type;
     if (iter == field_type_map.end()) {
-      heuristic_auto_fill_type = UNKNOWN_TYPE;
+      heuristic_autofill_type = UNKNOWN_TYPE;
     } else {
-      heuristic_auto_fill_type = iter->second;
+      heuristic_autofill_type = iter->second;
       ++autofill_count_;
     }
 
-    field->set_heuristic_type(heuristic_auto_fill_type);
+    field->set_heuristic_type(heuristic_autofill_type);
 
     AutofillType autofill_type(field->type());
     if (autofill_type.group() == AutofillType::CREDIT_CARD)
@@ -112,13 +112,13 @@ void FormStructure::DetermineHeuristicTypes() {
   }
 }
 
-bool FormStructure::EncodeUploadRequest(bool auto_fill_used,
+bool FormStructure::EncodeUploadRequest(bool autofill_used,
                                         std::string* encoded_xml) const {
   DCHECK(encoded_xml);
   encoded_xml->clear();
-  bool auto_fillable = ShouldBeParsed(true);
-  DCHECK(auto_fillable);  // Caller should've checked for search pages.
-  if (!auto_fillable)
+  bool autofillable = ShouldBeParsed(true);
+  DCHECK(autofillable);  // Caller should've checked for search pages.
+  if (!autofillable)
     return false;
 
   // Set up the <autofillupload> element and its attributes.
@@ -129,7 +129,7 @@ bool FormStructure::EncodeUploadRequest(bool auto_fill_used,
   autofill_request_xml.SetAttr(buzz::QName(kAttributeFormSignature),
                                FormSignature());
   autofill_request_xml.SetAttr(buzz::QName(kAttributeAutofillUsed),
-                               auto_fill_used ? "true" : "false");
+                               autofill_used ? "true" : "false");
   autofill_request_xml.SetAttr(buzz::QName(kAttributeDataPresent),
                                ConvertPresenceBitsToString().c_str());
 
diff --git a/chrome/browser/autofill/form_structure.h b/chrome/browser/autofill/form_structure.h
index b7c8694..276a9f7 100644
--- a/chrome/browser/autofill/form_structure.h
+++ b/chrome/browser/autofill/form_structure.h
@@ -45,7 +45,7 @@ class FormStructure {
   void DetermineHeuristicTypes();
 
   // Encodes the XML upload request from this FormStructure.
-  bool EncodeUploadRequest(bool auto_fill_used, std::string* encoded_xml) const;
+  bool EncodeUploadRequest(bool autofill_used, std::string* encoded_xml) const;
 
   // Encodes the XML query request for the set of forms.
   // All fields are returned in one XML. For example, there are three forms,
diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
index d31098e..350ce8c 100644
--- a/chrome/browser/password_manager/password_store_win.cc
+++ b/chrome/browser/password_manager/password_store_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -119,15 +119,15 @@ PasswordForm* PasswordStoreWin::GetIE7Result(const WDTypedResult *result,
       return NULL;
     }
 
-    PasswordForm* auto_fill = new PasswordForm(form);
-    auto_fill->username_value = username;
-    auto_fill->password_value = password;
-    auto_fill->preferred = true;
-    auto_fill->ssl_valid = form.origin.SchemeIsSecure();
-    auto_fill->date_created = info.date_created;
+    PasswordForm* autofill = new PasswordForm(form);
+    autofill->username_value = username;
+    autofill->password_value = password;
+    autofill->preferred = true;
+    autofill->ssl_valid = form.origin.SchemeIsSecure();
+    autofill->date_created = info.date_created;
     // Add this PasswordForm to the saved password table.
-    AddLogin(*auto_fill);
-    return auto_fill;
+    AddLogin(*autofill);
+    return autofill;
   }
   return NULL;
 }
diff --git a/chrome/browser/resources/options/autofill_edit_address_overlay.js b/chrome/browser/resources/options/autofill_edit_address_overlay.js
index 99e2a10..c1ce694 100644
--- a/chrome/browser/resources/options/autofill_edit_address_overlay.js
+++ b/chrome/browser/resources/options/autofill_edit_address_overlay.js
@@ -14,8 +14,8 @@ cr.define('options', function() {
    * @class
    */
   function AutofillEditAddressOverlay() {
-    OptionsPage.call(this, 'autoFillEditAddress',
-                     templateData.autoFillEditAddressTitle,
+    OptionsPage.call(this, 'autofillEditAddress',
+                     templateData.autofillEditAddressTitle,
                      'autofill-edit-address-overlay');
   }
 
diff --git a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js
index 300bed3..b58cb14 100644
--- a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js
+++ b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js
@@ -14,8 +14,8 @@ cr.define('options', function() {
    * @class
    */
   function AutofillEditCreditCardOverlay() {
-    OptionsPage.call(this, 'autoFillEditCreditCard',
-                     templateData.autoFillEditCreditCardTitle,
+    OptionsPage.call(this, 'autofillEditCreditCard',
+                     templateData.autofillEditCreditCardTitle,
                      'autofill-edit-credit-card-overlay');
   }
 
diff --git a/chrome/browser/resources/options/autofill_options.html b/chrome/browser/resources/options/autofill_options.html
index 507c02e..ac66726 100644
--- a/chrome/browser/resources/options/autofill_options.html
+++ b/chrome/browser/resources/options/autofill_options.html
@@ -1,5 +1,5 @@
 <div id="autofill-options" class="page hidden">
-  <h1 i18n-content="autoFillOptionsPage"></h1>
+  <h1 i18n-content="autofillOptionsPage"></h1>
 <if expr="os == 'darwin'">
   <div class="checkbox">
     <label>
@@ -8,20 +8,20 @@
     </label>
   </div>
 </if>
-  <h3 i18n-content="autoFillAddresses"></h3>
+  <h3 i18n-content="autofillAddresses"></h3>
   <div class="settings-list">
     <list id="address-list"></list>
     <div>
-      <button id="autofill-add-address" i18n-content="autoFillAddAddress">
+      <button id="autofill-add-address" i18n-content="autofillAddAddress">
       </button>
     </div>
   </div>
-  <h3 i18n-content="autoFillCreditCards"></h3>
+  <h3 i18n-content="autofillCreditCards"></h3>
   <div class="settings-list">
     <list id="creditcard-list"></list>
     <div>
       <button id="autofill-add-creditcard"
-          i18n-content="autoFillAddCreditCard"></button>
+          i18n-content="autofillAddCreditCard"></button>
     </div>
   </div>
   <div>
diff --git a/chrome/browser/resources/options/autofill_options.js b/chrome/browser/resources/options/autofill_options.js
index f58dd2f..0b3a305 100644
--- a/chrome/browser/resources/options/autofill_options.js
+++ b/chrome/browser/resources/options/autofill_options.js
@@ -16,7 +16,7 @@ cr.define('options', function() {
   function AutofillOptions() {
     OptionsPage.call(this,
                      'autofill',
-                     templateData.autoFillOptionsPageTabTitle,
+                     templateData.autofillOptionsPageTabTitle,
                      'autofill-options');
   }
 
@@ -63,7 +63,7 @@ cr.define('options', function() {
      */
     createAddressList_: function() {
       this.addressList_ = $('address-list');
-      options.autoFillOptions.AutofillAddressList.decorate(this.addressList_);
+      options.autofillOptions.AutofillAddressList.decorate(this.addressList_);
       this.addressList_.autoExpands = true;
     },
 
@@ -73,7 +73,7 @@ cr.define('options', function() {
      */
     createCreditCardList_: function() {
       this.creditCardList_ = $('creditcard-list');
-      options.autoFillOptions.AutofillCreditCardList.decorate(
+      options.autofillOptions.AutofillCreditCardList.decorate(
           this.creditCardList_);
       this.creditCardList_.autoExpands = true;
     },
@@ -88,7 +88,7 @@ cr.define('options', function() {
       var title = localStrings.getString('addAddressTitle');
       AutofillEditAddressOverlay.setTitle(title);
       AutofillEditAddressOverlay.clearInputFields();
-      OptionsPage.navigateToPage('autoFillEditAddress');
+      OptionsPage.navigateToPage('autofillEditAddress');
     },
 
     /**
@@ -101,7 +101,7 @@ cr.define('options', function() {
       var title = localStrings.getString('addCreditCardTitle');
       AutofillEditCreditCardOverlay.setTitle(title);
       AutofillEditCreditCardOverlay.clearInputFields();
-      OptionsPage.navigateToPage('autoFillEditCreditCard');
+      OptionsPage.navigateToPage('autofillEditCreditCard');
     },
 
     /**
@@ -172,7 +172,7 @@ cr.define('options', function() {
       var title = localStrings.getString('editAddressTitle');
       AutofillEditAddressOverlay.setTitle(title);
       AutofillEditAddressOverlay.loadAddress(address);
-      OptionsPage.navigateToPage('autoFillEditAddress');
+      OptionsPage.navigateToPage('autofillEditAddress');
     },
 
     /**
@@ -185,7 +185,7 @@ cr.define('options', function() {
       var title = localStrings.getString('editCreditCardTitle');
       AutofillEditCreditCardOverlay.setTitle(title);
       AutofillEditCreditCardOverlay.loadCreditCard(creditCard);
-      OptionsPage.navigateToPage('autoFillEditCreditCard');
+      OptionsPage.navigateToPage('autofillEditCreditCard');
     },
   };
 
diff --git a/chrome/browser/resources/options/autofill_options_list.js b/chrome/browser/resources/options/autofill_options_list.js
index a9c8a33..b90bbb7 100644
--- a/chrome/browser/resources/options/autofill_options_list.js
+++ b/chrome/browser/resources/options/autofill_options_list.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-cr.define('options.autoFillOptions', function() {
+cr.define('options.autofillOptions', function() {
   const DeletableItem = options.DeletableItem;
   const DeletableItemList = options.DeletableItemList;
 
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index 306f8bb..d4b3f41 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -77,9 +77,9 @@
     <div>
       <div class="checkbox">
         <label>
-          <input id="autoFillEnabled" pref="autofill.enabled"
+          <input id="autofillEnabled" pref="autofill.enabled"
               metric="Options_FormAutofill" type="checkbox">
-          <span i18n-content="autoFillEnabled"></span>
+          <span i18n-content="autofillEnabled"></span>
         </label>
       </div>
       <button id="autofill-settings"
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index 6c4d15b..5bb1c2d 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -86,10 +86,10 @@ void AutofillOptionsHandler::GetLocalizedValues(
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
-    { "autoFillAddresses", IDS_AUTOFILL_ADDRESSES_GROUP_NAME },
-    { "autoFillCreditCards", IDS_AUTOFILL_CREDITCARDS_GROUP_NAME },
-    { "autoFillAddAddress", IDS_AUTOFILL_ADD_ADDRESS_BUTTON },
-    { "autoFillAddCreditCard", IDS_AUTOFILL_ADD_CREDITCARD_BUTTON },
+    { "autofillAddresses", IDS_AUTOFILL_ADDRESSES_GROUP_NAME },
+    { "autofillCreditCards", IDS_AUTOFILL_CREDITCARDS_GROUP_NAME },
+    { "autofillAddAddress", IDS_AUTOFILL_ADD_ADDRESS_BUTTON },
+    { "autofillAddCreditCard", IDS_AUTOFILL_ADD_CREDITCARD_BUTTON },
     { "helpButton", IDS_AUTOFILL_HELP_LABEL },
     { "addAddressTitle", IDS_AUTOFILL_ADD_ADDRESS_CAPTION },
     { "editAddressTitle", IDS_AUTOFILL_EDIT_ADDRESS_CAPTION },
@@ -101,7 +101,7 @@ void AutofillOptionsHandler::GetLocalizedValues(
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
-  RegisterTitle(localized_strings, "autoFillOptionsPage",
+  RegisterTitle(localized_strings, "autofillOptionsPage",
                 IDS_AUTOFILL_OPTIONS_TITLE);
 
   SetAddressOverlayStrings(localized_strings);
@@ -148,7 +148,7 @@ void AutofillOptionsHandler::OnPersonalDataChanged() {
 
 void AutofillOptionsHandler::SetAddressOverlayStrings(
     DictionaryValue* localized_strings) {
-  localized_strings->SetString("autoFillEditAddressTitle",
+  localized_strings->SetString("autofillEditAddressTitle",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_EDIT_ADDRESS_CAPTION));
   localized_strings->SetString("fullNameLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_FULL_NAME));
@@ -178,7 +178,7 @@ void AutofillOptionsHandler::SetAddressOverlayStrings(
 
 void AutofillOptionsHandler::SetCreditCardOverlayStrings(
     DictionaryValue* localized_strings) {
-  localized_strings->SetString("autoFillEditCreditCardTitle",
+  localized_strings->SetString("autofillEditCreditCardTitle",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_EDIT_CREDITCARD_CAPTION));
   localized_strings->SetString("nameOnCardLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_NAME_ON_CARD));
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc
index 3b3b20b..4aa1283 100644
--- a/chrome/browser/ui/webui/options/personal_options_handler.cc
+++ b/chrome/browser/ui/webui/options/personal_options_handler.cc
@@ -104,7 +104,7 @@ void PersonalOptionsHandler::GetLocalizedValues(
 
   localized_strings->SetString("autofill",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME));
-  localized_strings->SetString("autoFillEnabled",
+  localized_strings->SetString("autofillEnabled",
       l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOFILL_ENABLE));
   localized_strings->SetString("manageAutofillSettings",
       l10n_util::GetStringUTF16(IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS));