autofill: Rename all the entries remaining with AutoFill to Autofill.

R=isherman@chromium.org,dhollowa@chromium.org
BUG=72758
TEST=existing unit_tests

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

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

91 files changed, 785 insertions, 784 deletions

diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autocomplete_history_manager.cc
index bbc3387..a5ece90 100644
--- a/chrome/browser/autocomplete_history_manager.cc
+++ b/chrome/browser/autocomplete_history_manager.cc
@@ -80,7 +80,7 @@ AutocompleteHistoryManager::AutocompleteHistoryManager(
   profile_ = tab_contents->profile();
   // May be NULL in unit tests.
   web_data_service_ = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
-  autofill_enabled_.Init(prefs::kAutoFillEnabled, profile_->GetPrefs(), NULL);
+  autofill_enabled_.Init(prefs::kAutofillEnabled, profile_->GetPrefs(), NULL);
 }
 
 AutocompleteHistoryManager::~AutocompleteHistoryManager() {
@@ -91,7 +91,7 @@ bool AutocompleteHistoryManager::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AutocompleteHistoryManager, message)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_RemoveAutocompleteEntry,
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_RemoveAutocompleteEntry,
                         OnRemoveAutocompleteEntry)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -200,7 +200,7 @@ AutocompleteHistoryManager::AutocompleteHistoryManager(
       pending_query_handle_(0),
       query_id_(0) {
   autofill_enabled_.Init(
-      prefs::kAutoFillEnabled, profile_->GetPrefs(), NULL);
+      prefs::kAutofillEnabled, profile_->GetPrefs(), NULL);
 }
 
 void AutocompleteHistoryManager::CancelPendingQuery() {
@@ -215,7 +215,7 @@ void AutocompleteHistoryManager::CancelPendingQuery() {
 void AutocompleteHistoryManager::SendSuggestions(
     const std::vector<string16>* suggestions) {
   if (suggestions) {
-    // Combine AutoFill and Autocomplete values into values and labels.
+    // Combine Autofill and Autocomplete values into values and labels.
     for (size_t i = 0; i < suggestions->size(); ++i) {
       bool unique = true;
       for (size_t j = 0; j < autofill_values_.size(); ++j) {
@@ -235,7 +235,7 @@ void AutocompleteHistoryManager::SendSuggestions(
     }
   }
 
-  Send(new AutoFillMsg_SuggestionsReturned(routing_id(),
+  Send(new AutofillMsg_SuggestionsReturned(routing_id(),
                                            query_id_,
                                            autofill_values_,
                                            autofill_labels_,
diff --git a/chrome/browser/autofill/address.cc b/chrome/browser/autofill/address.cc
index 7531d78..d00bfa9 100644
--- a/chrome/browser/autofill/address.cc
+++ b/chrome/browser/autofill/address.cc
@@ -14,7 +14,7 @@ namespace {
 
 const char16 kAddressSplitChars[] = {'-', ',', '#', '.', ' ', 0};
 
-const AutofillType::FieldTypeSubGroup kAutoFillAddressTypes[] = {
+const AutofillType::FieldTypeSubGroup kAutofillAddressTypes[] = {
   AutofillType::ADDRESS_LINE1,
   AutofillType::ADDRESS_LINE2,
   AutofillType::ADDRESS_CITY,
@@ -23,7 +23,7 @@ const AutofillType::FieldTypeSubGroup kAutoFillAddressTypes[] = {
   AutofillType::ADDRESS_COUNTRY,
 };
 
-const int kAutoFillAddressLength = arraysize(kAutoFillAddressTypes);
+const int kAutofillAddressLength = arraysize(kAutofillAddressTypes);
 
 }  // namespace
 
@@ -107,8 +107,8 @@ void Address::FindInfoMatches(AutofillFieldType type,
 
   string16 match;
   if (type == UNKNOWN_TYPE) {
-    for (int i = 0; i < kAutoFillAddressLength; ++i) {
-      if (FindInfoMatchesHelper(kAutoFillAddressTypes[i], info, &match))
+    for (int i = 0; i < kAutofillAddressLength; ++i) {
+      if (FindInfoMatchesHelper(kAutofillAddressTypes[i], info, &match))
         matched_text->push_back(match);
     }
   } else {
diff --git a/chrome/browser/autofill/address_field.cc b/chrome/browser/autofill/address_field.cc
index 5d4d0cc..8adbafa 100644
--- a/chrome/browser/autofill/address_field.cc
+++ b/chrome/browser/autofill/address_field.cc
@@ -24,7 +24,7 @@ bool AddressField::GetFieldInfo(FieldTypeMap* field_type_map) const {
 
   switch (type_) {
     case kShippingAddress:
-     // Fall through. AutoFill does not support shipping addresses.
+     // Fall through. Autofill does not support shipping addresses.
     case kGenericAddress:
       address_company = COMPANY_NAME;
       address_line1 = ADDRESS_HOME_LINE1;
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 4001dd4..4c3e1f4 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -4,11 +4,11 @@
 
 #include <string>
 
-#include "base/utf_string_conversions.h"
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
@@ -62,9 +62,9 @@ static const char* kTestFormString =
     " <input type=\"text\" id=\"phone\" /><br />"
     "</form>";
 
-class AutoFillTest : public InProcessBrowserTest {
+class AutofillTest : public InProcessBrowserTest {
  protected:
-  AutoFillTest() {
+  AutofillTest() {
     set_show_window(true);
     EnableDOMAutomation();
   }
@@ -214,7 +214,7 @@ class AutoFillTest : public InProcessBrowserTest {
 };
 
 // Test that basic form fill is working.
-IN_PROC_BROWSER_TEST_F(AutoFillTest, BasicFormFill) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, BasicFormFill) {
   CreateTestProfile();
 
   // Load the test page.
@@ -222,12 +222,12 @@ IN_PROC_BROWSER_TEST_F(AutoFillTest, BasicFormFill) {
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
-  // Invoke AutoFill.
+  // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that form filling can be initiated by pressing the down arrow.
-IN_PROC_BROWSER_TEST_F(AutoFillTest, AutoFillViaDownArrow) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillViaDownArrow) {
   CreateTestProfile();
 
   // Load the test page.
@@ -238,7 +238,7 @@ IN_PROC_BROWSER_TEST_F(AutoFillTest, AutoFillViaDownArrow) {
   // Focus a fillable field.
   FocusFirstNameField();
 
-  // Press the down arrow to initiate AutoFill and wait for the popup to be
+  // Press the down arrow to initiate Autofill and wait for the popup to be
   // shown.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       browser(), ui::VKEY_DOWN, false, false, false, false,
@@ -263,7 +263,7 @@ IN_PROC_BROWSER_TEST_F(AutoFillTest, AutoFillViaDownArrow) {
 }
 
 // Test that a JavaScript onchange event is fired after auto-filling a form.
-IN_PROC_BROWSER_TEST_F(AutoFillTest, OnChangeAfterAutoFill) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, OnChangeAfterAutofill) {
   CreateTestProfile();
 
   const char* kOnChangeScript =
@@ -319,7 +319,7 @@ IN_PROC_BROWSER_TEST_F(AutoFillTest, OnChangeAfterAutoFill) {
 
 // Test that form filling works after reloading the current page.
 // This test brought to you by http://crbug.com/69204
-IN_PROC_BROWSER_TEST_F(AutoFillTest, AutoFillAfterReload) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillAfterReload) {
   CreateTestProfile();
 
   // Load the test page.
@@ -333,12 +333,12 @@ IN_PROC_BROWSER_TEST_F(AutoFillTest, AutoFillAfterReload) {
   controller->Reload(false);
   ui_test_utils::WaitForLoadStop(controller);
 
-  // Invoke AutoFill.
+  // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that autofill works after page translation.
-IN_PROC_BROWSER_TEST_F(AutoFillTest, AutoFillAfterTranslate) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillAfterTranslate) {
   CreateTestProfile();
 
   GURL url(std::string(kDataURIPrefix) +
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
index 92c9787..f02b4fd 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
+++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
@@ -12,16 +12,16 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-AutoFillCCInfoBarDelegate::AutoFillCCInfoBarDelegate(TabContents* tab_contents,
+AutofillCCInfoBarDelegate::AutofillCCInfoBarDelegate(TabContents* tab_contents,
                                                      AutofillManager* host)
     : ConfirmInfoBarDelegate(tab_contents),
       host_(host) {
 }
 
-AutoFillCCInfoBarDelegate::~AutoFillCCInfoBarDelegate() {
+AutofillCCInfoBarDelegate::~AutofillCCInfoBarDelegate() {
 }
 
-bool AutoFillCCInfoBarDelegate::ShouldExpire(
+bool AutofillCCInfoBarDelegate::ShouldExpire(
     const NavigationController::LoadCommittedDetails& details) const {
   // The user has submitted a form, causing the page to navigate elsewhere. We
   // don't want the infobar to be expired at this point, because the user won't
@@ -29,7 +29,7 @@ bool AutoFillCCInfoBarDelegate::ShouldExpire(
   return false;
 }
 
-void AutoFillCCInfoBarDelegate::InfoBarClosed() {
+void AutofillCCInfoBarDelegate::InfoBarClosed() {
   if (host_) {
     host_->OnInfoBarClosed(false);
     host_ = NULL;
@@ -37,26 +37,26 @@ void AutoFillCCInfoBarDelegate::InfoBarClosed() {
   delete this;
 }
 
-SkBitmap* AutoFillCCInfoBarDelegate::GetIcon() const {
+SkBitmap* AutofillCCInfoBarDelegate::GetIcon() const {
   return ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_AUTOFILL);
 }
 
-InfoBarDelegate::Type AutoFillCCInfoBarDelegate::GetInfoBarType() const {
+InfoBarDelegate::Type AutofillCCInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
-string16 AutoFillCCInfoBarDelegate::GetMessageText() const {
+string16 AutofillCCInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_INFOBAR_TEXT);
 }
 
-string16 AutoFillCCInfoBarDelegate::GetButtonLabel(InfoBarButton button) const {
+string16 AutofillCCInfoBarDelegate::GetButtonLabel(InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_AUTOFILL_CC_INFOBAR_ACCEPT : IDS_AUTOFILL_CC_INFOBAR_DENY);
 }
 
-bool AutoFillCCInfoBarDelegate::Accept() {
-  UMA_HISTOGRAM_COUNTS("AutoFill.CCInfoBarAccepted", 1);
+bool AutofillCCInfoBarDelegate::Accept() {
+  UMA_HISTOGRAM_COUNTS("Autofill.CCInfoBarAccepted", 1);
   if (host_) {
     host_->OnInfoBarClosed(true);
     host_ = NULL;
@@ -64,18 +64,18 @@ bool AutoFillCCInfoBarDelegate::Accept() {
   return true;
 }
 
-bool AutoFillCCInfoBarDelegate::Cancel() {
-  UMA_HISTOGRAM_COUNTS("AutoFill.CCInfoBarDenied", 1);
+bool AutofillCCInfoBarDelegate::Cancel() {
+  UMA_HISTOGRAM_COUNTS("Autofill.CCInfoBarDenied", 1);
   return true;
 }
 
-string16 AutoFillCCInfoBarDelegate::GetLinkText() {
+string16 AutofillCCInfoBarDelegate::GetLinkText() {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
-bool AutoFillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
+bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   Browser* browser = BrowserList::GetLastActive();
   DCHECK(browser);
-  browser->OpenAutoFillHelpTabAndActivate();
+  browser->OpenAutofillHelpTabAndActivate();
   return false;
 }
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.h b/chrome/browser/autofill/autofill_cc_infobar_delegate.h
index 24e6f47..1077458 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate.h
+++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.h
@@ -13,12 +13,12 @@ class AutofillManager;
 
 // An InfoBar delegate that enables the user to allow or deny storing credit
 // card information gathered from a form submission.
-class AutoFillCCInfoBarDelegate : public ConfirmInfoBarDelegate {
+class AutofillCCInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  AutoFillCCInfoBarDelegate(TabContents* tab_contents, AutofillManager* host);
+  AutofillCCInfoBarDelegate(TabContents* tab_contents, AutofillManager* host);
 
  private:
-  virtual ~AutoFillCCInfoBarDelegate();
+  virtual ~AutofillCCInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual bool ShouldExpire(
@@ -36,7 +36,7 @@ class AutoFillCCInfoBarDelegate : public ConfirmInfoBarDelegate {
   // The AutofillManager that initiated this InfoBar.
   AutofillManager* host_;
 
-  DISALLOW_COPY_AND_ASSIGN(AutoFillCCInfoBarDelegate);
+  DISALLOW_COPY_AND_ASSIGN(AutofillCCInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_CC_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/autofill/autofill_common_test.cc b/chrome/browser/autofill/autofill_common_test.cc
index bb1f535..a16b6bb 100644
--- a/chrome/browser/autofill/autofill_common_test.cc
+++ b/chrome/browser/autofill/autofill_common_test.cc
@@ -83,7 +83,7 @@ void DisableSystemServices(Profile* profile) {
   // Disable auxiliary profiles for unit testing.  These reach out to system
   // services on the Mac.
   if (profile) {
-    profile->GetPrefs()->SetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled,
+    profile->GetPrefs()->SetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled,
                                     false);
   }
 }
diff --git a/chrome/browser/autofill/autofill_common_test.h b/chrome/browser/autofill/autofill_common_test.h
index 0d977f8..db42140 100644
--- a/chrome/browser/autofill/autofill_common_test.h
+++ b/chrome/browser/autofill/autofill_common_test.h
@@ -14,7 +14,7 @@ namespace webkit_glue {
 struct FormField;
 }  // namespace webkit_glue
 
-// Common utilities shared amongst AutoFill tests.
+// Common utilities shared amongst Autofill tests.
 namespace autofill_test {
 
 // Provides a quick way to populate a FormField with c-strings.
@@ -24,7 +24,7 @@ void CreateTestFormField(const char* label,
                          const char* type,
                          webkit_glue::FormField* field);
 
-// A unit testing utility that is common to a number of the AutoFill unit
+// A unit testing utility that is common to a number of the Autofill unit
 // tests.  |SetProfileInfo| provides a quick way to populate a profile with
 // c-strings.
 void SetProfileInfo(AutofillProfile* profile,
@@ -41,7 +41,7 @@ void SetProfileInfoWithGuid(AutofillProfile* profile,
     const char* state, const char* zipcode, const char* country,
     const char* phone, const char* fax);
 
-// A unit testing utility that is common to a number of the AutoFill unit
+// A unit testing utility that is common to a number of the Autofill unit
 // tests.  |SetCreditCardInfo| provides a quick way to populate a credit card
 // with c-strings.
 void SetCreditCardInfo(CreditCard* credit_card,
diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc
index 3583f73..dcca2a7 100644
--- a/chrome/browser/autofill/autofill_download.cc
+++ b/chrome/browser/autofill/autofill_download.cc
@@ -45,9 +45,9 @@ AutofillDownloadManager::AutofillDownloadManager(Profile* profile)
   if (profile_) {
     PrefService* preferences = profile_->GetPrefs();
     positive_upload_rate_ =
-        preferences->GetDouble(prefs::kAutoFillPositiveUploadRate);
+        preferences->GetDouble(prefs::kAutofillPositiveUploadRate);
     negative_upload_rate_ =
-        preferences->GetDouble(prefs::kAutoFillNegativeUploadRate);
+        preferences->GetDouble(prefs::kAutofillNegativeUploadRate);
   }
 }
 
@@ -156,7 +156,7 @@ void AutofillDownloadManager::SetPositiveUploadRate(double rate) {
   DCHECK_LE(rate, 1.0);
   DCHECK(profile_);
   PrefService* preferences = profile_->GetPrefs();
-  preferences->SetDouble(prefs::kAutoFillPositiveUploadRate, rate);
+  preferences->SetDouble(prefs::kAutofillPositiveUploadRate, rate);
 }
 
 void AutofillDownloadManager::SetNegativeUploadRate(double rate) {
@@ -167,7 +167,7 @@ void AutofillDownloadManager::SetNegativeUploadRate(double rate) {
   DCHECK_LE(rate, 1.0);
   DCHECK(profile_);
   PrefService* preferences = profile_->GetPrefs();
-  preferences->SetDouble(prefs::kAutoFillNegativeUploadRate, rate);
+  preferences->SetDouble(prefs::kAutofillNegativeUploadRate, rate);
 }
 
 bool AutofillDownloadManager::StartRequest(
@@ -324,7 +324,7 @@ void AutofillDownloadManager::OnURLFetchComplete(
     } else {
       double new_positive_upload_rate = 0;
       double new_negative_upload_rate = 0;
-      AutoFillUploadXmlParser parse_handler(&new_positive_upload_rate,
+      AutofillUploadXmlParser parse_handler(&new_positive_upload_rate,
                                             &new_negative_upload_rate);
       buzz::XmlParser parser(&parse_handler);
       parser.Parse(data.data(), data.length(), true);
diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc
index 188d8b2..7878aa7 100644
--- a/chrome/browser/autofill/autofill_download_unittest.cc
+++ b/chrome/browser/autofill/autofill_download_unittest.cc
@@ -112,9 +112,9 @@ class AutofillDownloadTestHelper : public AutofillDownloadManager::Observer {
   scoped_refptr<URLRequestContextGetter> request_context_getter;
 };
 
-typedef TestingBrowserProcessTest AutoFillDownloadTest;
+typedef TestingBrowserProcessTest AutofillDownloadTest;
 
-TEST_F(AutoFillDownloadTest, QueryAndUploadTest) {
+TEST_F(AutofillDownloadTest, QueryAndUploadTest) {
   MessageLoopForUI message_loop;
   // Create and register factory.
   AutofillDownloadTestHelper helper;
@@ -357,7 +357,7 @@ TEST_F(AutoFillDownloadTest, QueryAndUploadTest) {
   URLFetcher::set_factory(NULL);
 }
 
-TEST_F(AutoFillDownloadTest, CacheQueryTest) {
+TEST_F(AutofillDownloadTest, CacheQueryTest) {
   MessageLoopForUI message_loop;
   AutofillDownloadTestHelper helper;
   // Create and register factory.
diff --git a/chrome/browser/autofill/autofill_field.h b/chrome/browser/autofill/autofill_field.h
index 9eb77c8..f1000a0 100644
--- a/chrome/browser/autofill/autofill_field.h
+++ b/chrome/browser/autofill/autofill_field.h
@@ -48,10 +48,10 @@ class AutofillField : public webkit_glue::FormField {
   bool IsFieldFillable() const;
 
  private:
-  // The unique name of this field, generated by AutoFill.
+  // The unique name of this field, generated by Autofill.
   string16 unique_name_;
 
-  // The type of the field, as determined by the AutoFill server.
+  // The type of the field, as determined by the Autofill server.
   AutofillFieldType server_type_;
 
   // The type of the field, as determined by the local heuristics.
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
index 6ff6e33..3ed1cf1 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
@@ -145,9 +145,9 @@ bool ImportSingleProfile(FormGroup* profile,
 
 // Imports profiles from the IE toolbar and stores them. Asynchronous
 // if PersonalDataManager has not been loaded yet. Deletes itself on completion.
-class AutoFillImporter : public PersonalDataManager::Observer {
+class AutofillImporter : public PersonalDataManager::Observer {
  public:
-  explicit AutoFillImporter(PersonalDataManager* personal_data_manager)
+  explicit AutofillImporter(PersonalDataManager* personal_data_manager)
     : personal_data_manager_(personal_data_manager) {
       personal_data_manager_->SetObserver(this);
   }
@@ -172,7 +172,7 @@ class AutoFillImporter : public PersonalDataManager::Observer {
   }
 
  private:
-  ~AutoFillImporter() {
+  ~AutofillImporter() {
     personal_data_manager_->RemoveObserver(this);
   }
 
@@ -183,7 +183,7 @@ class AutoFillImporter : public PersonalDataManager::Observer {
 
 }  // namespace
 
-// Imports AutoFill profiles and credit cards from IE Toolbar if present and not
+// Imports Autofill profiles and credit cards from IE Toolbar if present and not
 // password protected. Returns true if data is successfully retrieved. False if
 // there is no data, data is password protected or error occurred.
 bool ImportCurrentUserProfiles(std::vector<AutofillProfile>* profiles,
@@ -252,7 +252,7 @@ bool ImportAutofillDataWin(PersonalDataManager* pdm) {
   // In incognito mode we do not have PDM - and we should not import anything.
   if (!pdm)
     return false;
-  AutoFillImporter *importer = new AutoFillImporter(pdm);
+  AutofillImporter *importer = new AutofillImporter(pdm);
   // importer will self delete.
   return importer->ImportProfiles();
 }
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
index 46f02a3..b115038 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
@@ -140,7 +140,7 @@ void AutofillIeToolbarImportTest::TearDown() {
   key.DeleteKey(L"");
 }
 
-TEST_F(AutofillIeToolbarImportTest, TestAutoFillImport) {
+TEST_F(AutofillIeToolbarImportTest, TestAutofillImport) {
   RegKey profile_key;
   profile_key.Create(HKEY_CURRENT_USER, kProfileKey, KEY_ALL_ACCESS);
   EXPECT_TRUE(profile_key.Valid());
diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc
index 35b6f25..8fc60dc 100644
--- a/chrome/browser/autofill/autofill_manager.cc
+++ b/chrome/browser/autofill/autofill_manager.cc
@@ -42,8 +42,8 @@ namespace {
 
 // We only send a fraction of the forms to upload server.
 // The rate for positive/negative matches potentially could be different.
-const double kAutoFillPositiveUploadRateDefaultValue = 0.01;
-const double kAutoFillNegativeUploadRateDefaultValue = 0.01;
+const double kAutofillPositiveUploadRateDefaultValue = 0.01;
+const double kAutofillNegativeUploadRateDefaultValue = 0.01;
 
 const string16::value_type kCreditCardPrefix[] = {'*', 0};
 const string16::value_type kLabelSeparator[] = {';', ' ', '*', 0};
@@ -165,12 +165,12 @@ void FindSectionBounds(const FormStructure& form,
 // logical form. Returns true if the relevant portion of |form| is auto-filled.
 // The "relevant" fields in |form| are ones corresponding to fields in
 // |form_structure| with indices in the range [section_start, section_end).
-bool SectionIsAutoFilled(const FormStructure* form_structure,
+bool SectionIsAutofilled(const FormStructure* form_structure,
                          const webkit_glue::FormData& form,
                          size_t section_start,
                          size_t section_end) {
   // TODO(isherman): It would be nice to share most of this code with the loop
-  // in |FillAutoFillFormData()|, but I don't see a particularly clean way to do
+  // in |FillAutofillFormData()|, but I don't see a particularly clean way to do
   // that.
 
   // The list of fields in |form_structure| and |form.fields| often match
@@ -231,21 +231,21 @@ AutofillManager::~AutofillManager() {
 
 // static
 void AutofillManager::RegisterBrowserPrefs(PrefService* prefs) {
-  prefs->RegisterDictionaryPref(prefs::kAutoFillDialogPlacement);
+  prefs->RegisterDictionaryPref(prefs::kAutofillDialogPlacement);
 }
 
 // static
 void AutofillManager::RegisterUserPrefs(PrefService* prefs) {
-  prefs->RegisterBooleanPref(prefs::kAutoFillEnabled, true);
+  prefs->RegisterBooleanPref(prefs::kAutofillEnabled, true);
 #if defined(OS_MACOSX)
-  prefs->RegisterBooleanPref(prefs::kAutoFillAuxiliaryProfilesEnabled, true);
+  prefs->RegisterBooleanPref(prefs::kAutofillAuxiliaryProfilesEnabled, true);
 #else
-  prefs->RegisterBooleanPref(prefs::kAutoFillAuxiliaryProfilesEnabled, false);
+  prefs->RegisterBooleanPref(prefs::kAutofillAuxiliaryProfilesEnabled, false);
 #endif
-  prefs->RegisterDoublePref(prefs::kAutoFillPositiveUploadRate,
-                            kAutoFillPositiveUploadRateDefaultValue);
-  prefs->RegisterDoublePref(prefs::kAutoFillNegativeUploadRate,
-                            kAutoFillNegativeUploadRateDefaultValue);
+  prefs->RegisterDoublePref(prefs::kAutofillPositiveUploadRate,
+                            kAutofillPositiveUploadRateDefaultValue);
+  prefs->RegisterDoublePref(prefs::kAutofillNegativeUploadRate,
+                            kAutofillNegativeUploadRateDefaultValue);
 }
 
 void AutofillManager::DidNavigateMainFramePostCommit(
@@ -257,18 +257,18 @@ void AutofillManager::DidNavigateMainFramePostCommit(
 bool AutofillManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AutofillManager, message)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_FormsSeen, OnFormsSeen)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_FormSubmitted, OnFormSubmitted)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_QueryFormFieldAutoFill,
-                        OnQueryFormFieldAutoFill)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_ShowAutoFillDialog,
-                        OnShowAutoFillDialog)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_FillAutoFillFormData,
-                        OnFillAutoFillFormData)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_DidFillAutoFillFormData,
-                        OnDidFillAutoFillFormData)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_DidShowAutoFillSuggestions,
-                        OnDidShowAutoFillSuggestions)
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_FormsSeen, OnFormsSeen)
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_FormSubmitted, OnFormSubmitted)
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_QueryFormFieldAutofill,
+                        OnQueryFormFieldAutofill)
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_ShowAutofillDialog,
+                        OnShowAutofillDialog)
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_FillAutofillFormData,
+                        OnFillAutofillFormData)
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_DidFillAutofillFormData,
+                        OnDidFillAutofillFormData)
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_DidShowAutofillSuggestions,
+                        OnDidShowAutofillSuggestions)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
@@ -279,7 +279,7 @@ void AutofillManager::OnFormSubmitted(const FormData& form) {
   // Let AutoComplete know as well.
   tab_contents()->autocomplete_history_manager()->OnFormSubmitted(form);
 
-  if (!IsAutoFillEnabled())
+  if (!IsAutofillEnabled())
     return;
 
   if (tab_contents()->profile()->IsOffTheRecord())
@@ -302,20 +302,20 @@ void AutofillManager::OnFormSubmitted(const FormData& form) {
   UploadFormData(submitted_form);
 
   submitted_form.DetermineHeuristicTypes();
-  if (!submitted_form.IsAutoFillable(true))
+  if (!submitted_form.IsAutofillable(true))
     return;
 
   ImportFormData(submitted_form);
 }
 
 void AutofillManager::OnFormsSeen(const std::vector<FormData>& forms) {
-  if (!IsAutoFillEnabled())
+  if (!IsAutofillEnabled())
     return;
 
   ParseForms(forms);
 }
 
-void AutofillManager::OnQueryFormFieldAutoFill(
+void AutofillManager::OnQueryFormFieldAutofill(
     int query_id,
     const webkit_glue::FormData& form,
     const webkit_glue::FormField& field) {
@@ -331,7 +331,7 @@ void AutofillManager::OnQueryFormFieldAutoFill(
           personal_data_->profiles(), personal_data_->credit_cards(), &host) &&
       FindCachedFormAndField(form, field, &form_structure, &autofill_field) &&
       // Don't send suggestions for forms that aren't auto-fillable.
-      form_structure->IsAutoFillable(false)) {
+      form_structure->IsAutofillable(false)) {
     AutofillFieldType type = autofill_field->type();
     bool is_filling_credit_card =
         (AutofillType(type).group() == AutofillType::CREDIT_CARD);
@@ -348,11 +348,11 @@ void AutofillManager::OnQueryFormFieldAutoFill(
     DCHECK_EQ(values.size(), unique_ids.size());
 
     if (!values.empty()) {
-      // Don't provide AutoFill suggestions when AutoFill is disabled, and don't
+      // Don't provide Autofill suggestions when Autofill is disabled, and don't
       // provide credit card suggestions for non-HTTPS pages. However, provide a
       // warning to the user in these cases.
       int warning = 0;
-      if (!form_structure->IsAutoFillable(true))
+      if (!form_structure->IsAutofillable(true))
         warning = IDS_AUTOFILL_WARNING_FORM_DISABLED;
       else if (is_filling_credit_card && !FormIsHTTPS(form_structure))
         warning = IDS_AUTOFILL_WARNING_INSECURE_CONNECTION;
@@ -365,7 +365,7 @@ void AutofillManager::OnQueryFormFieldAutoFill(
         size_t section_start, section_end;
         FindSectionBounds(*form_structure, *autofill_field,
                           is_filling_credit_card, &section_start, &section_end);
-        if (SectionIsAutoFilled(form_structure, form, section_start,
+        if (SectionIsAutofilled(form_structure, form, section_start,
                                 section_end)) {
           // If the relevant section is auto-filled and the renderer is querying
           // for suggestions, then the user is editing the value of a field.
@@ -387,7 +387,7 @@ void AutofillManager::OnQueryFormFieldAutoFill(
       query_id, field.name, field.value, values, labels, icons, unique_ids);
 }
 
-void AutofillManager::OnFillAutoFillFormData(int query_id,
+void AutofillManager::OnFillAutofillFormData(int query_id,
                                              const FormData& form,
                                              const FormField& field,
                                              int unique_id) {
@@ -448,7 +448,7 @@ void AutofillManager::OnFillAutoFillFormData(int query_id,
 
   // If the relevant section is auto-filled, we should fill |field| but not the
   // rest of the form.
-  if (SectionIsAutoFilled(form_structure, form, section_start, section_end)) {
+  if (SectionIsAutofilled(form_structure, form, section_start, section_end)) {
     for (std::vector<FormField>::iterator iter = result.fields.begin();
          iter != result.fields.end(); ++iter) {
       if ((*iter) == field) {
@@ -466,7 +466,7 @@ void AutofillManager::OnFillAutoFillFormData(int query_id,
       }
     }
 
-    host->Send(new AutoFillMsg_FormDataFilled(host->routing_id(), query_id,
+    host->Send(new AutofillMsg_FormDataFilled(host->routing_id(), query_id,
                                               result));
     return;
   }
@@ -510,24 +510,24 @@ void AutofillManager::OnFillAutoFillFormData(int query_id,
   }
   autofilled_forms_signatures_.push_front(form_structure->FormSignature());
 
-  host->Send(new AutoFillMsg_FormDataFilled(
+  host->Send(new AutofillMsg_FormDataFilled(
       host->routing_id(), query_id, result));
 }
 
-void AutofillManager::OnShowAutoFillDialog() {
+void AutofillManager::OnShowAutofillDialog() {
   Browser* browser = BrowserList::GetLastActive();
   if (browser)
-    browser->ShowOptionsTab(chrome::kAutoFillSubPage);
+    browser->ShowOptionsTab(chrome::kAutofillSubPage);
 }
 
-void AutofillManager::OnDidFillAutoFillFormData() {
+void AutofillManager::OnDidFillAutofillFormData() {
   NotificationService::current()->Notify(
       NotificationType::AUTOFILL_DID_FILL_FORM_DATA,
       Source<RenderViewHost>(tab_contents()->render_view_host()),
       NotificationService::NoDetails());
 }
 
-void AutofillManager::OnDidShowAutoFillSuggestions() {
+void AutofillManager::OnDidShowAutofillSuggestions() {
   NotificationService::current()->Notify(
       NotificationType::AUTOFILL_DID_SHOW_SUGGESTIONS,
       Source<RenderViewHost>(tab_contents()->render_view_host()),
@@ -554,19 +554,19 @@ void AutofillManager::OnHeuristicsRequestError(
     int http_error) {
 }
 
-bool AutofillManager::IsAutoFillEnabled() const {
+bool AutofillManager::IsAutofillEnabled() const {
   PrefService* prefs =
       const_cast<AutofillManager*>(this)->tab_contents()->profile()->GetPrefs();
 
-  // Migrate obsolete AutoFill pref.
+  // Migrate obsolete Autofill pref.
   if (prefs->FindPreference(prefs::kFormAutofillEnabled)) {
     bool enabled = prefs->GetBoolean(prefs::kFormAutofillEnabled);
     prefs->ClearPref(prefs::kFormAutofillEnabled);
-    prefs->SetBoolean(prefs::kAutoFillEnabled, enabled);
+    prefs->SetBoolean(prefs::kAutofillEnabled, enabled);
     return enabled;
   }
 
-  return prefs->GetBoolean(prefs::kAutoFillEnabled);
+  return prefs->GetBoolean(prefs::kAutofillEnabled);
 }
 
 void AutofillManager::DeterminePossibleFieldTypesForUpload(
@@ -605,7 +605,7 @@ void AutofillManager::ImportFormData(const FormStructure& submitted_form) {
   // it.
   if (imported_credit_card && tab_contents()) {
     imported_credit_card_.reset(imported_credit_card);
-    tab_contents()->AddInfoBar(new AutoFillCCInfoBarDelegate(tab_contents(),
+    tab_contents()->AddInfoBar(new AutofillCCInfoBarDelegate(tab_contents(),
                                                              this));
   }
 }
@@ -660,7 +660,7 @@ void AutofillManager::set_metric_logger(
 bool AutofillManager::GetHost(const std::vector<AutofillProfile*>& profiles,
                               const std::vector<CreditCard*>& credit_cards,
                               RenderViewHost** host) const {
-  if (!IsAutoFillEnabled())
+  if (!IsAutofillEnabled())
     return false;
 
   // No autofill data to return if the profiles are empty.
diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h
index 7770d8c..8d47351 100644
--- a/chrome/browser/autofill/autofill_manager.h
+++ b/chrome/browser/autofill/autofill_manager.h
@@ -17,7 +17,7 @@
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 
-class AutoFillCCInfoBarDelegate;
+class AutofillCCInfoBarDelegate;
 class AutofillProfile;
 class AutofillMetrics;
 class CreditCard;
@@ -50,7 +50,7 @@ class AutofillManager : public TabContentsObserver,
       const ViewHostMsg_FrameNavigate_Params& params);
   virtual bool OnMessageReceived(const IPC::Message& message);
 
-  // Called by the AutoFillCCInfoBarDelegate when the user interacts with the
+  // Called by the AutofillCCInfoBarDelegate when the user interacts with the
   // infobar.
   virtual void OnInfoBarClosed(bool should_save);
 
@@ -62,8 +62,8 @@ class AutofillManager : public TabContentsObserver,
       AutofillDownloadManager::AutofillRequestType request_type,
       int http_error);
 
-  // Returns the value of the AutoFillEnabled pref.
-  virtual bool IsAutoFillEnabled() const;
+  // Returns the value of the AutofillEnabled pref.
+  virtual bool IsAutofillEnabled() const;
 
   // Imports the form data, submitted by the user, into |personal_data_|.
   void ImportFormData(const FormStructure& submitted_form);
@@ -103,16 +103,16 @@ class AutofillManager : public TabContentsObserver,
  private:
   void OnFormSubmitted(const webkit_glue::FormData& form);
   void OnFormsSeen(const std::vector<webkit_glue::FormData>& forms);
-  void OnQueryFormFieldAutoFill(int query_id,
+  void OnQueryFormFieldAutofill(int query_id,
                                 const webkit_glue::FormData& form,
                                 const webkit_glue::FormField& field);
-  void OnFillAutoFillFormData(int query_id,
+  void OnFillAutofillFormData(int query_id,
                               const webkit_glue::FormData& form,
                               const webkit_glue::FormField& field,
                               int unique_id);
-  void OnShowAutoFillDialog();
-  void OnDidFillAutoFillFormData();
-  void OnDidShowAutoFillSuggestions();
+  void OnShowAutofillDialog();
+  void OnDidFillAutofillFormData();
+  void OnDidShowAutofillSuggestions();
 
   // Fills |host| with the RenderViewHost for this tab.
   // Returns false if Autofill is disabled or if the host is unavailable.
@@ -208,7 +208,7 @@ class AutofillManager : public TabContentsObserver,
 
   // The InfoBar that asks for permission to store credit card information.
   // Deletes itself when closed.
-  AutoFillCCInfoBarDelegate* cc_infobar_;
+  AutofillCCInfoBarDelegate* cc_infobar_;
 
   // The imported credit card that should be saved if the user accepts the
   // infobar.
@@ -230,7 +230,7 @@ class AutofillManager : public TabContentsObserver,
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, FillAddressAndCreditCardForm);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, FillFormWithMultipleSections);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, FillFormWithMultipleEmails);
-  FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, FillAutoFilledForm);
+  FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, FillAutofilledForm);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, FillPhoneNumber);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, FormChangesRemoveField);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, FormChangesAddField);
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index 6efe22d..6a7a67b 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -48,7 +48,7 @@ typedef Tuple5<int,
                std::vector<string16>,
                std::vector<string16>,
                std::vector<string16>,
-               std::vector<int> > AutoFillParam;
+               std::vector<int> > AutofillParam;
 
 class TestPersonalDataManager : public PersonalDataManager {
  public:
@@ -410,7 +410,7 @@ class TestAutofillManager : public AutofillManager {
     test_personal_data_ = personal_manager;
   }
 
-  virtual bool IsAutoFillEnabled() const { return autofill_enabled_; }
+  virtual bool IsAutofillEnabled() const { return autofill_enabled_; }
 
   void set_autofill_enabled(bool autofill_enabled) {
     autofill_enabled_ = autofill_enabled;
@@ -473,15 +473,15 @@ class AutofillManagerTest : public RenderViewHostTestHarness {
 
   Profile* profile() { return contents()->profile(); }
 
-  void GetAutoFillSuggestions(int query_id,
+  void GetAutofillSuggestions(int query_id,
                               const webkit_glue::FormData& form,
                               const webkit_glue::FormField& field) {
-    autofill_manager_->OnQueryFormFieldAutoFill(query_id, form, field);
+    autofill_manager_->OnQueryFormFieldAutofill(query_id, form, field);
   }
 
-  void GetAutoFillSuggestions(const webkit_glue::FormData& form,
+  void GetAutofillSuggestions(const webkit_glue::FormData& form,
                               const webkit_glue::FormField& field) {
-    GetAutoFillSuggestions(kDefaultPageID, form, field);
+    GetAutofillSuggestions(kDefaultPageID, form, field);
   }
 
   void AutocompleteSuggestionsReturned(const std::vector<string16>& result) {
@@ -497,26 +497,26 @@ class AutofillManagerTest : public RenderViewHostTestHarness {
     autofill_manager_->OnFormSubmitted(form);
   }
 
-  void FillAutoFillFormData(int query_id,
+  void FillAutofillFormData(int query_id,
                             const webkit_glue::FormData& form,
                             const webkit_glue::FormField& field,
                             int unique_id) {
-    autofill_manager_->OnFillAutoFillFormData(query_id, form, field, unique_id);
+    autofill_manager_->OnFillAutofillFormData(query_id, form, field, unique_id);
   }
 
-  bool GetAutoFillSuggestionsMessage(int* page_id,
+  bool GetAutofillSuggestionsMessage(int* page_id,
                                      std::vector<string16>* values,
                                      std::vector<string16>* labels,
                                      std::vector<string16>* icons,
                                      std::vector<int>* unique_ids) {
-    const uint32 kMsgID = AutoFillMsg_SuggestionsReturned::ID;
+    const uint32 kMsgID = AutofillMsg_SuggestionsReturned::ID;
     const IPC::Message* message =
         process()->sink().GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
 
-    AutoFillParam autofill_param;
-    AutoFillMsg_SuggestionsReturned::Read(message, &autofill_param);
+    AutofillParam autofill_param;
+    AutofillMsg_SuggestionsReturned::Read(message, &autofill_param);
     if (page_id)
       *page_id = autofill_param.a;
     if (values)
@@ -534,14 +534,14 @@ class AutofillManagerTest : public RenderViewHostTestHarness {
     return true;
   }
 
-  bool GetAutoFillFormDataFilledMessage(int *page_id, FormData* results) {
-    const uint32 kMsgID = AutoFillMsg_FormDataFilled::ID;
+  bool GetAutofillFormDataFilledMessage(int *page_id, FormData* results) {
+    const uint32 kMsgID = AutofillMsg_FormDataFilled::ID;
     const IPC::Message* message =
         process()->sink().GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
     Tuple2<int, FormData> autofill_param;
-    AutoFillMsg_FormDataFilled::Read(message, &autofill_param);
+    AutofillMsg_FormDataFilled::Read(message, &autofill_param);
     if (page_id)
       *page_id = autofill_param.a;
     if (results)
@@ -569,7 +569,7 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsEmptyValue) {
   FormsSeen(forms);
 
   const FormField& field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -581,7 +581,7 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsEmptyValue) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  GetAutoFillSuggestionsMessage(
+  GetAutofillSuggestionsMessage(
       &page_id, &values, &labels, &icons, &unique_ids);
 
   string16 expected_values[] = {
@@ -613,7 +613,7 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsMatchCharacter) {
   FormField field;
   autofill_test::CreateTestFormField("First Name", "firstname", "E", "text",
                                      &field);
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -625,7 +625,7 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsMatchCharacter) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {ASCIIToUTF16("Elvis")};
@@ -662,8 +662,8 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsUnknownFields) {
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
-  GetAutoFillSuggestions(form, field);
-  EXPECT_FALSE(GetAutoFillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
+  GetAutofillSuggestions(form, field);
+  EXPECT_FALSE(GetAutofillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
 }
 
 // Test that we cull duplicate profile suggestions.
@@ -682,7 +682,7 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsWithDuplicates) {
   autofill_manager_->AddProfile(duplicate_profile);
 
   const FormField& field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -694,7 +694,7 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsWithDuplicates) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -720,12 +720,12 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsAutofillDisabledByUser) {
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
-  // Disable AutoFill.
+  // Disable Autofill.
   autofill_manager_->set_autofill_enabled(false);
 
   const FormField& field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
-  EXPECT_FALSE(GetAutoFillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
+  GetAutofillSuggestions(form, field);
+  EXPECT_FALSE(GetAutofillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
 }
 
 // Test that we return a warning explaining that autofill suggestions are
@@ -739,7 +739,7 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsMethodGet) {
   FormsSeen(forms);
 
   const FormField& field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -751,7 +751,7 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsMethodGet) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -767,14 +767,14 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsMethodGet) {
   // Now add some Autocomplete suggestions. We should return the autocomplete
   // suggestions and the warning; these will be culled by the renderer.
   const int kPageID2 = 2;
-  GetAutoFillSuggestions(kPageID2, form, field);
+  GetAutofillSuggestions(kPageID2, form, field);
 
   std::vector<string16> suggestions;
   suggestions.push_back(ASCIIToUTF16("Jay"));
   suggestions.push_back(ASCIIToUTF16("Jason"));
   AutocompleteSuggestionsReturned(suggestions);
 
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values2[] = {
@@ -791,8 +791,8 @@ TEST_F(AutofillManagerTest, GetProfileSuggestionsMethodGet) {
 
   // Now clear the test profiles and try again -- we shouldn't return a warning.
   test_personal_data_->ClearAutofillProfiles();
-  GetAutoFillSuggestions(form, field);
-  EXPECT_FALSE(GetAutoFillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
+  GetAutofillSuggestions(form, field);
+  EXPECT_FALSE(GetAutofillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
 }
 
 // Test that we return all credit card profile suggestions when all form fields
@@ -805,7 +805,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsEmptyValue) {
   FormsSeen(forms);
 
   FormField field = form.fields[1];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -817,7 +817,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsEmptyValue) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -850,7 +850,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsMatchCharacter) {
   FormField field;
   autofill_test::CreateTestFormField(
       "Card Number", "cardnumber", "4", "text", &field);
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -862,7 +862,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsMatchCharacter) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {ASCIIToUTF16("************3456")};
@@ -884,7 +884,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsNonCCNumber) {
   FormsSeen(forms);
 
   const FormField& field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -896,7 +896,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsNonCCNumber) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -927,7 +927,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsNonHTTPS) {
   FormsSeen(forms);
 
   const FormField& field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -939,7 +939,7 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsNonHTTPS) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -955,14 +955,14 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsNonHTTPS) {
   // Now add some Autocomplete suggestions. We should show the autocomplete
   // suggestions and the warning.
   const int kPageID2 = 2;
-  GetAutoFillSuggestions(kPageID2, form, field);
+  GetAutofillSuggestions(kPageID2, form, field);
 
   std::vector<string16> suggestions;
   suggestions.push_back(ASCIIToUTF16("Jay"));
   suggestions.push_back(ASCIIToUTF16("Jason"));
   AutocompleteSuggestionsReturned(suggestions);
 
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
   string16 expected_values2[] = {
     l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_INSECURE_CONNECTION),
@@ -978,8 +978,8 @@ TEST_F(AutofillManagerTest, GetCreditCardSuggestionsNonHTTPS) {
 
   // Clear the test credit cards and try again -- we shouldn't return a warning.
   test_personal_data_->ClearCreditCards();
-  GetAutoFillSuggestions(form, field);
-  EXPECT_FALSE(GetAutoFillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
+  GetAutofillSuggestions(form, field);
+  EXPECT_FALSE(GetAutofillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
 }
 
 // Test that we return profile and credit card suggestions for combined forms.
@@ -992,7 +992,7 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestions) {
   FormsSeen(forms);
 
   FormField field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -1004,7 +1004,7 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestions) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -1024,7 +1024,7 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestions) {
   const int kPageID2 = 2;
   autofill_test::CreateTestFormField(
       "Card Number", "cardnumber", "", "text", &field);
-  GetAutoFillSuggestions(kPageID2, form, field);
+  GetAutofillSuggestions(kPageID2, form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -1032,7 +1032,7 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestions) {
 
   // Test that we sent the credit card suggestions to the renderer.
   page_id = 0;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values2[] = {
@@ -1066,7 +1066,7 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestionsNonHttps) {
   FormsSeen(forms);
 
   FormField field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -1078,7 +1078,7 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestionsNonHttps) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -1098,14 +1098,14 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestionsNonHttps) {
   autofill_test::CreateTestFormField(
       "Card Number", "cardnumber", "", "text", &field);
   const int kPageID2 = 2;
-  GetAutoFillSuggestions(kPageID2, form, field);
+  GetAutofillSuggestions(kPageID2, form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
   AutocompleteSuggestionsReturned(std::vector<string16>());
 
   // Test that we sent the right message to the renderer.
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values2[] = {
@@ -1120,12 +1120,12 @@ TEST_F(AutofillManagerTest, GetAddressAndCreditCardSuggestionsNonHttps) {
 
   // Clear the test credit cards and try again -- we shouldn't return a warning.
   test_personal_data_->ClearCreditCards();
-  GetAutoFillSuggestions(form, field);
-  EXPECT_FALSE(GetAutoFillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
+  GetAutofillSuggestions(form, field);
+  EXPECT_FALSE(GetAutofillSuggestionsMessage(NULL, NULL, NULL, NULL, NULL));
 }
 
 // Test that we correctly combine autofill and autocomplete suggestions.
-TEST_F(AutofillManagerTest, GetCombinedAutoFillAndAutocompleteSuggestions) {
+TEST_F(AutofillManagerTest, GetCombinedAutofillAndAutocompleteSuggestions) {
   // Set up our form data.
   FormData form;
   CreateTestAddressFormData(&form);
@@ -1133,7 +1133,7 @@ TEST_F(AutofillManagerTest, GetCombinedAutoFillAndAutocompleteSuggestions) {
   FormsSeen(forms);
 
   const FormField& field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // Add some Autocomplete suggestions.
   // This triggers the combined message send.
@@ -1150,7 +1150,7 @@ TEST_F(AutofillManagerTest, GetCombinedAutoFillAndAutocompleteSuggestions) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -1174,7 +1174,7 @@ TEST_F(AutofillManagerTest, GetCombinedAutoFillAndAutocompleteSuggestions) {
 
 // Test that we return autocomplete-like suggestions when trying to autofill
 // already filled forms.
-TEST_F(AutofillManagerTest, GetFieldSuggestionsWhenFormIsAutoFilled) {
+TEST_F(AutofillManagerTest, GetFieldSuggestionsWhenFormIsAutofilled) {
   // Set up our form data.
   FormData form;
   CreateTestAddressFormData(&form);
@@ -1184,7 +1184,7 @@ TEST_F(AutofillManagerTest, GetFieldSuggestionsWhenFormIsAutoFilled) {
   // Mark one of the fields as filled.
   form.fields[2].is_autofilled = true;
   const FormField& field = form.fields[0];
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -1196,7 +1196,7 @@ TEST_F(AutofillManagerTest, GetFieldSuggestionsWhenFormIsAutoFilled) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
   string16 expected_values[] = {
     ASCIIToUTF16("Elvis"),
@@ -1223,7 +1223,7 @@ TEST_F(AutofillManagerTest, GetFieldSuggestionsForAutocompleteOnly) {
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // Add some Autocomplete suggestions.
   // This triggers the combined message send.
@@ -1238,7 +1238,7 @@ TEST_F(AutofillManagerTest, GetFieldSuggestionsForAutocompleteOnly) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -1271,7 +1271,7 @@ TEST_F(AutofillManagerTest, GetFieldSuggestionsWithDuplicateValues) {
 
   FormField& field = form.fields[0];
   field.is_autofilled = true;
-  GetAutoFillSuggestions(form, field);
+  GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ -1283,7 +1283,7 @@ TEST_F(AutofillManagerTest, GetFieldSuggestionsWithDuplicateValues) {
   std::vector<string16> labels;
   std::vector<string16> icons;
   std::vector<int> unique_ids;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels, &icons,
+  EXPECT_TRUE(GetAutofillSuggestionsMessage(&page_id, &values, &labels, &icons,
                                             &unique_ids));
 
   string16 expected_values[] = {
@@ -1307,13 +1307,13 @@ TEST_F(AutofillManagerTest, FillAddressForm) {
   FormsSeen(forms);
 
   std::string guid = "00000000-0000-0000-0000-000000000001";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kDefaultPageID, form, form.fields[0],
       autofill_manager_->PackGUIDs(std::string(), guid));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledAddressFormElvis(page_id, results, kDefaultPageID, false);
 }
 
@@ -1326,13 +1326,13 @@ TEST_F(AutofillManagerTest, FillCreditCardForm) {
   FormsSeen(forms);
 
   std::string guid = "00000000-0000-0000-0000-000000000004";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kDefaultPageID, form, *form.fields.begin(),
       autofill_manager_->PackGUIDs(guid, std::string()));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledCreditCardFormElvis(page_id, results, kDefaultPageID, false);
 }
 
@@ -1349,13 +1349,13 @@ TEST_F(AutofillManagerTest, FillCreditCardFormNoYearNoMonth) {
   FormsSeen(forms);
 
   std::string guid = "00000000-0000-0000-0000-000000000007";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kDefaultPageID, form, *form.fields.begin(),
       autofill_manager_->PackGUIDs(guid, std::string()));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledCreditCardYearMonthWithYearMonth(page_id, results,
       kDefaultPageID, false, "", "");
 }
@@ -1374,13 +1374,13 @@ TEST_F(AutofillManagerTest, FillCreditCardFormNoYearMonth) {
   FormsSeen(forms);
 
   std::string guid = "00000000-0000-0000-0000-000000000007";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kDefaultPageID, form, *form.fields.begin(),
       autofill_manager_->PackGUIDs(guid, std::string()));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledCreditCardYearMonthWithYearMonth(page_id, results,
       kDefaultPageID, false, "", "04");
 }
@@ -1398,13 +1398,13 @@ TEST_F(AutofillManagerTest, FillCreditCardFormYearNoMonth) {
   FormsSeen(forms);
 
   std::string guid = "00000000-0000-0000-0000-000000000007";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kDefaultPageID, form, *form.fields.begin(),
       autofill_manager_->PackGUIDs(guid, std::string()));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledCreditCardYearMonthWithYearMonth(page_id, results,
       kDefaultPageID, false, "2012", "");
 }
@@ -1423,13 +1423,13 @@ TEST_F(AutofillManagerTest, FillCreditCardFormYearMonth) {
   FormsSeen(forms);
 
   std::string guid = "00000000-0000-0000-0000-000000000007";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kDefaultPageID, form, *form.fields.begin(),
       autofill_manager_->PackGUIDs(guid, std::string()));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledCreditCardYearMonthWithYearMonth(page_id, results,
       kDefaultPageID, false, "2012", "04");
 }
@@ -1445,12 +1445,12 @@ TEST_F(AutofillManagerTest, FillAddressAndCreditCardForm) {
 
   // First fill the address data.
   std::string guid = "00000000-0000-0000-0000-000000000001";
-  FillAutoFillFormData(kDefaultPageID, form, form.fields[0],
+  FillAutofillFormData(kDefaultPageID, form, form.fields[0],
                        autofill_manager_->PackGUIDs(std::string(), guid));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   {
     SCOPED_TRACE("Address");
     ExpectFilledAddressFormElvis(page_id, results, kDefaultPageID, true);
@@ -1459,12 +1459,12 @@ TEST_F(AutofillManagerTest, FillAddressAndCreditCardForm) {
   // Now fill the credit card data.
   const int kPageID2 = 2;
   guid = "00000000-0000-0000-0000-000000000004";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kPageID2, form, form.fields.back(),
       autofill_manager_->PackGUIDs(guid, std::string()));
 
   page_id = 0;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   {
     SCOPED_TRACE("Credit card");
     ExpectFilledCreditCardFormElvis(page_id, results, kPageID2, true);
@@ -1488,12 +1488,12 @@ TEST_F(AutofillManagerTest, FillFormWithMultipleSections) {
 
   // Fill the first section.
   std::string guid = "00000000-0000-0000-0000-000000000001";
-  FillAutoFillFormData(kDefaultPageID, form, form.fields[0],
+  FillAutofillFormData(kDefaultPageID, form, form.fields[0],
                        autofill_manager_->PackGUIDs(std::string(), guid));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   {
     SCOPED_TRACE("Address 1");
 
@@ -1513,11 +1513,11 @@ TEST_F(AutofillManagerTest, FillFormWithMultipleSections) {
   const int kPageID2 = 2;
   guid = "00000000-0000-0000-0000-000000000001";
   ASSERT_LT(9U, kAddressFormSize);
-  FillAutoFillFormData(kPageID2, form, form.fields[kAddressFormSize + 9],
+  FillAutofillFormData(kPageID2, form, form.fields[kAddressFormSize + 9],
                        autofill_manager_->PackGUIDs(std::string(), guid));
 
   page_id = 0;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   {
     SCOPED_TRACE("Address 2");
     ASSERT_EQ(results.fields.size(), form.fields.size());
@@ -1558,12 +1558,12 @@ TEST_F(AutofillManagerTest, FillFormWithMultipleEmails) {
 
   // Fill the form.
   std::string guid = "00000000-0000-0000-0000-000000000001";
-  FillAutoFillFormData(kDefaultPageID, form, form.fields[0],
+  FillAutofillFormData(kDefaultPageID, form, form.fields[0],
                        autofill_manager_->PackGUIDs(std::string(), guid));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
 
   // The second email address should be filled.
   EXPECT_EQ(ASCIIToUTF16("theking@gmail.com"), results.fields.back().value);
@@ -1574,7 +1574,7 @@ TEST_F(AutofillManagerTest, FillFormWithMultipleEmails) {
 }
 
 // Test that we correctly fill a previously auto-filled form.
-TEST_F(AutofillManagerTest, FillAutoFilledForm) {
+TEST_F(AutofillManagerTest, FillAutofilledForm) {
   // Set up our form data.
   FormData form;
   CreateTestAddressFormData(&form);
@@ -1586,13 +1586,13 @@ TEST_F(AutofillManagerTest, FillAutoFilledForm) {
 
   // First fill the address data.
   std::string guid = "00000000-0000-0000-0000-000000000001";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kDefaultPageID, form, *form.fields.begin(),
       autofill_manager_->PackGUIDs(std::string(), guid));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   {
     SCOPED_TRACE("Address");
     ExpectFilledForm(page_id, results, kDefaultPageID,
@@ -1603,12 +1603,12 @@ TEST_F(AutofillManagerTest, FillAutoFilledForm) {
   // Now fill the credit card data.
   const int kPageID2 = 2;
   guid = "00000000-0000-0000-0000-000000000004";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kPageID2, form, form.fields.back(),
       autofill_manager_->PackGUIDs(guid, std::string()));
 
   page_id = 0;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   {
     SCOPED_TRACE("Credit card 1");
     ExpectFilledCreditCardFormElvis(page_id, results, kPageID2, true);
@@ -1623,12 +1623,12 @@ TEST_F(AutofillManagerTest, FillAutoFilledForm) {
   }
 
   const int kPageID3 = 3;
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kPageID3, form, *form.fields.rbegin(),
       autofill_manager_->PackGUIDs(guid, std::string()));
 
   page_id = 0;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   {
     SCOPED_TRACE("Credit card 2");
     ExpectFilledForm(page_id, results, kPageID3,
@@ -1685,12 +1685,12 @@ TEST_F(AutofillManagerTest, FillPhoneNumber) {
     // The page ID sent to the AutofillManager from the RenderView, used to send
     // an IPC message back to the renderer.
     int page_id = 100 - i;
-    FillAutoFillFormData(
+    FillAutofillFormData(
         page_id, form, *form.fields.begin(),
         autofill_manager_->PackGUIDs(std::string(), work_profile->guid()));
     page_id = 0;
     FormData results;
-    EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+    EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
 
     if (i != 7) {
       EXPECT_EQ(ASCIIToUTF16(test_data), results.fields[2].value);
@@ -1723,13 +1723,13 @@ TEST_F(AutofillManagerTest, FormChangesRemoveField) {
   form.fields.erase(form.fields.begin() + 3);
 
   std::string guid = "00000000-0000-0000-0000-000000000001";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kDefaultPageID, form, form.fields[0],
       autofill_manager_->PackGUIDs(std::string(), guid));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledAddressFormElvis(page_id, results, kDefaultPageID, false);
 }
 
@@ -1754,13 +1754,13 @@ TEST_F(AutofillManagerTest, FormChangesAddField) {
   form.fields.insert(pos, field);
 
   std::string guid = "00000000-0000-0000-0000-000000000001";
-  FillAutoFillFormData(
+  FillAutofillFormData(
       kDefaultPageID, form, form.fields[0],
       autofill_manager_->PackGUIDs(std::string(), guid));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledAddressFormElvis(page_id, results, kDefaultPageID, false);
 }
 
@@ -1774,12 +1774,12 @@ TEST_F(AutofillManagerTest, FormSubmitted) {
 
   // Fill the form.
   std::string guid = "00000000-0000-0000-0000-000000000001";
-  FillAutoFillFormData(kDefaultPageID, form, form.fields[0],
+  FillAutofillFormData(kDefaultPageID, form, form.fields[0],
                        autofill_manager_->PackGUIDs(std::string(), guid));
 
   int page_id = 0;
   FormData results;
-  EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+  EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledAddressFormElvis(page_id, results, kDefaultPageID, false);
 
   // Simulate form submission. We should call into the PDM to try to save the
@@ -1795,19 +1795,19 @@ TEST_F(AutofillManagerTest, AuxiliaryProfilesReset) {
   // Auxiliary profiles is implemented on Mac only.  It enables Mac Address
   // Book integration.
   ASSERT_TRUE(profile()->GetPrefs()->GetBoolean(
-      prefs::kAutoFillAuxiliaryProfilesEnabled));
+      prefs::kAutofillAuxiliaryProfilesEnabled));
   profile()->GetPrefs()->SetBoolean(
-      prefs::kAutoFillAuxiliaryProfilesEnabled, false);
-  profile()->GetPrefs()->ClearPref(prefs::kAutoFillAuxiliaryProfilesEnabled);
+      prefs::kAutofillAuxiliaryProfilesEnabled, false);
+  profile()->GetPrefs()->ClearPref(prefs::kAutofillAuxiliaryProfilesEnabled);
   ASSERT_TRUE(profile()->GetPrefs()->GetBoolean(
-      prefs::kAutoFillAuxiliaryProfilesEnabled));
+      prefs::kAutofillAuxiliaryProfilesEnabled));
 #else
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
-      prefs::kAutoFillAuxiliaryProfilesEnabled));
+      prefs::kAutofillAuxiliaryProfilesEnabled));
   profile()->GetPrefs()->SetBoolean(
-      prefs::kAutoFillAuxiliaryProfilesEnabled, true);
-  profile()->GetPrefs()->ClearPref(prefs::kAutoFillAuxiliaryProfilesEnabled);
+      prefs::kAutofillAuxiliaryProfilesEnabled, true);
+  profile()->GetPrefs()->ClearPref(prefs::kAutofillAuxiliaryProfilesEnabled);
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
-      prefs::kAutoFillAuxiliaryProfilesEnabled));
+      prefs::kAutofillAuxiliaryProfilesEnabled));
 #endif
 }
diff --git a/chrome/browser/autofill/autofill_merge_unittest.cc b/chrome/browser/autofill/autofill_merge_unittest.cc
index 38cb6d8..cbd83d3 100644
--- a/chrome/browser/autofill/autofill_merge_unittest.cc
+++ b/chrome/browser/autofill/autofill_merge_unittest.cc
@@ -102,15 +102,15 @@ const std::vector<AutofillProfile*>& PersonalDataManagerMock::web_profiles() {
 
 }  // namespace
 
-// A data-driven test for verifying merging of AutoFill profiles. Each input is
+// A data-driven test for verifying merging of Autofill profiles. Each input is
 // a structured dump of a set of implicitly detected autofill profiles. The
 // corresponding output file is a dump of the saved profiles that result from
 // importing the input profiles. The output file format is identical to the
 // input format.
-class AutoFillMergeTest : public testing::Test, public DataDrivenTest {
+class AutofillMergeTest : public testing::Test, public DataDrivenTest {
  protected:
-  AutoFillMergeTest();
-  virtual ~AutoFillMergeTest();
+  AutofillMergeTest();
+  virtual ~AutofillMergeTest();
 
   // testing::Test:
   virtual void SetUp();
@@ -119,29 +119,29 @@ class AutoFillMergeTest : public testing::Test, public DataDrivenTest {
   virtual void GenerateResults(const std::string& input,
                                std::string* output) OVERRIDE;
 
-  // Deserializes a set of AutoFill profiles from |profiles|, imports each
+  // Deserializes a set of Autofill profiles from |profiles|, imports each
   // sequentially, and fills |merged_profiles| with the serialized result.
   void MergeProfiles(const std::string& profiles, std::string* merged_profiles);
 
   scoped_refptr<PersonalDataManagerMock> personal_data_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(AutoFillMergeTest);
+  DISALLOW_COPY_AND_ASSIGN(AutofillMergeTest);
 };
 
-AutoFillMergeTest::AutoFillMergeTest() : DataDrivenTest() {
+AutofillMergeTest::AutofillMergeTest() : DataDrivenTest() {
 }
 
-AutoFillMergeTest::~AutoFillMergeTest() {
+AutofillMergeTest::~AutofillMergeTest() {
 }
 
-void AutoFillMergeTest::SetUp() {
+void AutofillMergeTest::SetUp() {
   autofill_test::DisableSystemServices(NULL);
 
   personal_data_ = new PersonalDataManagerMock();
 }
 
-void AutoFillMergeTest::GenerateResults(const std::string& input,
+void AutofillMergeTest::GenerateResults(const std::string& input,
                                         std::string* output) {
   MergeProfiles(input, output);
 
@@ -151,7 +151,7 @@ void AutoFillMergeTest::GenerateResults(const std::string& input,
   EXPECT_EQ(*output, merged_output);
 }
 
-void AutoFillMergeTest::MergeProfiles(const std::string& profiles,
+void AutofillMergeTest::MergeProfiles(const std::string& profiles,
                                       std::string* merged_profiles) {
   // Start with no saved profiles.
   personal_data_->Reset();
@@ -216,7 +216,7 @@ void AutoFillMergeTest::MergeProfiles(const std::string& profiles,
   *merged_profiles = SerializeProfiles(personal_data_->web_profiles());
 }
 
-TEST_F(AutoFillMergeTest, DataDrivenMergeProfiles) {
+TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) {
   RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }
diff --git a/chrome/browser/autofill/autofill_metrics_unittest.cc b/chrome/browser/autofill/autofill_metrics_unittest.cc
index 0619e59..5f1aa9b 100644
--- a/chrome/browser/autofill/autofill_metrics_unittest.cc
+++ b/chrome/browser/autofill/autofill_metrics_unittest.cc
@@ -128,7 +128,7 @@ class TestAutofillManager : public AutofillManager {
   }
   virtual ~TestAutofillManager() {}
 
-  virtual bool IsAutoFillEnabled() const { return autofill_enabled_; }
+  virtual bool IsAutofillEnabled() const { return autofill_enabled_; }
 
   void set_autofill_enabled(bool autofill_enabled) {
     autofill_enabled_ = autofill_enabled;
@@ -166,7 +166,7 @@ class TestFormStructure : public FormStructure {
       field->set_server_type(server_types[i]);
     }
 
-    UpdateAutoFillCount();
+    UpdateAutofillCount();
   }
 
   virtual std::string server_experiment_id() const OVERRIDE {
@@ -265,7 +265,7 @@ TEST_F(AutofillMetricsTest, QualityMetrics) {
   EXPECT_NO_FATAL_FAILURE(autofill_manager_->OnFormSubmitted(form));
 }
 
-// Test that we log the appropriate additional metrics when AutoFill failed.
+// Test that we log the appropriate additional metrics when Autofill failed.
 TEST_F(AutofillMetricsTest, QualityMetricsForFailure) {
   // Set up our form data.
   FormData form;
diff --git a/chrome/browser/autofill/autofill_profile.cc b/chrome/browser/autofill/autofill_profile.cc
index 01b7886..b8f29a1 100644
--- a/chrome/browser/autofill/autofill_profile.cc
+++ b/chrome/browser/autofill/autofill_profile.cc
@@ -274,7 +274,7 @@ bool AutofillProfile::IsEmpty() const {
 }
 
 int AutofillProfile::Compare(const AutofillProfile& profile) const {
-  // The following AutoFill field types are the only types we store in the WebDB
+  // The following Autofill field types are the only types we store in the WebDB
   // so far, so we're only concerned with matching these types in the profile.
   const AutofillFieldType types[] = { NAME_FIRST,
                                       NAME_MIDDLE,
diff --git a/chrome/browser/autofill/autofill_type.h b/chrome/browser/autofill/autofill_type.h
index 25b33e5..da6c0b1 100644
--- a/chrome/browser/autofill/autofill_type.h
+++ b/chrome/browser/autofill/autofill_type.h
@@ -13,7 +13,7 @@
 #include "base/string16.h"
 #include "chrome/browser/autofill/field_types.h"
 
-// The high-level description of AutoFill types, used to categorize form fields
+// The high-level description of Autofill types, used to categorize form fields
 // and for associating form fields with form values in the Web Database.
 class AutofillType {
  public:
diff --git a/chrome/browser/autofill/autofill_xml_parser.cc b/chrome/browser/autofill/autofill_xml_parser.cc
index 86520e9..4dd2f1c 100644
--- a/chrome/browser/autofill/autofill_xml_parser.cc
+++ b/chrome/browser/autofill/autofill_xml_parser.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -7,24 +7,24 @@
 #include "chrome/browser/autofill/autofill_type.h"
 #include "third_party/libjingle/overrides/talk/xmllite/qname.h"
 
-AutoFillXmlParser::AutoFillXmlParser()
+AutofillXmlParser::AutofillXmlParser()
     : succeeded_(true) {
 }
 
-void AutoFillXmlParser::CharacterData(
+void AutofillXmlParser::CharacterData(
     buzz::XmlParseContext* context, const char* text, int len) {
 }
 
-void AutoFillXmlParser::EndElement(buzz::XmlParseContext* context,
+void AutofillXmlParser::EndElement(buzz::XmlParseContext* context,
                                    const char* name) {
 }
 
-void AutoFillXmlParser::Error(buzz::XmlParseContext* context,
+void AutofillXmlParser::Error(buzz::XmlParseContext* context,
                               XML_Error error_code) {
   succeeded_ = false;
 }
 
-AutoFillQueryXmlParser::AutoFillQueryXmlParser(
+AutofillQueryXmlParser::AutofillQueryXmlParser(
     std::vector<AutofillFieldType>* field_types,
     UploadRequired* upload_required,
     std::string* experiment_id)
@@ -35,7 +35,7 @@ AutoFillQueryXmlParser::AutoFillQueryXmlParser(
   DCHECK(experiment_id_);
 }
 
-void AutoFillQueryXmlParser::StartElement(buzz::XmlParseContext* context,
+void AutofillQueryXmlParser::StartElement(buzz::XmlParseContext* context,
                                           const char* name,
                                           const char** attrs) {
   buzz::QName qname = context->ResolveQName(name, false);
@@ -89,7 +89,7 @@ void AutoFillQueryXmlParser::StartElement(buzz::XmlParseContext* context,
   }
 }
 
-int AutoFillQueryXmlParser::GetIntValue(buzz::XmlParseContext* context,
+int AutofillQueryXmlParser::GetIntValue(buzz::XmlParseContext* context,
                                         const char* attribute) {
   char* attr_end = NULL;
   int value = strtol(attribute, &attr_end, 10);
@@ -100,7 +100,7 @@ int AutoFillQueryXmlParser::GetIntValue(buzz::XmlParseContext* context,
   return value;
 }
 
-AutoFillUploadXmlParser::AutoFillUploadXmlParser(double* positive_upload_rate,
+AutofillUploadXmlParser::AutofillUploadXmlParser(double* positive_upload_rate,
                                                  double* negative_upload_rate)
     : succeeded_(false),
       positive_upload_rate_(positive_upload_rate),
@@ -109,7 +109,7 @@ AutoFillUploadXmlParser::AutoFillUploadXmlParser(double* positive_upload_rate,
   DCHECK(negative_upload_rate_);
 }
 
-void AutoFillUploadXmlParser::StartElement(buzz::XmlParseContext* context,
+void AutofillUploadXmlParser::StartElement(buzz::XmlParseContext* context,
                                            const char* name,
                                            const char** attrs) {
   buzz::QName qname = context->ResolveQName(name, false);
@@ -129,7 +129,7 @@ void AutoFillUploadXmlParser::StartElement(buzz::XmlParseContext* context,
   }
 }
 
-double AutoFillUploadXmlParser::GetDoubleValue(buzz::XmlParseContext* context,
+double AutofillUploadXmlParser::GetDoubleValue(buzz::XmlParseContext* context,
                                                const char* attribute) {
   char* attr_end = NULL;
   double value = strtod(attribute, &attr_end);
diff --git a/chrome/browser/autofill/autofill_xml_parser.h b/chrome/browser/autofill/autofill_xml_parser.h
index 05d5554..f25e31a 100644
--- a/chrome/browser/autofill/autofill_xml_parser.h
+++ b/chrome/browser/autofill/autofill_xml_parser.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -16,10 +16,10 @@
 #include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
 
 // The base class that contains common functionality between
-// AutoFillQueryXmlParser and AutoFillUploadXmlParser.
-class AutoFillXmlParser : public buzz::XmlParseHandler {
+// AutofillQueryXmlParser and AutofillUploadXmlParser.
+class AutofillXmlParser : public buzz::XmlParseHandler {
  public:
-  AutoFillXmlParser();
+  AutofillXmlParser();
 
   // Returns true if no parsing errors were encountered.
   bool succeeded() const { return succeeded_; }
@@ -46,10 +46,10 @@ class AutoFillXmlParser : public buzz::XmlParseHandler {
   // True if parsing succeeded.
   bool succeeded_;
 
-  DISALLOW_COPY_AND_ASSIGN(AutoFillXmlParser);
+  DISALLOW_COPY_AND_ASSIGN(AutofillXmlParser);
 };
 
-// The XML parse handler for parsing AutoFill query responses.  A typical
+// The XML parse handler for parsing Autofill query responses.  A typical
 // response looks like:
 //
 // <autofillqueryresponse experimentid="1">
@@ -62,9 +62,9 @@ class AutoFillXmlParser : public buzz::XmlParseHandler {
 // Fields are returned in the same order they were sent to the server.
 // autofilltype: The server's guess at what type of field this is.  0 is
 // unknown, other types are documented in chrome/browser/autofill/field_types.h.
-class AutoFillQueryXmlParser : public AutoFillXmlParser {
+class AutofillQueryXmlParser : public AutofillXmlParser {
  public:
-  AutoFillQueryXmlParser(std::vector<AutofillFieldType>* field_types,
+  AutofillQueryXmlParser(std::vector<AutofillFieldType>* field_types,
                          UploadRequired* upload_required,
                          std::string* experiment_id);
 
@@ -85,7 +85,7 @@ class AutoFillQueryXmlParser : public AutoFillXmlParser {
   // The parsed field types.
   std::vector<AutofillFieldType>* field_types_;
 
-  // A flag indicating whether the client should upload AutoFill data when this
+  // A flag indicating whether the client should upload Autofill data when this
   // form is submitted.
   UploadRequired* upload_required_;
 
@@ -93,10 +93,10 @@ class AutoFillQueryXmlParser : public AutoFillXmlParser {
   // For the default server implementation, this is empty.
   std::string* experiment_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(AutoFillQueryXmlParser);
+  DISALLOW_COPY_AND_ASSIGN(AutofillQueryXmlParser);
 };
 
-// The XML parser for handling AutoFill upload responses.  Typical upload
+// The XML parser for handling Autofill upload responses.  Typical upload
 // responses look like:
 //
 // <autofilluploadresponse negativeuploadrate="0.00125" positiveuploadrate="1"/>
@@ -107,9 +107,9 @@ class AutoFillQueryXmlParser : public AutoFillXmlParser {
 // the form matches what's in the users profile.
 // The negative upload rate is typically much lower than the positive upload
 // rate.
-class AutoFillUploadXmlParser : public AutoFillXmlParser {
+class AutofillUploadXmlParser : public AutofillXmlParser {
  public:
-  AutoFillUploadXmlParser(double* positive_upload_rate,
+  AutofillUploadXmlParser(double* positive_upload_rate,
                           double* negative_upload_rate);
 
  private:
@@ -132,7 +132,7 @@ class AutoFillUploadXmlParser : public AutoFillXmlParser {
   double* positive_upload_rate_;
   double* negative_upload_rate_;
 
-  DISALLOW_COPY_AND_ASSIGN(AutoFillUploadXmlParser);
+  DISALLOW_COPY_AND_ASSIGN(AutofillUploadXmlParser);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_XML_PARSER_H_
diff --git a/chrome/browser/autofill/autofill_xml_parser_unittest.cc b/chrome/browser/autofill/autofill_xml_parser_unittest.cc
index 0732992..51888e2 100644
--- a/chrome/browser/autofill/autofill_xml_parser_unittest.cc
+++ b/chrome/browser/autofill/autofill_xml_parser_unittest.cc
@@ -12,7 +12,7 @@
 
 namespace {
 
-TEST(AutoFillQueryXmlParserTest, BasicQuery) {
+TEST(AutofillQueryXmlParserTest, BasicQuery) {
   // An XML string representing a basic query response.
   std::string xml = "<autofillqueryresponse>"
                     "<field autofilltype=\"0\" />"
@@ -27,7 +27,7 @@ TEST(AutoFillQueryXmlParserTest, BasicQuery) {
   std::string experiment_id;
 
   // Create a parser.
-  AutoFillQueryXmlParser parse_handler(&field_types, &upload_required,
+  AutofillQueryXmlParser parse_handler(&field_types, &upload_required,
                                        &experiment_id);
   buzz::XmlParser parser(&parse_handler);
   parser.Parse(xml.c_str(), xml.length(), true);
@@ -42,7 +42,7 @@ TEST(AutoFillQueryXmlParserTest, BasicQuery) {
 }
 
 // Test parsing the upload required attribute.
-TEST(AutoFillQueryXmlParserTest, TestUploadRequired) {
+TEST(AutofillQueryXmlParserTest, TestUploadRequired) {
   std::vector<AutofillFieldType> field_types;
   UploadRequired upload_required = USE_UPLOAD_RATES;
   std::string experiment_id;
@@ -51,8 +51,8 @@ TEST(AutoFillQueryXmlParserTest, TestUploadRequired) {
                     "<field autofilltype=\"0\" />"
                     "</autofillqueryresponse>";
 
-  scoped_ptr<AutoFillQueryXmlParser> parse_handler(
-      new AutoFillQueryXmlParser(&field_types, &upload_required,
+  scoped_ptr<AutofillQueryXmlParser> parse_handler(
+      new AutofillQueryXmlParser(&field_types, &upload_required,
                                  &experiment_id));
   scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
@@ -67,7 +67,7 @@ TEST(AutoFillQueryXmlParserTest, TestUploadRequired) {
         "<field autofilltype=\"0\" />"
         "</autofillqueryresponse>";
 
-  parse_handler.reset(new AutoFillQueryXmlParser(&field_types, &upload_required,
+  parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required,
                                                  &experiment_id));
   parser.reset(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
@@ -82,7 +82,7 @@ TEST(AutoFillQueryXmlParserTest, TestUploadRequired) {
         "<field autofilltype=\"0\" />"
         "</autofillqueryresponse>";
 
-  parse_handler.reset(new AutoFillQueryXmlParser(&field_types, &upload_required,
+  parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required,
                                                  &experiment_id));
   parser.reset(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
@@ -94,7 +94,7 @@ TEST(AutoFillQueryXmlParserTest, TestUploadRequired) {
 }
 
 // Test parsing the experiment id attribute
-TEST(AutoFillQueryXmlParserTest, ParseExperimentId) {
+TEST(AutofillQueryXmlParserTest, ParseExperimentId) {
   std::vector<AutofillFieldType> field_types;
   UploadRequired upload_required = USE_UPLOAD_RATES;
   std::string experiment_id;
@@ -105,8 +105,8 @@ TEST(AutoFillQueryXmlParserTest, ParseExperimentId) {
                     "<field autofilltype=\"0\" />"
                     "</autofillqueryresponse>";
 
-  scoped_ptr<AutoFillQueryXmlParser> parse_handler(
-      new AutoFillQueryXmlParser(&field_types, &upload_required,
+  scoped_ptr<AutofillQueryXmlParser> parse_handler(
+      new AutofillQueryXmlParser(&field_types, &upload_required,
                                  &experiment_id));
   scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
@@ -123,7 +123,7 @@ TEST(AutoFillQueryXmlParserTest, ParseExperimentId) {
         "<field autofilltype=\"0\" />"
         "</autofillqueryresponse>";
 
-  parse_handler.reset(new AutoFillQueryXmlParser(&field_types, &upload_required,
+  parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required,
                                                  &experiment_id));
   parser.reset(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
@@ -142,7 +142,7 @@ TEST(AutoFillQueryXmlParserTest, ParseExperimentId) {
         "<field autofilltype=\"0\" />"
         "</autofillqueryresponse>";
 
-  parse_handler.reset(new AutoFillQueryXmlParser(&field_types, &upload_required,
+  parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required,
                                                  &experiment_id));
   parser.reset(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
@@ -154,18 +154,18 @@ TEST(AutoFillQueryXmlParserTest, ParseExperimentId) {
 }
 
 // Test badly formed XML queries.
-TEST(AutoFillQueryXmlParserTest, ParseErrors) {
+TEST(AutofillQueryXmlParserTest, ParseErrors) {
   std::vector<AutofillFieldType> field_types;
   UploadRequired upload_required = USE_UPLOAD_RATES;
   std::string experiment_id;
 
-  // Test no AutoFill type.
+  // Test no Autofill type.
   std::string xml = "<autofillqueryresponse>"
                     "<field/>"
                     "</autofillqueryresponse>";
 
-  scoped_ptr<AutoFillQueryXmlParser> parse_handler(
-      new AutoFillQueryXmlParser(&field_types, &upload_required,
+  scoped_ptr<AutofillQueryXmlParser> parse_handler(
+      new AutofillQueryXmlParser(&field_types, &upload_required,
                                  &experiment_id));
   scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
@@ -174,12 +174,12 @@ TEST(AutoFillQueryXmlParserTest, ParseErrors) {
   EXPECT_EQ(0U, field_types.size());
   EXPECT_EQ(std::string(), experiment_id);
 
-  // Test an incorrect AutoFill type.
+  // Test an incorrect Autofill type.
   xml = "<autofillqueryresponse>"
         "<field autofilltype=\"307\"/>"
         "</autofillqueryresponse>";
 
-  parse_handler.reset(new AutoFillQueryXmlParser(&field_types, &upload_required,
+  parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required,
                                                  &experiment_id));
   parser.reset(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
@@ -190,14 +190,14 @@ TEST(AutoFillQueryXmlParserTest, ParseErrors) {
   EXPECT_EQ(NO_SERVER_DATA, field_types[0]);
   EXPECT_EQ(std::string(), experiment_id);
 
-  // Test an incorrect AutoFill type.
+  // Test an incorrect Autofill type.
   field_types.clear();
   xml = "<autofillqueryresponse>"
         "<field autofilltype=\"No Type\"/>"
         "</autofillqueryresponse>";
 
   // Parse fails but an entry is still added to field_types.
-  parse_handler.reset(new AutoFillQueryXmlParser(&field_types, &upload_required,
+  parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required,
                                                  &experiment_id));
   parser.reset(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
@@ -209,12 +209,12 @@ TEST(AutoFillQueryXmlParserTest, ParseErrors) {
 }
 
 // Test successfull upload response.
-TEST(AutoFillUploadXmlParser, TestSuccessfulResponse) {
+TEST(AutofillUploadXmlParser, TestSuccessfulResponse) {
   std::string xml = "<autofilluploadresponse positiveuploadrate=\"0.5\" "
                     "negativeuploadrate=\"0.3\"/>";
   double positive = 0;
   double negative = 0;
-  AutoFillUploadXmlParser parse_handler(&positive, &negative);
+  AutofillUploadXmlParser parse_handler(&positive, &negative);
   buzz::XmlParser parser(&parse_handler);
   parser.Parse(xml.c_str(), xml.length(), true);
   EXPECT_TRUE(parse_handler.succeeded());
@@ -223,13 +223,13 @@ TEST(AutoFillUploadXmlParser, TestSuccessfulResponse) {
 }
 
 // Test failed upload response.
-TEST(AutoFillUploadXmlParser, TestFailedResponse) {
+TEST(AutofillUploadXmlParser, TestFailedResponse) {
   std::string xml = "<autofilluploadresponse positiveuploadrate=\"\" "
                     "negativeuploadrate=\"0.3\"/>";
   double positive = 0;
   double negative = 0;
-  scoped_ptr<AutoFillUploadXmlParser> parse_handler(
-      new AutoFillUploadXmlParser(&positive, &negative));
+  scoped_ptr<AutofillUploadXmlParser> parse_handler(
+      new AutofillUploadXmlParser(&positive, &negative));
   scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
   EXPECT_TRUE(!parse_handler->succeeded());
@@ -239,7 +239,7 @@ TEST(AutoFillUploadXmlParser, TestFailedResponse) {
 
   xml = "<autofilluploadresponse positiveuploadrate=\"0.5\" "
         "negativeuploadrate=\"0.3\"";
-  parse_handler.reset(new AutoFillUploadXmlParser(&positive, &negative));
+  parse_handler.reset(new AutofillUploadXmlParser(&positive, &negative));
   parser.reset(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
   EXPECT_TRUE(!parse_handler->succeeded());
@@ -247,7 +247,7 @@ TEST(AutoFillUploadXmlParser, TestFailedResponse) {
   EXPECT_DOUBLE_EQ(0, negative);
 
   xml = "bad data";
-  parse_handler.reset(new AutoFillUploadXmlParser(&positive, &negative));
+  parse_handler.reset(new AutofillUploadXmlParser(&positive, &negative));
   parser.reset(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
   EXPECT_TRUE(!parse_handler->succeeded());
@@ -255,7 +255,7 @@ TEST(AutoFillUploadXmlParser, TestFailedResponse) {
   EXPECT_DOUBLE_EQ(0, negative);
 
   xml = "";
-  parse_handler.reset(new AutoFillUploadXmlParser(&positive, &negative));
+  parse_handler.reset(new AutofillUploadXmlParser(&positive, &negative));
   parser.reset(new buzz::XmlParser(parse_handler.get()));
   parser->Parse(xml.c_str(), xml.length(), true);
   EXPECT_TRUE(!parse_handler->succeeded());
diff --git a/chrome/browser/autofill/contact_info.cc b/chrome/browser/autofill/contact_info.cc
index 705d778..009cca6 100644
--- a/chrome/browser/autofill/contact_info.cc
+++ b/chrome/browser/autofill/contact_info.cc
@@ -12,14 +12,14 @@
 
 static const string16 kNameSplitChars = ASCIIToUTF16("-'. ");
 
-static const AutofillFieldType kAutoFillNameInfoTypes[] = {
+static const AutofillFieldType kAutofillNameInfoTypes[] = {
   NAME_FIRST,
   NAME_MIDDLE,
   NAME_LAST
 };
 
-static const size_t kAutoFillNameInfoLength =
-    arraysize(kAutoFillNameInfoTypes);
+static const size_t kAutofillNameInfoLength =
+    arraysize(kAutofillNameInfoTypes);
 
 NameInfo::NameInfo() {}
 
@@ -88,8 +88,8 @@ void NameInfo::FindInfoMatches(AutofillFieldType type,
 
   string16 match;
   if (type == UNKNOWN_TYPE) {
-    for (size_t i = 0; i < kAutoFillNameInfoLength; i++) {
-      if (FindInfoMatchesHelper(kAutoFillNameInfoTypes[i], info, &match))
+    for (size_t i = 0; i < kAutofillNameInfoLength; i++) {
+      if (FindInfoMatchesHelper(kAutofillNameInfoTypes[i], info, &match))
         matched_text->push_back(match);
     }
   } else if (FindInfoMatchesHelper(type, info, &match)) {
diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc
index e32fb13..ed91ae3 100644
--- a/chrome/browser/autofill/credit_card.cc
+++ b/chrome/browser/autofill/credit_card.cc
@@ -24,7 +24,7 @@ namespace {
 
 const char* kCreditCardObfuscationString = "************";
 
-const AutofillFieldType kAutoFillCreditCardTypes[] = {
+const AutofillFieldType kAutofillCreditCardTypes[] = {
   CREDIT_CARD_NAME,
   CREDIT_CARD_NUMBER,
   CREDIT_CARD_TYPE,
@@ -32,7 +32,7 @@ const AutofillFieldType kAutoFillCreditCardTypes[] = {
   CREDIT_CARD_EXP_4_DIGIT_YEAR,
 };
 
-const int kAutoFillCreditCardLength = arraysize(kAutoFillCreditCardTypes);
+const int kAutofillCreditCardLength = arraysize(kAutofillCreditCardTypes);
 
 std::string GetCreditCardType(const string16& number) {
   // Don't check for a specific type if this is not a credit card number.
@@ -207,8 +207,8 @@ void CreditCard::FindInfoMatches(AutofillFieldType type,
       break;
 
     case UNKNOWN_TYPE:
-      for (int i = 0; i < kAutoFillCreditCardLength; ++i) {
-        if (FindInfoMatchesHelper(kAutoFillCreditCardTypes[i], info, &match))
+      for (int i = 0; i < kAutofillCreditCardLength; ++i) {
+        if (FindInfoMatchesHelper(kAutofillCreditCardTypes[i], info, &match))
           matched_text->push_back(match);
       }
       break;
diff --git a/chrome/browser/autofill/field_types.h b/chrome/browser/autofill/field_types.h
index 9d76e8b..011116f 100644
--- a/chrome/browser/autofill/field_types.h
+++ b/chrome/browser/autofill/field_types.h
@@ -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.
 
@@ -16,8 +16,8 @@ typedef enum _AddressType {
 
 // NOTE: This list MUST not be modified.  The server aggregates and stores these
 // types over several versions, so we must remain fully compatible with the
-// AutoFill server, which is itself backward-compatible.  The list must be kept
-// up to date with the AutoFill server list.
+// Autofill server, which is itself backward-compatible.  The list must be kept
+// up to date with the Autofill server list.
 //
 // This is the list of all valid field types.
 typedef enum _FieldType {
diff --git a/chrome/browser/autofill/form_structure.cc b/chrome/browser/autofill/form_structure.cc
index 3794852..888d3a5 100644
--- a/chrome/browser/autofill/form_structure.cc
+++ b/chrome/browser/autofill/form_structure.cc
@@ -24,7 +24,7 @@ const char kFormMethodPost[] = "post";
 
 // XML elements and attributes.
 const char kAttributeAcceptedFeatures[] = "accepts";
-const char kAttributeAutoFillUsed[] = "autofillused";
+const char kAttributeAutofillUsed[] = "autofillused";
 const char kAttributeAutofillType[] = "autofilltype";
 const char kAttributeClientVersion[] = "clientversion";
 const char kAttributeDataPresent[] = "datapresent";
@@ -33,8 +33,8 @@ const char kAttributeSignature[] = "signature";
 const char kAcceptedFeatures[] = "e"; // e=experiments
 const char kClientVersion[] = "6.1.1715.1442/en (GGLL)";
 const char kXMLDeclaration[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-const char kXMLElementAutoFillQuery[] = "autofillquery";
-const char kXMLElementAutoFillUpload[] = "autofillupload";
+const char kXMLElementAutofillQuery[] = "autofillquery";
+const char kXMLElementAutofillUpload[] = "autofillupload";
 const char kXMLElementForm[] = "form";
 const char kXMLElementField[] = "field";
 
@@ -56,7 +56,7 @@ FormStructure::FormStructure(const FormData& form)
   for (field = form.fields.begin();
        field != form.fields.end(); field++) {
     // Add all supported form fields (including with empty names) to the
-    // signature.  This is a requirement for AutoFill servers.
+    // signature.  This is a requirement for Autofill servers.
     form_signature_field_names_.append("&");
     form_signature_field_names_.append(UTF16ToUTF8(field->name));
 
@@ -123,12 +123,12 @@ bool FormStructure::EncodeUploadRequest(bool auto_fill_used,
 
   // Set up the <autofillupload> element and its attributes.
   buzz::XmlElement autofill_request_xml(
-      (buzz::QName(kXMLElementAutoFillUpload)));
+      (buzz::QName(kXMLElementAutofillUpload)));
   autofill_request_xml.SetAttr(buzz::QName(kAttributeClientVersion),
                                kClientVersion);
   autofill_request_xml.SetAttr(buzz::QName(kAttributeFormSignature),
                                FormSignature());
-  autofill_request_xml.SetAttr(buzz::QName(kAttributeAutoFillUsed),
+  autofill_request_xml.SetAttr(buzz::QName(kAttributeAutofillUsed),
                                auto_fill_used ? "true" : "false");
   autofill_request_xml.SetAttr(buzz::QName(kAttributeDataPresent),
                                ConvertPresenceBitsToString().c_str());
@@ -155,7 +155,7 @@ bool FormStructure::EncodeQueryRequest(const ScopedVector<FormStructure>& forms,
 
   // Set up the <autofillquery> element and attributes.
   buzz::XmlElement autofill_request_xml(
-      (buzz::QName(kXMLElementAutoFillQuery)));
+      (buzz::QName(kXMLElementAutofillQuery)));
   autofill_request_xml.SetAttr(buzz::QName(kAttributeClientVersion),
                                kClientVersion);
   autofill_request_xml.SetAttr(buzz::QName(kAttributeAcceptedFeatures),
@@ -204,7 +204,7 @@ void FormStructure::ParseQueryResponse(const std::string& response_xml,
   // Parse the field types from the server response to the query.
   std::vector<AutofillFieldType> field_types;
   std::string experiment_id;
-  AutoFillQueryXmlParser parse_handler(&field_types, upload_required,
+  AutofillQueryXmlParser parse_handler(&field_types, upload_required,
                                        &experiment_id);
   buzz::XmlParser parser(&parse_handler);
   parser.Parse(response_xml.c_str(), response_xml.length(), true);
@@ -255,7 +255,7 @@ void FormStructure::ParseQueryResponse(const std::string& response_xml,
         form->has_autofillable_field_ = true;
     }
 
-    form->UpdateAutoFillCount();
+    form->UpdateAutofillCount();
   }
 
   AutofillMetrics::ServerQueryMetric metric;
@@ -289,14 +289,14 @@ std::string FormStructure::FormSignature() const {
   return Hash64Bit(form_string);
 }
 
-bool FormStructure::IsAutoFillable(bool require_method_post) const {
+bool FormStructure::IsAutofillable(bool require_method_post) const {
   if (autofill_count() < kRequiredFillableFields)
     return false;
 
   return ShouldBeParsed(require_method_post);
 }
 
-void FormStructure::UpdateAutoFillCount() {
+void FormStructure::UpdateAutofillCount() {
   autofill_count_ = 0;
   for (std::vector<AutofillField*>::const_iterator iter = begin();
        iter != end(); ++iter) {
diff --git a/chrome/browser/autofill/form_structure.h b/chrome/browser/autofill/form_structure.h
index 100abd2..517388c 100644
--- a/chrome/browser/autofill/form_structure.h
+++ b/chrome/browser/autofill/form_structure.h
@@ -34,7 +34,7 @@ enum UploadRequired {
 class AutofillMetrics;
 
 // FormStructure stores a single HTML form together with the values entered
-// in the fields along with additional information needed by AutoFill.
+// in the fields along with additional information needed by Autofill.
 class FormStructure {
  public:
   explicit FormStructure(const webkit_glue::FormData& form);
@@ -70,15 +70,15 @@ class FormStructure {
   // Runs a quick heuristic to rule out forms that are obviously not
   // auto-fillable, like google/yahoo/msn search, etc. The requirement that the
   // form's method be POST is only applied if |require_method_post| is true.
-  bool IsAutoFillable(bool require_method_post) const;
+  bool IsAutofillable(bool require_method_post) const;
 
   // Resets |autofill_count_| and counts the number of auto-fillable fields.
   // This is used when we receive server data for form fields.  At that time,
   // we may have more known fields than just the number of fields we matched
   // heuristically.
-  void UpdateAutoFillCount();
+  void UpdateAutofillCount();
 
-  // Returns true if this form matches the structural requirements for AutoFill.
+  // Returns true if this form matches the structural requirements for Autofill.
   // The requirement that the form's method be POST is only applied if
   // |require_method_post| is true.
   bool ShouldBeParsed(bool require_method_post) const;
diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc
index 8fb100b..5b93988 100644
--- a/chrome/browser/autofill/form_structure_browsertest.cc
+++ b/chrome/browser/autofill/form_structure_browsertest.cc
@@ -28,7 +28,7 @@ GURL HTMLToDataURI(const std::string& html) {
 
 }  // namespace
 
-// A data-driven test for verifying AutoFill heuristics. Each input is an HTML
+// A data-driven test for verifying Autofill heuristics. Each input is an HTML
 // file that contains one or more forms. The corresponding output file lists the
 // heuristically detected type for eachfield.
 class FormStructureBrowserTest : public InProcessBrowserTest,
diff --git a/chrome/browser/autofill/form_structure_unittest.cc b/chrome/browser/autofill/form_structure_unittest.cc
index 558ac2d5..bd2e26e 100644
--- a/chrome/browser/autofill/form_structure_unittest.cc
+++ b/chrome/browser/autofill/form_structure_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -75,7 +75,7 @@ TEST(FormStructureTest, FieldCount) {
   EXPECT_EQ(3U, form_structure.field_count());
 }
 
-TEST(FormStructureTest, AutoFillCount) {
+TEST(FormStructureTest, AutofillCount) {
   FormData form;
   form.method = ASCIIToUTF16("post");
   form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
@@ -118,7 +118,7 @@ TEST(FormStructureTest, SourceURL) {
   EXPECT_EQ(form.origin, form_structure.source_url());
 }
 
-TEST(FormStructureTest, IsAutoFillable) {
+TEST(FormStructureTest, IsAutofillable) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
@@ -144,7 +144,7 @@ TEST(FormStructureTest, IsAutoFillable) {
                                                false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_FALSE(form_structure->IsAutoFillable(true));
+  EXPECT_FALSE(form_structure->IsAutofillable(true));
 
   // We now have three text fields, but only two auto-fillable fields.
   form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
@@ -161,7 +161,7 @@ TEST(FormStructureTest, IsAutoFillable) {
                                                false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_FALSE(form_structure->IsAutoFillable(true));
+  EXPECT_FALSE(form_structure->IsAutofillable(true));
 
   // We now have three auto-fillable fields.
   form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Email"),
@@ -172,28 +172,28 @@ TEST(FormStructureTest, IsAutoFillable) {
                                                false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // The method must be 'post', though we can intentionally ignore this
   // criterion for the sake of providing a helpful warning message to the user.
   form.method = ASCIIToUTF16("get");
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_FALSE(form_structure->IsAutoFillable(true));
-  EXPECT_TRUE(form_structure->IsAutoFillable(false));
+  EXPECT_FALSE(form_structure->IsAutofillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(false));
 
   // The target cannot include http(s)://*/search...
   form.method = ASCIIToUTF16("post");
   form.action = GURL("http://google.com/search?q=hello");
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_FALSE(form_structure->IsAutoFillable(true));
+  EXPECT_FALSE(form_structure->IsAutofillable(true));
 
   // But search can be in the URL.
   form.action = GURL("http://search.com/?q=hello");
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
 }
 
 TEST(FormStructureTest, HeuristicsContactInfo) {
@@ -257,7 +257,7 @@ TEST(FormStructureTest, HeuristicsContactInfo) {
                                                false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(9U, form_structure->field_count());
@@ -361,7 +361,7 @@ TEST(FormStructureTest, HeuristicsSample8) {
                              false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(10U, form_structure->field_count());
   ASSERT_EQ(9U, form_structure->autofill_count());
 
@@ -447,7 +447,7 @@ TEST(FormStructureTest, HeuristicsSample6) {
                              false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(7U, form_structure->field_count());
   ASSERT_EQ(6U, form_structure->autofill_count());
 
@@ -531,7 +531,7 @@ TEST(FormStructureTest, HeuristicsLabelsOnly) {
                                                false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(9U, form_structure->field_count());
   ASSERT_EQ(8U, form_structure->autofill_count());
 
@@ -599,7 +599,7 @@ TEST(FormStructureTest, HeuristicsCreditCardInfo) {
                                                false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(6U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
@@ -669,7 +669,7 @@ TEST(FormStructureTest, HeuristicsCreditCardInfoWithUnknownCardField) {
                                                false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(7U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
@@ -725,7 +725,7 @@ TEST(FormStructureTest, ThreeAddressLines) {
                              false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
@@ -776,7 +776,7 @@ TEST(FormStructureTest, BillingAndShippingAddresses) {
                              false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
@@ -831,7 +831,7 @@ TEST(FormStructureTest, ThreeAddressLinesExpedia) {
                              false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
@@ -876,7 +876,7 @@ TEST(FormStructureTest, TwoAddressLinesEbay) {
                              false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
@@ -916,7 +916,7 @@ TEST(FormStructureTest, HeuristicsStateWithProvince) {
                              false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
@@ -1013,7 +1013,7 @@ TEST(FormStructureTest, HeuristicsWithBilling) {
                              false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(11U, form_structure->field_count());
   ASSERT_EQ(11U, form_structure->autofill_count());
 
@@ -1069,7 +1069,7 @@ TEST(FormStructureTest, ThreePartPhoneNumber) {
                              false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
@@ -1121,7 +1121,7 @@ TEST(FormStructureTest, HeuristicsInfernoCC) {
                                                false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(5U, form_structure->field_count());
@@ -1182,7 +1182,7 @@ TEST(FormStructureTest, CVCCodeClash) {
                                                false));
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(6U, form_structure->field_count());
diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc
index 0f26238..6f04182 100644
--- a/chrome/browser/autofill/personal_data_manager.cc
+++ b/chrome/browser/autofill/personal_data_manager.cc
@@ -28,7 +28,7 @@
 namespace {
 
 // The minimum number of fields that must contain user data and have known types
-// before AutoFill will attempt to import the data into a profile or a credit
+// before Autofill will attempt to import the data into a profile or a credit
 // card.
 const int kMinProfileImportSize = 3;
 const int kMinCreditCardImportSize = 2;
@@ -600,7 +600,7 @@ bool PersonalDataManager::IsDataLoaded() const {
 const std::vector<AutofillProfile*>& PersonalDataManager::profiles() {
   // |profile_| is NULL in AutofillManagerTest.
   bool auxiliary_profiles_enabled = profile_ ? profile_->GetPrefs()->GetBoolean(
-      prefs::kAutoFillAuxiliaryProfilesEnabled) : false;
+      prefs::kAutofillAuxiliaryProfilesEnabled) : false;
   if (!auxiliary_profiles_enabled)
     return web_profiles();
 
diff --git a/chrome/browser/autofill/personal_data_manager.h b/chrome/browser/autofill/personal_data_manager.h
index b82be51..3df559a 100644
--- a/chrome/browser/autofill/personal_data_manager.h
+++ b/chrome/browser/autofill/personal_data_manager.h
@@ -25,9 +25,9 @@ class AutofillMetrics;
 class FormStructure;
 class Profile;
 
-// Handles loading and saving AutoFill profile information to the web database.
+// Handles loading and saving Autofill profile information to the web database.
 // This class also stores the profiles loaded from the database for use during
-// AutoFill.
+// Autofill.
 class PersonalDataManager
     : public WebDataServiceConsumer,
       public ProfileSyncServiceObserver,
@@ -64,7 +64,7 @@ class PersonalDataManager
   virtual void OnStateChanged();
 
         // TODO(isherman): Update this comment
-  // If AutoFill is able to determine the field types of a significant number of
+  // If Autofill is able to determine the field types of a significant number of
   // field types that contain information in the FormStructures a profile will
   // be created with all of the information from recognized fields. Returns
   // whether a profile was created.
@@ -79,7 +79,7 @@ class PersonalDataManager
   //
   // The relationship between this and Refresh is subtle.
   // A call to |SetProfiles| could include out-of-date data that may conflict
-  // if we didn't refresh-to-latest before an AutoFill window was opened for
+  // if we didn't refresh-to-latest before an Autofill window was opened for
   // editing. |SetProfiles| is implemented to make a "best effort" to apply the
   // changes, but in extremely rare edge cases it is possible not all of the
   // updates in |profiles| make it to the DB.  This is why SetProfiles will
@@ -164,7 +164,7 @@ class PersonalDataManager
   // Make sure that only Profile and certain tests can create an instance of
   // PersonalDataManager.
   friend class base::RefCountedThreadSafe<PersonalDataManager>;
-  friend class AutoFillMergeTest;
+  friend class AutofillMergeTest;
   friend class PersonalDataManagerTest;
   friend class ProfileImpl;
   friend class ProfileSyncServiceAutofillTest;
diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc
index 9b3469d..3136c39 100644
--- a/chrome/browser/autofill/personal_data_manager_unittest.cc
+++ b/chrome/browser/autofill/personal_data_manager_unittest.cc
@@ -23,10 +23,10 @@
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_source.h"
 #include "content/common/notification_type.h"
-#include "webkit/glue/form_data.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_data.h"
+#include "webkit/glue/form_data.h"
 
 using webkit_glue::FormData;
 
@@ -495,7 +495,7 @@ TEST_F(PersonalDataManagerTest, Refresh) {
   wds->RemoveAutofillProfile(profile2.guid());
 
   // Before telling the PDM to refresh, simulate an edit to one of the profiles
-  // via a SetProfile update (this would happen if the AutoFill window was
+  // via a SetProfile update (this would happen if the Autofill window was
   // open with a previous snapshot of the profiles, and something [e.g. sync]
   // removed a profile from the browser.  In this edge case, we will end up
   // in a consistent state by dropping the write).
diff --git a/chrome/browser/autofill/phone_number.cc b/chrome/browser/autofill/phone_number.cc
index 43634d8..b06e253 100644
--- a/chrome/browser/autofill/phone_number.cc
+++ b/chrome/browser/autofill/phone_number.cc
@@ -20,7 +20,7 @@ const size_t kPhoneNumberLength = 7;
 // The number of digits in an area code.
 const size_t kPhoneCityCodeLength = 3;
 
-const AutofillType::FieldTypeSubGroup kAutoFillPhoneTypes[] = {
+const AutofillType::FieldTypeSubGroup kAutofillPhoneTypes[] = {
   AutofillType::PHONE_NUMBER,
   AutofillType::PHONE_CITY_CODE,
   AutofillType::PHONE_COUNTRY_CODE,
@@ -28,7 +28,7 @@ const AutofillType::FieldTypeSubGroup kAutoFillPhoneTypes[] = {
   AutofillType::PHONE_WHOLE_NUMBER,
 };
 
-const int kAutoFillPhoneLength = arraysize(kAutoFillPhoneTypes);
+const int kAutofillPhoneLength = arraysize(kAutofillPhoneTypes);
 
 }  // namespace
 
@@ -126,8 +126,8 @@ void PhoneNumber::FindInfoMatches(AutofillFieldType type,
 
   string16 match;
   if (type == UNKNOWN_TYPE) {
-    for (int i = 0; i < kAutoFillPhoneLength; ++i) {
-      if (FindInfoMatchesHelper(kAutoFillPhoneTypes[i], info, &match))
+    for (int i = 0; i < kAutofillPhoneLength; ++i) {
+      if (FindInfoMatchesHelper(kAutofillPhoneTypes[i], info, &match))
         matched_text->push_back(match);
     }
   } else {
diff --git a/chrome/browser/chromeos/login/account_creation_view.cc b/chrome/browser/chromeos/login/account_creation_view.cc
index 1f0a3a6..7153ecc 100644
--- a/chrome/browser/chromeos/login/account_creation_view.cc
+++ b/chrome/browser/chromeos/login/account_creation_view.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.
 
@@ -30,13 +30,13 @@ class AccountCreationTabContents : public WizardWebPageViewTabContents {
   virtual bool OnMessageReceived(const IPC::Message& message) {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(AccountCreationTabContents, message)
-      IPC_MESSAGE_HANDLER(AutoFillHostMsg_FormSubmitted, OnFormSubmitted)
-      IPC_MESSAGE_HANDLER_GENERIC(AutoFillHostMsg_FormsSeen, )
-      IPC_MESSAGE_HANDLER_GENERIC(AutoFillHostMsg_QueryFormFieldAutoFill, )
-      IPC_MESSAGE_HANDLER_GENERIC(AutoFillHostMsg_ShowAutoFillDialog, )
-      IPC_MESSAGE_HANDLER_GENERIC(AutoFillHostMsg_FillAutoFillFormData, )
-      IPC_MESSAGE_HANDLER_GENERIC(AutoFillHostMsg_DidFillAutoFillFormData, )
-      IPC_MESSAGE_HANDLER_GENERIC(AutoFillHostMsg_DidShowAutoFillSuggestions, )
+      IPC_MESSAGE_HANDLER(AutofillHostMsg_FormSubmitted, OnFormSubmitted)
+      IPC_MESSAGE_HANDLER_GENERIC(AutofillHostMsg_FormsSeen, )
+      IPC_MESSAGE_HANDLER_GENERIC(AutofillHostMsg_QueryFormFieldAutofill, )
+      IPC_MESSAGE_HANDLER_GENERIC(AutofillHostMsg_ShowAutofillDialog, )
+      IPC_MESSAGE_HANDLER_GENERIC(AutofillHostMsg_FillAutofillFormData, )
+      IPC_MESSAGE_HANDLER_GENERIC(AutofillHostMsg_DidFillAutofillFormData, )
+      IPC_MESSAGE_HANDLER_GENERIC(AutofillHostMsg_DidShowAutofillSuggestions, )
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
 
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index f3d451d..6898134 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -387,10 +387,10 @@ bool FirstRun::SetPersonalDataManagerFirstRunPref() {
   if (!local_state)
     return false;
   if (!local_state->FindPreference(
-          prefs::kAutoFillPersonalDataManagerFirstRun)) {
+          prefs::kAutofillPersonalDataManagerFirstRun)) {
     local_state->RegisterBooleanPref(
-        prefs::kAutoFillPersonalDataManagerFirstRun, false);
-    local_state->SetBoolean(prefs::kAutoFillPersonalDataManagerFirstRun, true);
+        prefs::kAutofillPersonalDataManagerFirstRun, false);
+    local_state->SetBoolean(prefs::kAutofillPersonalDataManagerFirstRun, true);
   }
   return true;
 }
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 260ffb2..9eef2ff 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -150,7 +150,7 @@ class FirstRun {
   // if the pref could not be set.
   static bool SetShowWelcomePagePref();
 
-  // Sets the kAutoFillPersonalDataManagerFirstRun local state pref so that the
+  // Sets the kAutofillPersonalDataManagerFirstRun local state pref so that the
   // browser loads PersonalDataManager once the main message loop gets going.
   // Returns false if the pref could not be set.
   static bool SetPersonalDataManagerFirstRunPref();
diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc
index f5c0f84..11efdd2 100644
--- a/chrome/browser/password_manager/password_form_manager.cc
+++ b/chrome/browser/password_manager/password_form_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -300,7 +300,7 @@ void PasswordFormManager::OnRequestDone(int handle,
   if (wait_for_username)
     manager_action_ = kManagerActionNone;
   else
-    manager_action_ = kManagerActionAutoFilled;
+    manager_action_ = kManagerActionAutofilled;
   password_manager_->Autofill(observed_form_, best_matches_,
                               preferred_match_, wait_for_username);
 }
diff --git a/chrome/browser/password_manager/password_form_manager.h b/chrome/browser/password_manager/password_form_manager.h
index 584cc7b..698c3e2 100644
--- a/chrome/browser/password_manager/password_form_manager.h
+++ b/chrome/browser/password_manager/password_form_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -104,7 +104,7 @@ class PasswordFormManager : public PasswordStoreConsumer {
   // end up choosing.
   enum ManagerAction {
     kManagerActionNone = 0,
-    kManagerActionAutoFilled,
+    kManagerActionAutofilled,
     kManagerActionBlacklisted,
     kManagerActionDisabled,
     kManagerActionMax
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index bc8d660..f374e1c 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -163,9 +163,9 @@ void PasswordManager::DidNavigateAnyFramePostCommit(
 bool PasswordManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PasswordManager, message)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_PasswordFormsFound,
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_PasswordFormsFound,
                         OnPasswordFormsFound)
-    IPC_MESSAGE_HANDLER(AutoFillHostMsg_PasswordFormsVisible,
+    IPC_MESSAGE_HANDLER(AutofillHostMsg_PasswordFormsVisible,
                         OnPasswordFormsVisible)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
diff --git a/chrome/browser/password_manager_delegate_impl.cc b/chrome/browser/password_manager_delegate_impl.cc
index 286b73e..fd9facc 100644
--- a/chrome/browser/password_manager_delegate_impl.cc
+++ b/chrome/browser/password_manager_delegate_impl.cc
@@ -114,7 +114,7 @@ bool SavePasswordInfoBarDelegate::Cancel() {
 
 void PasswordManagerDelegateImpl::FillPasswordForm(
     const webkit_glue::PasswordFormFillData& form_data) {
-  tab_contents_->render_view_host()->Send(new AutoFillMsg_FillPasswordForm(
+  tab_contents_->render_view_host()->Send(new AutofillMsg_FillPasswordForm(
       tab_contents_->render_view_host()->routing_id(), form_data));
 }
 
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index 2d365e7..e607f56 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -87,9 +87,9 @@ class ConfigurationPolicyPrefKeeper
   // Assumes ownership of |value| in that case.
   bool ApplySyncPolicy(ConfigurationPolicyType policy, Value* value);
 
-  // Handles policies that affect AutoFill. Returns true if the policy was
+  // Handles policies that affect Autofill. Returns true if the policy was
   // handled and assumes ownership of |value| in that case.
-  bool ApplyAutoFillPolicy(ConfigurationPolicyType policy, Value* value);
+  bool ApplyAutofillPolicy(ConfigurationPolicyType policy, Value* value);
 
   // Processes download directory policy. Returns true if the specified policy
   // is the download directory policy. ApplyDownloadDirPolicy assumes the
@@ -338,7 +338,7 @@ void ConfigurationPolicyPrefKeeper::Apply(ConfigurationPolicyType policy,
   if (ApplySyncPolicy(policy, value))
     return;
 
-  if (ApplyAutoFillPolicy(policy, value))
+  if (ApplyAutofillPolicy(policy, value))
     return;
 
   if (ApplyDownloadDirPolicy(policy, value))
@@ -429,12 +429,12 @@ bool ConfigurationPolicyPrefKeeper::ApplySyncPolicy(
   return false;
 }
 
-bool ConfigurationPolicyPrefKeeper::ApplyAutoFillPolicy(
+bool ConfigurationPolicyPrefKeeper::ApplyAutofillPolicy(
     ConfigurationPolicyType policy, Value* value) {
   if (policy == kPolicyAutoFillEnabled) {
     bool auto_fill_enabled;
     if (value->GetAsBoolean(&auto_fill_enabled) && !auto_fill_enabled)
-      prefs_.SetValue(prefs::kAutoFillEnabled,
+      prefs_.SetValue(prefs::kAutofillEnabled,
                        Value::CreateBooleanValue(false));
     delete value;
     return true;
diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index 1f21f9c..6db2f38 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -639,31 +639,31 @@ TEST_F(ConfigurationPolicyPrefStoreSyncTest, Disabled) {
   EXPECT_TRUE(FundamentalValue(true).Equals(value));
 }
 
-// Test cases for the AutoFill policy setting.
-class ConfigurationPolicyPrefStoreAutoFillTest
+// Test cases for the Autofill policy setting.
+class ConfigurationPolicyPrefStoreAutofillTest
     : public ConfigurationPolicyPrefStoreTestBase<testing::Test> {
 };
 
-TEST_F(ConfigurationPolicyPrefStoreAutoFillTest, Default) {
+TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Default) {
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store_->GetValue(prefs::kSyncManaged, NULL));
 }
 
-TEST_F(ConfigurationPolicyPrefStoreAutoFillTest, Enabled) {
+TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Enabled) {
   provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(true));
   store_->OnUpdatePolicy();
-  // Enabling AutoFill should not set the pref.
+  // Enabling Autofill should not set the pref.
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             store_->GetValue(prefs::kSyncManaged, NULL));
 }
 
-TEST_F(ConfigurationPolicyPrefStoreAutoFillTest, Disabled) {
+TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Disabled) {
   provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(false));
   store_->OnUpdatePolicy();
-  // Disabling AutoFill should switch the pref to managed.
+  // Disabling Autofill should switch the pref to managed.
   Value* value = NULL;
   EXPECT_EQ(PrefStore::READ_OK,
-            store_->GetValue(prefs::kAutoFillEnabled, &value));
+            store_->GetValue(prefs::kAutofillEnabled, &value));
   EXPECT_TRUE(FundamentalValue(false).Equals(value));
 }
 
diff --git a/chrome/browser/policy/managed_prefs_banner_base.cc b/chrome/browser/policy/managed_prefs_banner_base.cc
index 4e0b5e8..d5a4a83 100644
--- a/chrome/browser/policy/managed_prefs_banner_base.cc
+++ b/chrome/browser/policy/managed_prefs_banner_base.cc
@@ -76,7 +76,7 @@ void ManagedPrefsBannerBase::Init(PrefService* local_state,
       break;
     case OPTIONS_PAGE_CONTENT:
       AddUserPref(prefs::kSyncManaged);
-      AddUserPref(prefs::kAutoFillEnabled);
+      AddUserPref(prefs::kAutofillEnabled);
       AddUserPref(prefs::kPasswordManagerEnabled);
 #if defined(OS_CHROMEOS)
       AddUserPref(prefs::kEnableScreenLock);
diff --git a/chrome/browser/resources/options/autofill_edit_address_overlay.js b/chrome/browser/resources/options/autofill_edit_address_overlay.js
index a0cb1de..99e2a10 100644
--- a/chrome/browser/resources/options/autofill_edit_address_overlay.js
+++ b/chrome/browser/resources/options/autofill_edit_address_overlay.js
@@ -9,19 +9,19 @@ cr.define('options', function() {
   var guid;
 
   /**
-   * AutoFillEditAddressOverlay class
+   * AutofillEditAddressOverlay class
    * Encapsulated handling of the 'Add Page' overlay page.
    * @class
    */
-  function AutoFillEditAddressOverlay() {
+  function AutofillEditAddressOverlay() {
     OptionsPage.call(this, 'autoFillEditAddress',
                      templateData.autoFillEditAddressTitle,
                      'autofill-edit-address-overlay');
   }
 
-  cr.addSingletonGetter(AutoFillEditAddressOverlay);
+  cr.addSingletonGetter(AutofillEditAddressOverlay);
 
-  AutoFillEditAddressOverlay.prototype = {
+  AutofillEditAddressOverlay.prototype = {
     __proto__: OptionsPage.prototype,
 
     /**
@@ -58,7 +58,7 @@ cr.define('options', function() {
 
     /**
      * Aggregates the values in the input fields into an array and sends the
-     * array to the AutoFill handler.
+     * array to the Autofill handler.
      * @private
      */
     saveAddress_: function() {
@@ -233,20 +233,20 @@ cr.define('options', function() {
     },
   };
 
-  AutoFillEditAddressOverlay.clearInputFields = function() {
-    AutoFillEditAddressOverlay.getInstance().clearInputFields_();
+  AutofillEditAddressOverlay.clearInputFields = function() {
+    AutofillEditAddressOverlay.getInstance().clearInputFields_();
   };
 
-  AutoFillEditAddressOverlay.loadAddress = function(address) {
-    AutoFillEditAddressOverlay.getInstance().loadAddress_(address);
+  AutofillEditAddressOverlay.loadAddress = function(address) {
+    AutofillEditAddressOverlay.getInstance().loadAddress_(address);
   };
 
-  AutoFillEditAddressOverlay.setTitle = function(title) {
+  AutofillEditAddressOverlay.setTitle = function(title) {
     $('autofill-address-title').textContent = title;
   };
 
   // Export
   return {
-    AutoFillEditAddressOverlay: AutoFillEditAddressOverlay
+    AutofillEditAddressOverlay: AutofillEditAddressOverlay
   };
 });
diff --git a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js
index 6c83c98..300bed3 100644
--- a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js
+++ b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js
@@ -9,19 +9,19 @@ cr.define('options', function() {
   var guid_;
 
   /**
-   * AutoFillEditCreditCardOverlay class
+   * AutofillEditCreditCardOverlay class
    * Encapsulated handling of the 'Add Page' overlay page.
    * @class
    */
-  function AutoFillEditCreditCardOverlay() {
+  function AutofillEditCreditCardOverlay() {
     OptionsPage.call(this, 'autoFillEditCreditCard',
                      templateData.autoFillEditCreditCardTitle,
                      'autofill-edit-credit-card-overlay');
   }
 
-  cr.addSingletonGetter(AutoFillEditCreditCardOverlay);
+  cr.addSingletonGetter(AutofillEditCreditCardOverlay);
 
-  AutoFillEditCreditCardOverlay.prototype = {
+  AutofillEditCreditCardOverlay.prototype = {
     __proto__: OptionsPage.prototype,
 
     /**
@@ -59,7 +59,7 @@ cr.define('options', function() {
 
     /**
      * Aggregates the values in the input fields into an array and sends the
-     * array to the AutoFill handler.
+     * array to the Autofill handler.
      * @private
      */
     saveCreditCard_: function() {
@@ -183,20 +183,20 @@ cr.define('options', function() {
     },
   };
 
-  AutoFillEditCreditCardOverlay.clearInputFields = function(title) {
-    AutoFillEditCreditCardOverlay.getInstance().clearInputFields_();
+  AutofillEditCreditCardOverlay.clearInputFields = function(title) {
+    AutofillEditCreditCardOverlay.getInstance().clearInputFields_();
   };
 
-  AutoFillEditCreditCardOverlay.loadCreditCard = function(creditCard) {
-    AutoFillEditCreditCardOverlay.getInstance().loadCreditCard_(creditCard);
+  AutofillEditCreditCardOverlay.loadCreditCard = function(creditCard) {
+    AutofillEditCreditCardOverlay.getInstance().loadCreditCard_(creditCard);
   };
 
-  AutoFillEditCreditCardOverlay.setTitle = function(title) {
+  AutofillEditCreditCardOverlay.setTitle = function(title) {
     $('autofill-credit-card-title').textContent = title;
   };
 
   // Export
   return {
-    AutoFillEditCreditCardOverlay: AutoFillEditCreditCardOverlay
+    AutofillEditCreditCardOverlay: AutofillEditCreditCardOverlay
   };
 });
diff --git a/chrome/browser/resources/options/autofill_options.js b/chrome/browser/resources/options/autofill_options.js
index 87b1724..f58dd2f 100644
--- a/chrome/browser/resources/options/autofill_options.js
+++ b/chrome/browser/resources/options/autofill_options.js
@@ -7,22 +7,22 @@ cr.define('options', function() {
   const ArrayDataModel = cr.ui.ArrayDataModel;
 
   /////////////////////////////////////////////////////////////////////////////
-  // AutoFillOptions class:
+  // AutofillOptions class:
 
   /**
-   * Encapsulated handling of AutoFill options page.
+   * Encapsulated handling of Autofill options page.
    * @constructor
    */
-  function AutoFillOptions() {
+  function AutofillOptions() {
     OptionsPage.call(this,
                      'autofill',
                      templateData.autoFillOptionsPageTabTitle,
                      'autofill-options');
   }
 
-  cr.addSingletonGetter(AutoFillOptions);
+  cr.addSingletonGetter(AutofillOptions);
 
-  AutoFillOptions.prototype = {
+  AutofillOptions.prototype = {
     __proto__: OptionsPage.prototype,
 
     /**
@@ -53,8 +53,8 @@ cr.define('options', function() {
         self.showAddCreditCardOverlay_();
       };
 
-      // TODO(jhawkins): What happens when AutoFill is disabled whilst on the
-      // AutoFill options page?
+      // TODO(jhawkins): What happens when Autofill is disabled whilst on the
+      // Autofill options page?
     },
 
     /**
@@ -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;
     },
@@ -86,8 +86,8 @@ cr.define('options', function() {
      */
     showAddAddressOverlay_: function() {
       var title = localStrings.getString('addAddressTitle');
-      AutoFillEditAddressOverlay.setTitle(title);
-      AutoFillEditAddressOverlay.clearInputFields();
+      AutofillEditAddressOverlay.setTitle(title);
+      AutofillEditAddressOverlay.clearInputFields();
       OptionsPage.navigateToPage('autoFillEditAddress');
     },
 
@@ -99,8 +99,8 @@ cr.define('options', function() {
      */
     showAddCreditCardOverlay_: function() {
       var title = localStrings.getString('addCreditCardTitle');
-      AutoFillEditCreditCardOverlay.setTitle(title);
-      AutoFillEditCreditCardOverlay.clearInputFields();
+      AutofillEditCreditCardOverlay.setTitle(title);
+      AutofillEditCreditCardOverlay.clearInputFields();
       OptionsPage.navigateToPage('autoFillEditCreditCard');
     },
 
@@ -123,7 +123,7 @@ cr.define('options', function() {
     },
 
     /**
-     * Removes the AutoFill address represented by |guid|.
+     * Removes the Autofill address represented by |guid|.
      * @param {String} guid The GUID of the address to remove.
      * @private
      */
@@ -132,7 +132,7 @@ cr.define('options', function() {
     },
 
     /**
-     * Removes the AutoFill credit card represented by |guid|.
+     * Removes the Autofill credit card represented by |guid|.
      * @param {String} guid The GUID of the credit card to remove.
      * @private
      */
@@ -142,7 +142,7 @@ cr.define('options', function() {
 
     /**
      * Requests profile data for the address represented by |guid| from the
-     * PersonalDataManager. Once the data is loaded, the AutoFillOptionsHandler
+     * PersonalDataManager. Once the data is loaded, the AutofillOptionsHandler
      * calls showEditAddressOverlay().
      * @param {String} guid The GUID of the address to edit.
      * @private
@@ -153,7 +153,7 @@ cr.define('options', function() {
 
     /**
      * Requests profile data for the credit card represented by |guid| from the
-     * PersonalDataManager. Once the data is loaded, the AutoFillOptionsHandler
+     * PersonalDataManager. Once the data is loaded, the AutofillOptionsHandler
      * calls showEditCreditCardOverlay().
      * @param {String} guid The GUID of the credit card to edit.
      * @private
@@ -170,8 +170,8 @@ cr.define('options', function() {
      */
     showEditAddressOverlay_: function(address) {
       var title = localStrings.getString('editAddressTitle');
-      AutoFillEditAddressOverlay.setTitle(title);
-      AutoFillEditAddressOverlay.loadAddress(address);
+      AutofillEditAddressOverlay.setTitle(title);
+      AutofillEditAddressOverlay.loadAddress(address);
       OptionsPage.navigateToPage('autoFillEditAddress');
     },
 
@@ -183,47 +183,47 @@ cr.define('options', function() {
      */
     showEditCreditCardOverlay_: function(creditCard) {
       var title = localStrings.getString('editCreditCardTitle');
-      AutoFillEditCreditCardOverlay.setTitle(title);
-      AutoFillEditCreditCardOverlay.loadCreditCard(creditCard);
+      AutofillEditCreditCardOverlay.setTitle(title);
+      AutofillEditCreditCardOverlay.loadCreditCard(creditCard);
       OptionsPage.navigateToPage('autoFillEditCreditCard');
     },
   };
 
-  AutoFillOptions.setAddressList = function(entries) {
-    AutoFillOptions.getInstance().setAddressList_(entries);
+  AutofillOptions.setAddressList = function(entries) {
+    AutofillOptions.getInstance().setAddressList_(entries);
   };
 
-  AutoFillOptions.setCreditCardList = function(entries) {
-    AutoFillOptions.getInstance().setCreditCardList_(entries);
+  AutofillOptions.setCreditCardList = function(entries) {
+    AutofillOptions.getInstance().setCreditCardList_(entries);
   };
 
-  AutoFillOptions.removeAddress = function(guid) {
-    AutoFillOptions.getInstance().removeAddress_(guid);
+  AutofillOptions.removeAddress = function(guid) {
+    AutofillOptions.getInstance().removeAddress_(guid);
   };
 
-  AutoFillOptions.removeCreditCard = function(guid) {
-    AutoFillOptions.getInstance().removeCreditCard_(guid);
+  AutofillOptions.removeCreditCard = function(guid) {
+    AutofillOptions.getInstance().removeCreditCard_(guid);
   };
 
-  AutoFillOptions.loadAddressEditor = function(guid) {
-    AutoFillOptions.getInstance().loadAddressEditor_(guid);
+  AutofillOptions.loadAddressEditor = function(guid) {
+    AutofillOptions.getInstance().loadAddressEditor_(guid);
   };
 
-  AutoFillOptions.loadCreditCardEditor = function(guid) {
-    AutoFillOptions.getInstance().loadCreditCardEditor_(guid);
+  AutofillOptions.loadCreditCardEditor = function(guid) {
+    AutofillOptions.getInstance().loadCreditCardEditor_(guid);
   };
 
-  AutoFillOptions.editAddress = function(address) {
-    AutoFillOptions.getInstance().showEditAddressOverlay_(address);
+  AutofillOptions.editAddress = function(address) {
+    AutofillOptions.getInstance().showEditAddressOverlay_(address);
   };
 
-  AutoFillOptions.editCreditCard = function(creditCard) {
-    AutoFillOptions.getInstance().showEditCreditCardOverlay_(creditCard);
+  AutofillOptions.editCreditCard = function(creditCard) {
+    AutofillOptions.getInstance().showEditCreditCardOverlay_(creditCard);
   };
 
   // Export
   return {
-    AutoFillOptions: AutoFillOptions
+    AutofillOptions: AutofillOptions
   };
 
 });
diff --git a/chrome/browser/resources/options/autofill_options_list.js b/chrome/browser/resources/options/autofill_options_list.js
index c2173d5..a9c8a33 100644
--- a/chrome/browser/resources/options/autofill_options_list.js
+++ b/chrome/browser/resources/options/autofill_options_list.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -79,9 +79,9 @@ cr.define('options.autoFillOptions', function() {
    * @constructor
    * @extends {options.DeletableItemList}
    */
-  var AutoFillAddressList = cr.ui.define('list');
+  var AutofillAddressList = cr.ui.define('list');
 
-  AutoFillAddressList.prototype = {
+  AutofillAddressList.prototype = {
     __proto__: DeletableItemList.prototype,
 
     decorate: function() {
@@ -105,12 +105,12 @@ cr.define('options.autoFillOptions', function() {
 
     /** @inheritDoc */
     activateItemAtIndex: function(index) {
-      AutoFillOptions.loadAddressEditor(this.dataModel.item(index)[0]);
+      AutofillOptions.loadAddressEditor(this.dataModel.item(index)[0]);
     },
 
     /** @inheritDoc */
     deleteItemAtIndex: function(index) {
-      AutoFillOptions.removeAddress(this.dataModel.item(index)[0]);
+      AutofillOptions.removeAddress(this.dataModel.item(index)[0]);
     },
   };
 
@@ -119,9 +119,9 @@ cr.define('options.autoFillOptions', function() {
    * @constructor
    * @extends {options.DeletableItemList}
    */
-  var AutoFillCreditCardList = cr.ui.define('list');
+  var AutofillCreditCardList = cr.ui.define('list');
 
-  AutoFillCreditCardList.prototype = {
+  AutofillCreditCardList.prototype = {
     __proto__: DeletableItemList.prototype,
 
     decorate: function() {
@@ -145,19 +145,19 @@ cr.define('options.autoFillOptions', function() {
 
     /** @inheritDoc */
     activateItemAtIndex: function(index) {
-      AutoFillOptions.loadCreditCardEditor(this.dataModel.item(index)[0]);
+      AutofillOptions.loadCreditCardEditor(this.dataModel.item(index)[0]);
     },
 
     /** @inheritDoc */
     deleteItemAtIndex: function(index) {
-      AutoFillOptions.removeCreditCard(this.dataModel.item(index)[0]);
+      AutofillOptions.removeCreditCard(this.dataModel.item(index)[0]);
     },
   };
 
   return {
     AddressListItem: AddressListItem,
     CreditCardListItem: CreditCardListItem,
-    AutoFillAddressList: AutoFillAddressList,
-    AutoFillCreditCardList: AutoFillCreditCardList,
+    AutofillAddressList: AutofillAddressList,
+    AutofillCreditCardList: AutofillCreditCardList,
   };
 });
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index b86bbb7..43f0ca0 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -5,9 +5,9 @@
 var AddLanguageOverlay = options.AddLanguageOverlay;
 var AdvancedOptions = options.AdvancedOptions;
 var AlertOverlay = options.AlertOverlay;
-var AutoFillEditAddressOverlay = options.AutoFillEditAddressOverlay;
-var AutoFillEditCreditCardOverlay = options.AutoFillEditCreditCardOverlay;
-var AutoFillOptions = options.AutoFillOptions;
+var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
+var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
+var AutofillOptions = options.AutofillOptions;
 var BrowserOptions = options.BrowserOptions;
 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
 var ContentSettings = options.ContentSettings;
@@ -58,7 +58,7 @@ function load() {
                               BrowserOptions.getInstance(),
                               [$('defaultSearchManageEnginesButton')]);
   OptionsPage.register(PersonalOptions.getInstance());
-  OptionsPage.registerSubPage(AutoFillOptions.getInstance(),
+  OptionsPage.registerSubPage(AutofillOptions.getInstance(),
                               PersonalOptions.getInstance(),
                               [$('autofill-settings')]);
   OptionsPage.registerSubPage(PasswordManager.getInstance(),
@@ -127,10 +127,10 @@ function load() {
   OptionsPage.registerOverlay(AddLanguageOverlay.getInstance(),
                               LanguageOptions.getInstance());
   OptionsPage.registerOverlay(AlertOverlay.getInstance());
-  OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance(),
-                              AutoFillOptions.getInstance());
-  OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance(),
-                              AutoFillOptions.getInstance());
+  OptionsPage.registerOverlay(AutofillEditAddressOverlay.getInstance(),
+                              AutofillOptions.getInstance());
+  OptionsPage.registerOverlay(AutofillEditCreditCardOverlay.getInstance(),
+                              AutofillOptions.getInstance());
   OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance(),
                               AdvancedOptions.getInstance(),
                               [$('privacyClearDataButton')]);
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 9aaf792f..ac41c11 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -56,7 +56,7 @@ cr.define('options', function() {
       $('autofill-settings').onclick = function(event) {
         OptionsPage.navigateToPage('autofill');
         chrome.send('coreOptionsUserMetricsAction',
-            ['Options_ShowAutoFillSettings']);
+            ['Options_ShowAutofillSettings']);
       };
       $('themes-reset').onclick = function(event) {
         chrome.send('themesReset');
diff --git a/chrome/browser/sync/glue/synchronized_preferences.h b/chrome/browser/sync/glue/synchronized_preferences.h
index 091b330..0aec10e 100644
--- a/chrome/browser/sync/glue/synchronized_preferences.h
+++ b/chrome/browser/sync/glue/synchronized_preferences.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -28,7 +28,7 @@ static const char* kSynchronizedPreferences[] = {
 
   // Options dialog: Personal Stuff tab.
   prefs::kPasswordManagerEnabled,
-  prefs::kAutoFillEnabled,
+  prefs::kAutofillEnabled,
   prefs::kUseCustomChromeFrame,
 
   // Options dialog: Under the hood -> Content Settings -> Cookies.
@@ -96,7 +96,7 @@ static const char* kSynchronizedPreferences[] = {
 
   // Autofill dialog.
 #if defined(OS_MACOSX)
-  prefs::kAutoFillAuxiliaryProfilesEnabled,
+  prefs::kAutofillAuxiliaryProfilesEnabled,
 #endif
 
   // Translate preferences.
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 265d6c9..310778f 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -436,14 +436,14 @@ void Browser::InitBrowserWindow() {
     window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
   }
   if (local_state->FindPreference(
-      prefs::kAutoFillPersonalDataManagerFirstRun) &&
-      local_state->GetBoolean(prefs::kAutoFillPersonalDataManagerFirstRun)) {
+      prefs::kAutofillPersonalDataManagerFirstRun) &&
+      local_state->GetBoolean(prefs::kAutofillPersonalDataManagerFirstRun)) {
     // Notify PDM that this is a first run.
 #if defined(OS_WIN)
     ImportAutofillDataWin(profile_->GetPersonalDataManager());
 #endif  // defined(OS_WIN)
     // Reset the preference so we don't call it again for subsequent windows.
-    local_state->ClearPref(prefs::kAutoFillPersonalDataManagerFirstRun);
+    local_state->ClearPref(prefs::kAutofillPersonalDataManagerFirstRun);
   }
 }
 
@@ -1954,7 +1954,7 @@ void Browser::OpenPrivacyDashboardTabAndActivate() {
   window_->Activate();
 }
 
-void Browser::OpenAutoFillHelpTabAndActivate() {
+void Browser::OpenAutofillHelpTabAndActivate() {
   GURL help_url = google_util::AppendGoogleLocaleParam(GURL(kAutofillHelpUrl));
   AddSelectedTabWithURL(help_url, PageTransition::LINK);
 }
@@ -3690,7 +3690,7 @@ void Browser::InitCommandState() {
   command_updater_.UpdateCommandEnabled(IDC_FIND_NEXT, non_devtools_window);
   command_updater_.UpdateCommandEnabled(IDC_FIND_PREVIOUS, non_devtools_window);
 
-  // AutoFill
+  // Autofill
   command_updater_.UpdateCommandEnabled(IDC_AUTOFILL_DEFAULT,
                                         non_devtools_window);
 
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index e6387d5..64ee122 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -559,7 +559,7 @@ class Browser : public TabHandlerDelegate,
   void OpenHelpTab();
   // Used by the "Get themes" link in the options dialog.
   void OpenThemeGalleryTabAndActivate();
-  void OpenAutoFillHelpTabAndActivate();
+  void OpenAutofillHelpTabAndActivate();
   void OpenPrivacyDashboardTabAndActivate();
   void OpenSearchEngineOptionsDialog();
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/gtk/accelerators_gtk.cc b/chrome/browser/ui/gtk/accelerators_gtk.cc
index fbec557..c01310f 100644
--- a/chrome/browser/ui/gtk/accelerators_gtk.cc
+++ b/chrome/browser/ui/gtk/accelerators_gtk.cc
@@ -144,7 +144,7 @@ const struct AcceleratorMapping {
   { GDK_x, IDC_CUT, GDK_CONTROL_MASK },
   { GDK_v, IDC_PASTE, GDK_CONTROL_MASK },
 
-  // AutoFill.
+  // Autofill.
   { GDK_a, IDC_AUTOFILL_DEFAULT,
     GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
 
diff --git a/chrome/browser/ui/options/options_util.cc b/chrome/browser/ui/options/options_util.cc
index 540b28e..7b4246c 100644
--- a/chrome/browser/ui/options/options_util.cc
+++ b/chrome/browser/ui/options/options_util.cc
@@ -52,8 +52,8 @@ void OptionsUtil::ResetToDefaults(Profile* profile) {
     prefs::kSavingBrowserHistoryDisabled,
     prefs::kEnableSpellCheck,
     prefs::kEnableTranslate,
-    prefs::kAutoFillEnabled,
-    prefs::kAutoFillAuxiliaryProfilesEnabled,
+    prefs::kAutofillEnabled,
+    prefs::kAutofillAuxiliaryProfilesEnabled,
     prefs::kHomePage,
     prefs::kHomePageIsNewTabPage,
     prefs::kPromptForDownload,
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index f06533e..6c4d15b 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -70,18 +70,18 @@ DictionaryValue* GetCountryData() {
 
 }  // namespace
 
-AutoFillOptionsHandler::AutoFillOptionsHandler()
+AutofillOptionsHandler::AutofillOptionsHandler()
     : personal_data_(NULL) {
 }
 
-AutoFillOptionsHandler::~AutoFillOptionsHandler() {
+AutofillOptionsHandler::~AutofillOptionsHandler() {
   if (personal_data_)
     personal_data_->RemoveObserver(this);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // OptionsPageUIHandler implementation:
-void AutoFillOptionsHandler::GetLocalizedValues(
+void AutofillOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
@@ -108,45 +108,45 @@ void AutoFillOptionsHandler::GetLocalizedValues(
   SetCreditCardOverlayStrings(localized_strings);
 }
 
-void AutoFillOptionsHandler::Initialize() {
+void AutofillOptionsHandler::Initialize() {
   personal_data_ = web_ui_->GetProfile()->GetPersonalDataManager();
   personal_data_->SetObserver(this);
 
-  LoadAutoFillData();
+  LoadAutofillData();
 }
 
-void AutoFillOptionsHandler::RegisterMessages() {
+void AutofillOptionsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback(
       "removeAddress",
-      NewCallback(this, &AutoFillOptionsHandler::RemoveAddress));
+      NewCallback(this, &AutofillOptionsHandler::RemoveAddress));
   web_ui_->RegisterMessageCallback(
       "removeCreditCard",
-      NewCallback(this, &AutoFillOptionsHandler::RemoveCreditCard));
+      NewCallback(this, &AutofillOptionsHandler::RemoveCreditCard));
   web_ui_->RegisterMessageCallback(
       "loadAddressEditor",
-      NewCallback(this, &AutoFillOptionsHandler::LoadAddressEditor));
+      NewCallback(this, &AutofillOptionsHandler::LoadAddressEditor));
   web_ui_->RegisterMessageCallback(
       "loadCreditCardEditor",
-      NewCallback(this, &AutoFillOptionsHandler::LoadCreditCardEditor));
+      NewCallback(this, &AutofillOptionsHandler::LoadCreditCardEditor));
   web_ui_->RegisterMessageCallback(
       "setAddress",
-      NewCallback(this, &AutoFillOptionsHandler::SetAddress));
+      NewCallback(this, &AutofillOptionsHandler::SetAddress));
   web_ui_->RegisterMessageCallback(
       "setCreditCard",
-      NewCallback(this, &AutoFillOptionsHandler::SetCreditCard));
+      NewCallback(this, &AutofillOptionsHandler::SetCreditCard));
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // PersonalDataManager::Observer implementation:
-void  AutoFillOptionsHandler::OnPersonalDataLoaded() {
-  LoadAutoFillData();
+void  AutofillOptionsHandler::OnPersonalDataLoaded() {
+  LoadAutofillData();
 }
 
-void AutoFillOptionsHandler::OnPersonalDataChanged() {
-  LoadAutoFillData();
+void AutofillOptionsHandler::OnPersonalDataChanged() {
+  LoadAutofillData();
 }
 
-void AutoFillOptionsHandler::SetAddressOverlayStrings(
+void AutofillOptionsHandler::SetAddressOverlayStrings(
     DictionaryValue* localized_strings) {
   localized_strings->SetString("autoFillEditAddressTitle",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_EDIT_ADDRESS_CAPTION));
@@ -176,7 +176,7 @@ void AutoFillOptionsHandler::SetAddressOverlayStrings(
   localized_strings->Set("autofillCountryData", GetCountryData());
 }
 
-void AutoFillOptionsHandler::SetCreditCardOverlayStrings(
+void AutofillOptionsHandler::SetCreditCardOverlayStrings(
     DictionaryValue* localized_strings) {
   localized_strings->SetString("autoFillEditCreditCardTitle",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_EDIT_CREDITCARD_CAPTION));
@@ -188,7 +188,7 @@ void AutoFillOptionsHandler::SetCreditCardOverlayStrings(
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_EXPIRATION_DATE));
 }
 
-void AutoFillOptionsHandler::LoadAutoFillData() {
+void AutofillOptionsHandler::LoadAutofillData() {
   if (!personal_data_->IsDataLoaded())
     return;
 
@@ -202,7 +202,7 @@ void AutoFillOptionsHandler::LoadAutoFillData() {
     addresses.Append(entry);
   }
 
-  web_ui_->CallJavascriptFunction("AutoFillOptions.setAddressList", addresses);
+  web_ui_->CallJavascriptFunction("AutofillOptions.setAddressList", addresses);
 
   ListValue credit_cards;
   for (std::vector<CreditCard*>::const_iterator i =
@@ -217,11 +217,11 @@ void AutoFillOptionsHandler::LoadAutoFillData() {
     credit_cards.Append(entry);
   }
 
-  web_ui_->CallJavascriptFunction("AutoFillOptions.setCreditCardList",
+  web_ui_->CallJavascriptFunction("AutofillOptions.setCreditCardList",
                                   credit_cards);
 }
 
-void AutoFillOptionsHandler::RemoveAddress(const ListValue* args) {
+void AutofillOptionsHandler::RemoveAddress(const ListValue* args) {
   DCHECK(personal_data_->IsDataLoaded());
 
   std::string guid;
@@ -233,7 +233,7 @@ void AutoFillOptionsHandler::RemoveAddress(const ListValue* args) {
   personal_data_->RemoveProfile(guid);
 }
 
-void AutoFillOptionsHandler::RemoveCreditCard(const ListValue* args) {
+void AutofillOptionsHandler::RemoveCreditCard(const ListValue* args) {
   DCHECK(personal_data_->IsDataLoaded());
 
   std::string guid;
@@ -245,7 +245,7 @@ void AutoFillOptionsHandler::RemoveCreditCard(const ListValue* args) {
   personal_data_->RemoveCreditCard(guid);
 }
 
-void AutoFillOptionsHandler::LoadAddressEditor(const ListValue* args) {
+void AutofillOptionsHandler::LoadAddressEditor(const ListValue* args) {
   DCHECK(personal_data_->IsDataLoaded());
 
   std::string guid;
@@ -278,10 +278,10 @@ void AutoFillOptionsHandler::LoadAddressEditor(const ListValue* args) {
   address.SetString("fax", profile->GetInfo(PHONE_FAX_WHOLE_NUMBER));
   address.SetString("email", profile->GetInfo(EMAIL_ADDRESS));
 
-  web_ui_->CallJavascriptFunction("AutoFillOptions.editAddress", address);
+  web_ui_->CallJavascriptFunction("AutofillOptions.editAddress", address);
 }
 
-void AutoFillOptionsHandler::LoadCreditCardEditor(const ListValue* args) {
+void AutofillOptionsHandler::LoadCreditCardEditor(const ListValue* args) {
   DCHECK(personal_data_->IsDataLoaded());
 
   std::string guid;
@@ -312,11 +312,11 @@ void AutoFillOptionsHandler::LoadCreditCardEditor(const ListValue* args) {
       "expirationYear",
       credit_card->GetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR));
 
-  web_ui_->CallJavascriptFunction("AutoFillOptions.editCreditCard",
+  web_ui_->CallJavascriptFunction("AutofillOptions.editCreditCard",
                                   credit_card_data);
 }
 
-void AutoFillOptionsHandler::SetAddress(const ListValue* args) {
+void AutofillOptionsHandler::SetAddress(const ListValue* args) {
   if (!personal_data_->IsDataLoaded())
     return;
 
@@ -361,7 +361,7 @@ void AutoFillOptionsHandler::SetAddress(const ListValue* args) {
   }
 }
 
-void AutoFillOptionsHandler::SetCreditCard(const ListValue* args) {
+void AutofillOptionsHandler::SetCreditCard(const ListValue* args) {
   if (!personal_data_->IsDataLoaded())
     return;
 
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.h b/chrome/browser/ui/webui/options/autofill_options_handler.h
index 69066cc..dd9a0f6 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.h
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.h
@@ -13,11 +13,11 @@
 class DictionaryValue;
 class ListValue;
 
-class AutoFillOptionsHandler : public OptionsPageUIHandler,
+class AutofillOptionsHandler : public OptionsPageUIHandler,
                                public PersonalDataManager::Observer {
  public:
-  AutoFillOptionsHandler();
-  virtual ~AutoFillOptionsHandler();
+  AutofillOptionsHandler();
+  virtual ~AutofillOptionsHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
@@ -33,8 +33,8 @@ class AutoFillOptionsHandler : public OptionsPageUIHandler,
   void SetAddressOverlayStrings(DictionaryValue* localized_strings);
   void SetCreditCardOverlayStrings(DictionaryValue* localized_strings);
 
-  // Loads AutoFill addresses and credit cards using the PersonalDataManager.
-  void LoadAutoFillData();
+  // Loads Autofill addresses and credit cards using the PersonalDataManager.
+  void LoadAutofillData();
 
   // Removes an address from the PersonalDataManager.
   // |args| - A string, the GUID of the address to remove.
@@ -68,11 +68,11 @@ class AutoFillOptionsHandler : public OptionsPageUIHandler,
   // credit card data.
   void SetCreditCard(const ListValue* args);
 
-  // The personal data manager, used to load AutoFill profiles and credit cards.
+  // The personal data manager, used to load Autofill profiles and credit cards.
   // Unowned pointer, may not be NULL.
   PersonalDataManager* personal_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(AutoFillOptionsHandler);
+  DISALLOW_COPY_AND_ASSIGN(AutofillOptionsHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index b865e98..eae3d63 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -168,7 +168,7 @@ OptionsUI::OptionsUI(TabContents* contents)
 #endif
 
   AddOptionsPageUIHandler(localized_strings, new AdvancedOptionsHandler());
-  AddOptionsPageUIHandler(localized_strings, new AutoFillOptionsHandler());
+  AddOptionsPageUIHandler(localized_strings, new AutofillOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new BrowserOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
   AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
diff --git a/chrome/browser/webdata/autofill_change.h b/chrome/browser/webdata/autofill_change.h
index 37ad33f..297a6a7 100644
--- a/chrome/browser/webdata/autofill_change.h
+++ b/chrome/browser/webdata/autofill_change.h
@@ -45,7 +45,7 @@ class AutofillChange : public GenericAutofillChange<AutofillKey> {
   }
 };
 
-// Change notification details for AutoFill profile changes.
+// Change notification details for Autofill profile changes.
 class AutofillProfileChange : public GenericAutofillChange<std::string> {
  public:
   // The |type| input specifies the change type.  The |key| input is the key,
@@ -66,7 +66,7 @@ class AutofillProfileChange : public GenericAutofillChange<std::string> {
   const AutofillProfile* profile_;
 };
 
-// Change notification details for AutoFill credit card changes.
+// Change notification details for Autofill credit card changes.
 class AutofillCreditCardChange : public GenericAutofillChange<std::string> {
  public:
   // The |type| input specifies the change type.  The |key| input is the key,
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index 1391dbfa..a610cf2 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -334,7 +334,7 @@ WebDataService::Handle WebDataService::GetBlacklistLogins(
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// AutoFill.
+// Autofill.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -909,7 +909,7 @@ void WebDataService::GetBlacklistLoginsImpl(WebDataRequest* request) {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// AutoFill implementation.
+// Autofill implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index 6591300..a7c63ef 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -416,7 +416,7 @@ class WebDataService
 
   //////////////////////////////////////////////////////////////////////////////
   //
-  // AutoFill.
+  // Autofill.
   //
   //////////////////////////////////////////////////////////////////////////////
 
@@ -438,17 +438,17 @@ class WebDataService
   void RemoveFormValueForElementName(const string16& name,
                                      const string16& value);
 
-  // Schedules a task to add an AutoFill profile to the web database.
+  // Schedules a task to add an Autofill profile to the web database.
   void AddAutofillProfile(const AutofillProfile& profile);
 
-  // Schedules a task to update an AutoFill profile in the web database.
+  // Schedules a task to update an Autofill profile in the web database.
   void UpdateAutofillProfile(const AutofillProfile& profile);
 
-  // Schedules a task to remove an AutoFill profile from the web database.
+  // Schedules a task to remove an Autofill profile from the web database.
   // |guid| is the identifer of the profile to remove.
   void RemoveAutofillProfile(const std::string& guid);
 
-  // Initiates the request for all AutoFill profiles.  The method
+  // Initiates the request for all Autofill profiles.  The method
   // OnWebDataServiceRequestDone of |consumer| gets called when the request is
   // finished, with the profiles included in the argument |result|.  The
   // consumer owns the profiles.
@@ -474,7 +474,7 @@ class WebDataService
   // consumer owns the credit cards.
   Handle GetCreditCards(WebDataServiceConsumer* consumer);
 
-  // Removes AutoFill records from the database.
+  // Removes Autofill records from the database.
   void RemoveAutofillProfilesAndCreditCardsModifiedBetween(
       const base::Time& delete_begin,
       const base::Time& delete_end);
@@ -592,7 +592,7 @@ class WebDataService
 
   //////////////////////////////////////////////////////////////////////////////
   //
-  // AutoFill.
+  // Autofill.
   //
   //////////////////////////////////////////////////////////////////////////////
   void AddFormElementsImpl(
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index a69ce86..5b2488e 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -45,9 +45,9 @@ using webkit_glue::FormField;
 using webkit_glue::PasswordForm;
 
 // Constants for the |autofill_profile_phones| |type| column.
-enum AutoFillPhoneType {
-  kAutoFillPhoneNumber = 0,
-  kAutoFillFaxNumber = 1
+enum AutofillPhoneType {
+  kAutofillPhoneNumber = 0,
+  kAutofillFaxNumber = 1
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -113,8 +113,8 @@ enum AutoFillPhoneType {
 //   pair_id
 //   date_created
 //
-// autofill_profiles    This table contains AutoFill profile data added by the
-//                      user with the AutoFill dialog.  Most of the columns are
+// autofill_profiles    This table contains Autofill profile data added by the
+//                      user with the Autofill dialog.  Most of the columns are
 //                      standard entries in a contact information form.
 //
 //   guid               A guid string to uniquely identify the profile.
@@ -167,7 +167,7 @@ enum AutoFillPhoneType {
 //   guid               The guid string that identifies the trashed profile.
 //
 // credit_cards         This table contains credit card data added by the user
-//                      with the AutoFill dialog.  Most of the columns are
+//                      with the Autofill dialog.  Most of the columns are
 //                      standard entries in a credit card form.
 //
 //   guid               A guid string to uniquely identify the profile.
@@ -352,7 +352,7 @@ void AddAutofillProfilePhoneFromStatement(const sql::Statement& s,
                                        AutofillProfile* profile) {
   DCHECK_EQ(profile->guid(), s.ColumnString(0));
   DCHECK(guid::IsValidGUID(profile->guid()));
-  DCHECK_EQ(kAutoFillPhoneNumber, s.ColumnInt(1));
+  DCHECK_EQ(kAutofillPhoneNumber, s.ColumnInt(1));
   profile->SetInfo(PHONE_HOME_WHOLE_NUMBER, s.ColumnString16(2));
 }
 
@@ -360,7 +360,7 @@ void AddAutofillProfileFaxFromStatement(const sql::Statement& s,
                                      AutofillProfile* profile) {
   DCHECK_EQ(profile->guid(), s.ColumnString(0));
   DCHECK(guid::IsValidGUID(profile->guid()));
-  DCHECK_EQ(kAutoFillFaxNumber, s.ColumnInt(1));
+  DCHECK_EQ(kAutofillFaxNumber, s.ColumnInt(1));
   profile->SetInfo(PHONE_FAX_WHOLE_NUMBER, s.ColumnString16(2));
 }
 
@@ -497,12 +497,12 @@ bool AddAutofillProfileEmail(const std::string& guid,
 
 bool AddAutofillProfilePhone(const std::string& guid,
                              const AutofillProfile& profile,
-                             AutoFillPhoneType phone_type,
+                             AutofillPhoneType phone_type,
                              sql::Connection* db) {
   AutofillFieldType field_type;
-  if (phone_type == kAutoFillPhoneNumber) {
+  if (phone_type == kAutofillPhoneNumber) {
     field_type = PHONE_HOME_WHOLE_NUMBER;
-  } else if (phone_type == kAutoFillFaxNumber) {
+  } else if (phone_type == kAutofillFaxNumber) {
     field_type = PHONE_FAX_WHOLE_NUMBER;
   } else {
     NOTREACHED();
@@ -555,10 +555,10 @@ bool AddAutofillProfilePieces(const std::string& guid,
   if (!AddAutofillProfileEmail(guid, profile, db))
     return false;
 
-  if (!AddAutofillProfilePhone(guid, profile, kAutoFillPhoneNumber, db))
+  if (!AddAutofillProfilePhone(guid, profile, kAutofillPhoneNumber, db))
     return false;
 
-  if (!AddAutofillProfilePhone(guid, profile, kAutoFillFaxNumber, db))
+  if (!AddAutofillProfilePhone(guid, profile, kAutofillFaxNumber, db))
     return false;
 
   return true;
@@ -1960,7 +1960,7 @@ bool WebDatabase::GetAutofillProfile(const std::string& guid,
     return false;
   }
   s4.BindString(0, guid);
-  s4.BindInt(1, kAutoFillPhoneNumber);
+  s4.BindInt(1, kAutofillPhoneNumber);
 
   if (s4.Step()) {
     AddAutofillProfilePhoneFromStatement(s4, p.get());
@@ -1976,7 +1976,7 @@ bool WebDatabase::GetAutofillProfile(const std::string& guid,
     return false;
   }
   s5.BindString(0, guid);
-  s5.BindInt(1, kAutoFillFaxNumber);
+  s5.BindInt(1, kAutofillFaxNumber);
 
   if (s5.Step()) {
     AddAutofillProfileFaxFromStatement(s5, p.get());
@@ -2249,12 +2249,12 @@ bool WebDatabase::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
       std::numeric_limits<time_t>::max() :
       delete_end.ToTimeT();
 
-  // Remove AutoFill profiles in the time range.
+  // Remove Autofill profiles in the time range.
   sql::Statement s_profiles(db_.GetUniqueStatement(
       "DELETE FROM autofill_profiles "
       "WHERE date_modified >= ? AND date_modified < ?"));
   if (!s_profiles) {
-    NOTREACHED() << "AutoFill profiles statement prepare failed";
+    NOTREACHED() << "Autofill profiles statement prepare failed";
     return false;
   }
 
@@ -2267,12 +2267,12 @@ bool WebDatabase::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
     return false;
   }
 
-  // Remove AutoFill profiles in the time range.
+  // Remove Autofill profiles in the time range.
   sql::Statement s_credit_cards(db_.GetUniqueStatement(
       "DELETE FROM credit_cards "
       "WHERE date_modified >= ? AND date_modified < ?"));
   if (!s_credit_cards) {
-    NOTREACHED() << "AutoFill credit cards statement prepare failed";
+    NOTREACHED() << "Autofill credit cards statement prepare failed";
     return false;
   }
 
@@ -2494,7 +2494,7 @@ sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded(){
 
     case 23: {
       // One-time cleanup for Chromium bug 38364.  In the presence of
-      // multi-byte UTF-8 characters, that bug could cause AutoFill strings
+      // multi-byte UTF-8 characters, that bug could cause Autofill strings
       // to grow larger and more corrupt with each save.  The cleanup removes
       // any row with a string field larger than a reasonable size.  The string
       // fields examined here are precisely the ones that were subject to
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h
index 01274cc4..03c4ed3 100644
--- a/chrome/browser/webdata/web_database.h
+++ b/chrome/browser/webdata/web_database.h
@@ -136,7 +136,7 @@ class WebDatabase {
 
   //////////////////////////////////////////////////////////////////////////////
   //
-  // AutoFill
+  // Autofill
   //
   //////////////////////////////////////////////////////////////////////////////
 
@@ -221,7 +221,7 @@ class WebDatabase {
   // added.
   virtual bool UpdateAutofillEntries(const std::vector<AutofillEntry>& entries);
 
-  // Records a single AutoFill profile in the autofill_profiles table.
+  // Records a single Autofill profile in the autofill_profiles table.
   virtual bool AddAutofillProfile(const AutofillProfile& profile);
 
   // Updates the database values for the specified profile.
diff --git a/chrome/common/autofill_messages.h b/chrome/common/autofill_messages.h
index cd86d75..c893aaa 100644
--- a/chrome/common/autofill_messages.h
+++ b/chrome/common/autofill_messages.h
@@ -13,7 +13,7 @@
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/password_form_dom_manager.h"
 
-#define IPC_MESSAGE_START AutoFillMsgStart
+#define IPC_MESSAGE_START AutofillMsgStart
 
 IPC_STRUCT_TRAITS_BEGIN(webkit_glue::FormField)
   IPC_STRUCT_TRAITS_MEMBER(label)
@@ -40,77 +40,77 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::PasswordFormFillData)
   IPC_STRUCT_TRAITS_MEMBER(wait_for_username)
 IPC_STRUCT_TRAITS_END()
 
-// AutoFill messages sent from the browser to the renderer.
+// Autofill messages sent from the browser to the renderer.
 
-// Reply to the AutoFillHostMsg_QueryFormFieldAutoFill message with the
-// AutoFill suggestions.
-IPC_MESSAGE_ROUTED5(AutoFillMsg_SuggestionsReturned,
+// Reply to the AutofillHostMsg_QueryFormFieldAutofill message with the
+// Autofill suggestions.
+IPC_MESSAGE_ROUTED5(AutofillMsg_SuggestionsReturned,
                     int /* id of the request message */,
                     std::vector<string16> /* names */,
                     std::vector<string16> /* labels */,
                     std::vector<string16> /* icons */,
                     std::vector<int> /* unique_ids */)
 
-// Reply to the AutoFillHostMsg_FillAutoFillFormData message with the
-// AutoFill form data.
-IPC_MESSAGE_ROUTED2(AutoFillMsg_FormDataFilled,
+// Reply to the AutofillHostMsg_FillAutofillFormData message with the
+// Autofill form data.
+IPC_MESSAGE_ROUTED2(AutofillMsg_FormDataFilled,
                     int /* id of the request message */,
                     webkit_glue::FormData /* form data */)
 
 // Fill a password form and prepare field autocomplete for multiple
 // matching logins.
-IPC_MESSAGE_ROUTED1(AutoFillMsg_FillPasswordForm,
+IPC_MESSAGE_ROUTED1(AutofillMsg_FillPasswordForm,
                     webkit_glue::PasswordFormFillData)
 
 
-// AutoFill messages sent from the renderer to the browser.
+// Autofill messages sent from the renderer to the browser.
 
 // Notification that forms have been seen that are candidates for
 // filling/submitting by the AutofillManager.
-IPC_MESSAGE_ROUTED1(AutoFillHostMsg_FormsSeen,
+IPC_MESSAGE_ROUTED1(AutofillHostMsg_FormsSeen,
                     std::vector<webkit_glue::FormData> /* forms */)
 
 // Notification that password forms have been seen that are candidates for
 // filling/submitting by the password manager.
-IPC_MESSAGE_ROUTED1(AutoFillHostMsg_PasswordFormsFound,
+IPC_MESSAGE_ROUTED1(AutofillHostMsg_PasswordFormsFound,
                     std::vector<webkit_glue::PasswordForm> /* forms */)
 
 // Notification that initial layout has occurred and the following password
 // forms are visible on the page (e.g. not set to display:none.)
-IPC_MESSAGE_ROUTED1(AutoFillHostMsg_PasswordFormsVisible,
+IPC_MESSAGE_ROUTED1(AutofillHostMsg_PasswordFormsVisible,
                     std::vector<webkit_glue::PasswordForm> /* forms */)
 
 // Notification that a form has been submitted.  The user hit the button.
-IPC_MESSAGE_ROUTED1(AutoFillHostMsg_FormSubmitted,
+IPC_MESSAGE_ROUTED1(AutofillHostMsg_FormSubmitted,
                     webkit_glue::FormData /* form */)
 
-// Queries the browser for AutoFill suggestions for a form input field.
-IPC_MESSAGE_ROUTED3(AutoFillHostMsg_QueryFormFieldAutoFill,
+// Queries the browser for Autofill suggestions for a form input field.
+IPC_MESSAGE_ROUTED3(AutofillHostMsg_QueryFormFieldAutofill,
                     int /* id of this message */,
                     webkit_glue::FormData /* the form */,
                     webkit_glue::FormField /* the form field */)
 
-// Sent when the popup with AutoFill suggestions for a form is shown.
-IPC_MESSAGE_ROUTED0(AutoFillHostMsg_DidShowAutoFillSuggestions)
+// Sent when the popup with Autofill suggestions for a form is shown.
+IPC_MESSAGE_ROUTED0(AutofillHostMsg_DidShowAutofillSuggestions)
 
-// Instructs the browser to fill in the values for a form using AutoFill
+// Instructs the browser to fill in the values for a form using Autofill
 // profile data.
-IPC_MESSAGE_ROUTED4(AutoFillHostMsg_FillAutoFillFormData,
+IPC_MESSAGE_ROUTED4(AutofillHostMsg_FillAutofillFormData,
                     int /* id of this message */,
                     webkit_glue::FormData /* the form  */,
                     webkit_glue::FormField /* the form field  */,
                     int /* profile unique ID */)
 
-// Sent when a form is previewed or filled with AutoFill suggestions.
-IPC_MESSAGE_ROUTED0(AutoFillHostMsg_DidFillAutoFillFormData)
+// Sent when a form is previewed or filled with Autofill suggestions.
+IPC_MESSAGE_ROUTED0(AutofillHostMsg_DidFillAutofillFormData)
 
 // Instructs the browser to remove the specified Autocomplete entry from the
 // database.
-IPC_MESSAGE_ROUTED2(AutoFillHostMsg_RemoveAutocompleteEntry,
+IPC_MESSAGE_ROUTED2(AutofillHostMsg_RemoveAutocompleteEntry,
                     string16 /* field name */,
                     string16 /* value */)
 
-// Instructs the browser to show the AutoFill dialog.
-IPC_MESSAGE_ROUTED0(AutoFillHostMsg_ShowAutoFillDialog)
+// Instructs the browser to show the Autofill dialog.
+IPC_MESSAGE_ROUTED0(AutofillHostMsg_ShowAutofillDialog)
 
 
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index c8e4abc..0ca971c 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -142,10 +142,10 @@ const char kPasswordManagerEnabled[] = "profile.password_manager_enabled";
 const char kPasswordManagerAllowShowPasswords[] =
     "profile.password_manager_allow_show_passwords";
 
-// OBSOLETE.  Boolean that is true if the form AutoFill is on (will record
+// OBSOLETE.  Boolean that is true if the form Autofill is on (will record
 // values entered in text inputs in forms and shows them in a popup when user
 // type in a text input with the same name later on).  This has been superseded
-// by kAutoFillEnabled.
+// by kAutofillEnabled.
 const char kFormAutofillEnabled[] = "profile.form_autofill_enabled";
 
 // Boolean that is true when SafeBrowsing is enabled.
@@ -646,25 +646,25 @@ const char kDefaultZoomLevel[] = "profile.default_zoom_level";
 // be displayed at the default zoom level.
 const char kPerHostZoomLevels[] = "profile.per_host_zoom_levels";
 
-// Boolean that is true if AutoFill is enabled and allowed to save profile data.
-const char kAutoFillEnabled[] = "autofill.enabled";
+// Boolean that is true if Autofill is enabled and allowed to save profile data.
+const char kAutofillEnabled[] = "autofill.enabled";
 
-// Boolean that is true when auxiliary AutoFill profiles are enabled.
+// Boolean that is true when auxiliary Autofill profiles are enabled.
 // Currently applies to Address Book "me" card on Mac.  False on Win and Linux.
-const char kAutoFillAuxiliaryProfilesEnabled[] =
+const char kAutofillAuxiliaryProfilesEnabled[] =
     "autofill.auxiliary_profiles_enabled";
 
-// Position and size of the AutoFill dialog.
-const char kAutoFillDialogPlacement[] = "autofill.dialog_placement";
+// Position and size of the Autofill dialog.
+const char kAutofillDialogPlacement[] = "autofill.dialog_placement";
 
 // Double that indicates positive (for matched forms) upload rate.
-const char kAutoFillPositiveUploadRate[] = "autofill.positive_upload_rate";
+const char kAutofillPositiveUploadRate[] = "autofill.positive_upload_rate";
 
 // Double that indicates negative (for not matched forms) upload rate.
-const char kAutoFillNegativeUploadRate[] = "autofill.negative_upload_rate";
+const char kAutofillNegativeUploadRate[] = "autofill.negative_upload_rate";
 
 // Boolean option set to true on the first run. Non-persistent.
-const char kAutoFillPersonalDataManagerFirstRun[] = "autofill.pdm.first_run";
+const char kAutofillPersonalDataManagerFirstRun[] = "autofill.pdm.first_run";
 
 // Boolean that is true when the tabstrip is to be laid out vertically down the
 // side of the browser window.
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 8eef3c7..318dc1a 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -230,12 +230,12 @@ extern const char kBlockNonsandboxedPlugins[];
 extern const char kClearSiteDataOnExit[];
 extern const char kDefaultZoomLevel[];
 extern const char kPerHostZoomLevels[];
-extern const char kAutoFillEnabled[];
-extern const char kAutoFillAuxiliaryProfilesEnabled[];
-extern const char kAutoFillDialogPlacement[];
-extern const char kAutoFillPositiveUploadRate[];
-extern const char kAutoFillNegativeUploadRate[];
-extern const char kAutoFillPersonalDataManagerFirstRun[];
+extern const char kAutofillEnabled[];
+extern const char kAutofillAuxiliaryProfilesEnabled[];
+extern const char kAutofillDialogPlacement[];
+extern const char kAutofillPositiveUploadRate[];
+extern const char kAutofillNegativeUploadRate[];
+extern const char kAutofillPersonalDataManagerFirstRun[];
 
 extern const char kUseVerticalTabs[];
 extern const char kEnableTranslate[];
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index f885d54..97498f3 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -186,7 +186,7 @@ const char kGpuInternalsURL[] = "chrome://gpu-internals/";
 
 // Option sub pages.
 const char kAdvancedOptionsSubPage[] =  "advanced";
-const char kAutoFillSubPage[] = "autofill";
+const char kAutofillSubPage[] = "autofill";
 const char kBrowserOptionsSubPage[] =  "browser";
 const char kClearBrowserDataSubPage[] = "clearBrowserData";
 const char kContentSettingsSubPage[] = "content";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 8fc88f2..4a117d7 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -184,7 +184,7 @@ extern const char kGpuInternalsURL[];
 
 // Options sub-pages.
 extern const char kAdvancedOptionsSubPage[];
-extern const char kAutoFillSubPage[];
+extern const char kAutofillSubPage[];
 extern const char kBrowserOptionsSubPage[];
 extern const char kClearBrowserDataSubPage[];
 extern const char kContentSettingsSubPage[];
diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
index 0cb4830..ad3615e 100644
--- a/chrome/renderer/autofill/autofill_agent.cc
+++ b/chrome/renderer/autofill/autofill_agent.cc
@@ -34,13 +34,13 @@ namespace {
 
 // The size above which we stop triggering autofill for an input text field
 // (so to avoid sending long strings through IPC).
-const size_t kMaximumTextSizeForAutoFill = 1000;
+const size_t kMaximumTextSizeForAutofill = 1000;
 
 }  // namespace
 
 namespace autofill {
 
-AutoFillAgent::AutoFillAgent(
+AutofillAgent::AutofillAgent(
     RenderView* render_view,
     PasswordAutofillManager* password_autofill_manager)
     : RenderViewObserver(render_view),
@@ -54,39 +54,39 @@ AutoFillAgent::AutoFillAgent(
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
-AutoFillAgent::~AutoFillAgent() {}
+AutofillAgent::~AutofillAgent() {}
 
-bool AutoFillAgent::OnMessageReceived(const IPC::Message& message) {
+bool AutofillAgent::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(AutoFillAgent, message)
-    IPC_MESSAGE_HANDLER(AutoFillMsg_SuggestionsReturned, OnSuggestionsReturned)
-    IPC_MESSAGE_HANDLER(AutoFillMsg_FormDataFilled, OnFormDataFilled)
+  IPC_BEGIN_MESSAGE_MAP(AutofillAgent, message)
+    IPC_MESSAGE_HANDLER(AutofillMsg_SuggestionsReturned, OnSuggestionsReturned)
+    IPC_MESSAGE_HANDLER(AutofillMsg_FormDataFilled, OnFormDataFilled)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void AutoFillAgent::DidFinishDocumentLoad(WebKit::WebFrame* frame) {
+void AutofillAgent::DidFinishDocumentLoad(WebKit::WebFrame* frame) {
   // The document has now been fully loaded.  Scan for forms to be sent up to
   // the browser.
   form_manager_.ExtractForms(frame);
   SendForms(frame);
 }
 
-void AutoFillAgent::FrameDetached(WebKit::WebFrame* frame) {
+void AutofillAgent::FrameDetached(WebKit::WebFrame* frame) {
   form_manager_.ResetFrame(frame);
 }
 
-void AutoFillAgent::FrameWillClose(WebKit::WebFrame* frame) {
+void AutofillAgent::FrameWillClose(WebKit::WebFrame* frame) {
   form_manager_.ResetFrame(frame);
 }
 
-void AutoFillAgent::FrameTranslated(WebKit::WebFrame* frame) {
+void AutofillAgent::FrameTranslated(WebKit::WebFrame* frame) {
   // The page is translated, so try to extract the form data again.
   DidFinishDocumentLoad(frame);
 }
 
-bool AutoFillAgent::InputElementClicked(const WebInputElement& element,
+bool AutofillAgent::InputElementClicked(const WebInputElement& element,
                                         bool was_focused,
                                         bool is_focused) {
   if (was_focused)
@@ -94,18 +94,18 @@ bool AutoFillAgent::InputElementClicked(const WebInputElement& element,
   return false;
 }
 
-void AutoFillAgent::didAcceptAutoFillSuggestion(const WebKit::WebNode& node,
+void AutofillAgent::didAcceptAutoFillSuggestion(const WebKit::WebNode& node,
                                                 const WebKit::WebString& value,
                                                 const WebKit::WebString& label,
                                                 int unique_id,
                                                 unsigned index) {
-  if (password_autofill_manager_->DidAcceptAutoFillSuggestion(node, value))
+  if (password_autofill_manager_->DidAcceptAutofillSuggestion(node, value))
     return;
 
   if (suggestions_options_index_ != -1 &&
       index == static_cast<unsigned>(suggestions_options_index_)) {
-    // User selected 'AutoFill Options'.
-    Send(new AutoFillHostMsg_ShowAutoFillDialog(routing_id()));
+    // User selected 'Autofill Options'.
+    Send(new AutofillHostMsg_ShowAutofillDialog(routing_id()));
   } else if (suggestions_clear_index_ != -1 &&
              index == static_cast<unsigned>(suggestions_clear_index_)) {
     // User selected 'Clear form'.
@@ -123,30 +123,30 @@ void AutoFillAgent::didAcceptAutoFillSuggestion(const WebKit::WebNode& node,
       webframe->notifiyPasswordListenerOfAutocomplete(element);
   } else {
     // Fill the values for the whole form.
-    FillAutoFillFormData(node, unique_id, AUTOFILL_FILL);
+    FillAutofillFormData(node, unique_id, AUTOFILL_FILL);
   }
 
   suggestions_clear_index_ = -1;
   suggestions_options_index_ = -1;
 }
 
-void AutoFillAgent::didSelectAutoFillSuggestion(const WebKit::WebNode& node,
+void AutofillAgent::didSelectAutoFillSuggestion(const WebKit::WebNode& node,
                                                 const WebKit::WebString& value,
                                                 const WebKit::WebString& label,
                                                 int unique_id) {
   DCHECK_GE(unique_id, 0);
-  if (password_autofill_manager_->DidSelectAutoFillSuggestion(node))
+  if (password_autofill_manager_->DidSelectAutofillSuggestion(node))
     return;
 
   didClearAutoFillSelection(node);
-  FillAutoFillFormData(node, unique_id, AUTOFILL_PREVIEW);
+  FillAutofillFormData(node, unique_id, AUTOFILL_PREVIEW);
 }
 
-void AutoFillAgent::didClearAutoFillSelection(const WebKit::WebNode& node) {
+void AutofillAgent::didClearAutoFillSelection(const WebKit::WebNode& node) {
   form_manager_.ClearPreviewedFormWithNode(node, was_query_node_autofilled_);
 }
 
-void AutoFillAgent::removeAutocompleteSuggestion(
+void AutofillAgent::removeAutocompleteSuggestion(
     const WebKit::WebString& name,
     const WebKit::WebString& value) {
   // The index of clear & options will have shifted down.
@@ -155,26 +155,26 @@ void AutoFillAgent::removeAutocompleteSuggestion(
   if (suggestions_options_index_ != -1)
     suggestions_options_index_--;
 
-  Send(new AutoFillHostMsg_RemoveAutocompleteEntry(routing_id(), name, value));
+  Send(new AutofillHostMsg_RemoveAutocompleteEntry(routing_id(), name, value));
 }
 
-void AutoFillAgent::textFieldDidEndEditing(
+void AutofillAgent::textFieldDidEndEditing(
     const WebKit::WebInputElement& element) {
   password_autofill_manager_->TextFieldDidEndEditing(element);
 }
 
-void AutoFillAgent::textFieldDidChange(const WebKit::WebInputElement& element) {
-  // We post a task for doing the AutoFill as the caret position is not set
+void AutofillAgent::textFieldDidChange(const WebKit::WebInputElement& element) {
+  // We post a task for doing the Autofill as the caret position is not set
   // properly at this point (http://bugs.webkit.org/show_bug.cgi?id=16976) and
   // it is needed to trigger autofill.
   method_factory_.RevokeAll();
   MessageLoop::current()->PostTask(
         FROM_HERE,
         method_factory_.NewRunnableMethod(
-            &AutoFillAgent::TextFieldDidChangeImpl, element));
+            &AutofillAgent::TextFieldDidChangeImpl, element));
 }
 
-void AutoFillAgent::TextFieldDidChangeImpl(
+void AutofillAgent::TextFieldDidChangeImpl(
     const WebKit::WebInputElement& element) {
   if (password_autofill_manager_->TextDidChangeInTextField(element))
     return;
@@ -182,7 +182,7 @@ void AutoFillAgent::TextFieldDidChangeImpl(
   ShowSuggestions(element, false, true, false);
 }
 
-void AutoFillAgent::textFieldDidReceiveKeyDown(
+void AutofillAgent::textFieldDidReceiveKeyDown(
     const WebKit::WebInputElement& element,
     const WebKit::WebKeyboardEvent& event) {
   if (password_autofill_manager_->TextFieldHandlingKeyDown(element, event))
@@ -193,7 +193,7 @@ void AutoFillAgent::textFieldDidReceiveKeyDown(
     ShowSuggestions(element, true, true, true);
 }
 
-void AutoFillAgent::OnSuggestionsReturned(int query_id,
+void AutofillAgent::OnSuggestionsReturned(int query_id,
                                           const std::vector<string16>& values,
                                           const std::vector<string16>& labels,
                                           const std::vector<string16>& icons,
@@ -227,7 +227,7 @@ void AutoFillAgent::OnSuggestionsReturned(int query_id,
   if (ids[0] < 0 && !display_warning_if_disabled_)
     return;
 
-  // Only include "AutoFill Options" special menu item if we have AutoFill
+  // Only include "Autofill Options" special menu item if we have Autofill
   // items, identified by |unique_ids| having at least one valid value.
   bool has_autofill_item = false;
   for (size_t i = 0; i < ids.size(); ++i) {
@@ -240,7 +240,7 @@ void AutoFillAgent::OnSuggestionsReturned(int query_id,
   // The form has been auto-filled, so give the user the chance to clear the
   // form.  Append the 'Clear form' menu item.
   if (has_autofill_item &&
-      form_manager_.FormWithNodeIsAutoFilled(autofill_query_node_)) {
+      form_manager_.FormWithNodeIsAutofilled(autofill_query_node_)) {
     v.push_back(l10n_util::GetStringUTF16(IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM));
     l.push_back(string16());
     i.push_back(string16());
@@ -267,10 +267,10 @@ void AutoFillAgent::OnSuggestionsReturned(int query_id,
         autofill_query_node_, v, l, i, ids, separator_index);
   }
 
-  Send(new AutoFillHostMsg_DidShowAutoFillSuggestions(routing_id()));
+  Send(new AutofillHostMsg_DidShowAutofillSuggestions(routing_id()));
 }
 
-void AutoFillAgent::OnFormDataFilled(int query_id,
+void AutofillAgent::OnFormDataFilled(int query_id,
                                      const webkit_glue::FormData& form) {
   if (!render_view()->webview() || query_id != autofill_query_id_)
     return;
@@ -286,10 +286,10 @@ void AutoFillAgent::OnFormDataFilled(int query_id,
       NOTREACHED();
   }
   autofill_action_ = AUTOFILL_NONE;
-  Send(new AutoFillHostMsg_DidFillAutoFillFormData(routing_id()));
+  Send(new AutofillHostMsg_DidFillAutofillFormData(routing_id()));
 }
 
-void AutoFillAgent::ShowSuggestions(const WebInputElement& element,
+void AutofillAgent::ShowSuggestions(const WebInputElement& element,
                                     bool autofill_on_empty_values,
                                     bool requires_caret_at_end,
                                     bool display_warning_if_disabled) {
@@ -303,7 +303,7 @@ void AutoFillAgent::ShowSuggestions(const WebInputElement& element,
 
   // Don't attempt to autofill with values that are too large.
   WebString value = element.value();
-  if (value.length() > kMaximumTextSizeForAutoFill)
+  if (value.length() > kMaximumTextSizeForAutofill)
     return;
 
   if (!autofill_on_empty_values && value.isEmpty())
@@ -314,10 +314,10 @@ void AutoFillAgent::ShowSuggestions(const WebInputElement& element,
        element.selectionEnd() != static_cast<int>(value.length())))
     return;
 
-  QueryAutoFillSuggestions(element, display_warning_if_disabled);
+  QueryAutofillSuggestions(element, display_warning_if_disabled);
 }
 
-void AutoFillAgent::QueryAutoFillSuggestions(const WebNode& node,
+void AutofillAgent::QueryAutofillSuggestions(const WebNode& node,
                                              bool display_warning_if_disabled) {
   static int query_counter = 0;
   autofill_query_id_ = query_counter++;
@@ -334,13 +334,13 @@ void AutoFillAgent::QueryAutoFillSuggestions(const WebNode& node,
         &field);
   }
 
-  Send(new AutoFillHostMsg_QueryFormFieldAutoFill(
+  Send(new AutofillHostMsg_QueryFormFieldAutofill(
       routing_id(), autofill_query_id_, form, field));
 }
 
-void AutoFillAgent::FillAutoFillFormData(const WebNode& node,
+void AutofillAgent::FillAutofillFormData(const WebNode& node,
                                          int unique_id,
-                                         AutoFillAction action) {
+                                         AutofillAction action) {
   static int query_counter = 0;
   autofill_query_id_ = query_counter++;
 
@@ -351,19 +351,19 @@ void AutoFillAgent::FillAutoFillFormData(const WebNode& node,
 
   autofill_action_ = action;
   was_query_node_autofilled_ = field.is_autofilled;
-  Send(new AutoFillHostMsg_FillAutoFillFormData(
+  Send(new AutofillHostMsg_FillAutofillFormData(
       routing_id(), autofill_query_id_, form, field, unique_id));
 }
 
-void AutoFillAgent::SendForms(WebFrame* frame) {
+void AutofillAgent::SendForms(WebFrame* frame) {
   std::vector<webkit_glue::FormData> forms;
   form_manager_.GetFormsInFrame(frame, FormManager::REQUIRE_NONE, &forms);
 
   if (!forms.empty())
-    Send(new AutoFillHostMsg_FormsSeen(routing_id(), forms));
+    Send(new AutofillHostMsg_FormsSeen(routing_id(), forms));
 }
 
-bool AutoFillAgent::FindFormAndFieldForNode(const WebNode& node,
+bool AutofillAgent::FindFormAndFieldForNode(const WebNode& node,
                                             webkit_glue::FormData* form,
                                             webkit_glue::FormField* field) {
   const WebInputElement& element = node.toConst<WebInputElement>();
diff --git a/chrome/renderer/autofill/autofill_agent.h b/chrome/renderer/autofill/autofill_agent.h
index e41afcd..4dff071 100644
--- a/chrome/renderer/autofill/autofill_agent.h
+++ b/chrome/renderer/autofill/autofill_agent.h
@@ -21,22 +21,22 @@ namespace autofill {
 
 class PasswordAutofillManager;
 
-// AutoFillAgent deals with AutoFill related communications between WebKit and
-// the browser.  There is one AutoFillAgent per RenderView.
+// AutofillAgent deals with Autofill related communications between WebKit and
+// the browser.  There is one AutofillAgent per RenderView.
 // This code was originally part of RenderView.
-// Note that AutoFill encompasses:
+// Note that Autofill encompasses:
 // - single text field suggestions, that we usually refer to as Autocomplete,
-// - password form fill, refered to as password AutoFill, and
-// - entire form fill based on one field entry, referred to as form AutoFill.
+// - password form fill, refered to as password Autofill, and
+// - entire form fill based on one field entry, referred to as form Autofill.
 
-class AutoFillAgent : public RenderViewObserver,
+class AutofillAgent : public RenderViewObserver,
                       public PageClickListener,
                       public WebKit::WebAutoFillClient {
  public:
-  // PasswordAutofillManager is guaranteed to outlive AutoFillAgent.
-  AutoFillAgent(RenderView* render_view,
+  // PasswordAutofillManager is guaranteed to outlive AutofillAgent.
+  AutofillAgent(RenderView* render_view,
                 PasswordAutofillManager* password_autofill_manager);
-  virtual ~AutoFillAgent();
+  virtual ~AutofillAgent();
 
   // WebKit::WebAutoFillClient implementation.  Public for tests.
   virtual void didAcceptAutoFillSuggestion(const WebKit::WebNode& node,
@@ -58,10 +58,10 @@ class AutoFillAgent : public RenderViewObserver,
       const WebKit::WebKeyboardEvent& event);
 
  private:
-  enum AutoFillAction {
+  enum AutofillAction {
     AUTOFILL_NONE,     // No state set.
-    AUTOFILL_FILL,     // Fill the AutoFill form data.
-    AUTOFILL_PREVIEW,  // Preview the AutoFill form data.
+    AUTOFILL_FILL,     // Fill the Autofill form data.
+    AUTOFILL_PREVIEW,  // Preview the Autofill form data.
   };
 
   // RenderView::Observer implementation.
@@ -95,7 +95,7 @@ class AutoFillAgent : public RenderViewObserver,
   // |requires_caret_at_end| specifies whether suggestions should be shown when
   // the caret is not after the last character in |element|.
   // |display_warning_if_disabled| specifies whether a warning should be
-  // displayed to the user if AutoFill has suggestions available, but cannot
+  // displayed to the user if Autofill has suggestions available, but cannot
   // fill them because it is disabled (e.g. when trying to fill a credit card
   // form on a non-secure website).
   void ShowSuggestions(const WebKit::WebInputElement& element,
@@ -103,18 +103,18 @@ class AutoFillAgent : public RenderViewObserver,
                        bool requires_caret_at_end,
                        bool display_warning_if_disabled);
 
-  // Queries the browser for Autocomplete and AutoFill suggestions for the given
+  // Queries the browser for Autocomplete and Autofill suggestions for the given
   // |node|.
-  void QueryAutoFillSuggestions(const WebKit::WebNode& node,
+  void QueryAutofillSuggestions(const WebKit::WebNode& node,
                                 bool display_warning_if_disabled);
 
   // Queries the AutofillManager for form data for the form containing |node|.
   // |value| is the current text in the field, and |unique_id| is the selected
   // profile's unique ID.  |action| specifies whether to Fill or Preview the
   // values returned from the AutofillManager.
-  void FillAutoFillFormData(const WebKit::WebNode& node,
+  void FillAutofillFormData(const WebKit::WebNode& node,
                             int unique_id,
-                            AutoFillAction action);
+                            AutofillAction action);
 
   // Scans the given frame for forms and sends them up to the browser.
   void SendForms(WebKit::WebFrame* frame);
@@ -130,15 +130,15 @@ class AutoFillAgent : public RenderViewObserver,
 
   PasswordAutofillManager* password_autofill_manager_;
 
-  // The ID of the last request sent for form field AutoFill.  Used to ignore
+  // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.
   int autofill_query_id_;
 
-  // The node corresponding to the last request sent for form field AutoFill.
+  // The node corresponding to the last request sent for form field Autofill.
   WebKit::WebNode autofill_query_node_;
 
-  // The action to take when receiving AutoFill data from the AutofillManager.
-  AutoFillAction autofill_action_;
+  // The action to take when receiving Autofill data from the AutofillManager.
+  AutofillAction autofill_action_;
 
   // Should we display a warning if autofill is disabled?
   bool display_warning_if_disabled_;
@@ -149,12 +149,12 @@ class AutoFillAgent : public RenderViewObserver,
   // The menu index of the "Clear" menu item.
   int suggestions_clear_index_;
 
-  // The menu index of the "AutoFill options..." menu item.
+  // The menu index of the "Autofill options..." menu item.
   int suggestions_options_index_;
 
-  ScopedRunnableMethodFactory<AutoFillAgent> method_factory_;
+  ScopedRunnableMethodFactory<AutofillAgent> method_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(AutoFillAgent);
+  DISALLOW_COPY_AND_ASSIGN(AutofillAgent);
 };
 
 }  // namespace autofill
diff --git a/chrome/renderer/autofill/form_autocomplete_browsertest.cc b/chrome/renderer/autofill/form_autocomplete_browsertest.cc
index 15b4c92..30910ab 100644
--- a/chrome/renderer/autofill/form_autocomplete_browsertest.cc
+++ b/chrome/renderer/autofill/form_autocomplete_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -32,11 +32,11 @@ TEST_F(FormAutocompleteTest, NormalFormSubmit) {
   ProcessPendingMessages();
 
   const IPC::Message* message = render_thread_.sink().GetFirstMessageMatching(
-      AutoFillHostMsg_FormSubmitted::ID);
+      AutofillHostMsg_FormSubmitted::ID);
   ASSERT_TRUE(message != NULL);
 
   Tuple1<FormData> forms;
-  AutoFillHostMsg_FormSubmitted::Read(message, &forms);
+  AutofillHostMsg_FormSubmitted::Read(message, &forms);
   ASSERT_EQ(2U, forms.a.fields.size());
 
   webkit_glue::FormField& form_field = forms.a.fields[0];
@@ -63,7 +63,7 @@ TEST_F(FormAutocompleteTest, AutoCompleteOffFormSubmit) {
 
   // No FormSubmitted message should have been sent.
   EXPECT_FALSE(render_thread_.sink().GetFirstMessageMatching(
-      AutoFillHostMsg_FormSubmitted::ID));
+      AutofillHostMsg_FormSubmitted::ID));
 }
 
 // Tests that fields with autocomplete off are not submitted.
@@ -80,11 +80,11 @@ TEST_F(FormAutocompleteTest, AutoCompleteOffInputSubmit) {
 
   // No FormSubmitted message should have been sent.
   const IPC::Message* message = render_thread_.sink().GetFirstMessageMatching(
-      AutoFillHostMsg_FormSubmitted::ID);
+      AutofillHostMsg_FormSubmitted::ID);
   ASSERT_TRUE(message != NULL);
 
   Tuple1<FormData> forms;
-  AutoFillHostMsg_FormSubmitted::Read(message, &forms);
+  AutofillHostMsg_FormSubmitted::Read(message, &forms);
   ASSERT_EQ(1U, forms.a.fields.size());
 
   webkit_glue::FormField& form_field = forms.a.fields[0];
@@ -117,5 +117,5 @@ TEST_F(FormAutocompleteTest, FAILS_DynamicAutoCompleteOffFormSubmit) {
 
   // No FormSubmitted message should have been sent.
   EXPECT_FALSE(render_thread_.sink().GetFirstMessageMatching(
-      AutoFillHostMsg_FormSubmitted::ID));
+      AutofillHostMsg_FormSubmitted::ID));
 }
diff --git a/chrome/renderer/autofill/form_manager.cc b/chrome/renderer/autofill/form_manager.cc
index 86aca3c..7038c21 100644
--- a/chrome/renderer/autofill/form_manager.cc
+++ b/chrome/renderer/autofill/form_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "base/scoped_vector.h"
-#include "base/string_util.h"
 #include "base/stl_util-inl.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
@@ -43,11 +43,11 @@ using WebKit::WebVector;
 
 namespace {
 
-// The number of fields required by AutoFill.  Ideally we could send the forms
-// to AutoFill no matter how many fields are in the forms; however, finding the
+// The number of fields required by Autofill.  Ideally we could send the forms
+// to Autofill no matter how many fields are in the forms; however, finding the
 // label for each field is a costly operation and we can't spare the cycles if
 // it's not necessary.
-const size_t kRequiredAutoFillFields = 3;
+const size_t kRequiredAutofillFields = 3;
 
 // The maximum length allowed for form data.
 const size_t kMaxDataLength = 1024;
@@ -69,7 +69,7 @@ bool IsOptionElement(const WebElement& element) {
   return element.hasTagName("option");
 }
 
-bool IsAutoFillableElement(const WebFormControlElement& element) {
+bool IsAutofillableElement(const WebFormControlElement& element) {
   const WebInputElement* input_element = toWebInputElement(&element);
   return IsTextInput(input_element) || IsSelectElement(element);
 }
@@ -337,7 +337,7 @@ void FormManager::WebFormControlElementToFormField(
   field->name = element.nameForAutofill();
   field->form_control_type = element.formControlType();
 
-  if (!IsAutoFillableElement(element))
+  if (!IsAutofillableElement(element))
     return;
 
   const WebInputElement* input_element = toWebInputElement(&element);
@@ -393,7 +393,7 @@ void FormManager::WebFormControlElementToFormField(
 // static
 string16 FormManager::LabelForElement(const WebFormControlElement& element) {
   // Don't scrape labels for elements we can't possibly autofill anyway.
-  if (!IsAutoFillableElement(element))
+  if (!IsAutofillableElement(element))
     return string16();
 
   WebNodeList labels = element.document().getElementsByTagName("label");
@@ -450,7 +450,7 @@ bool FormManager::WebFormElementToFormData(const WebFormElement& element,
   for (size_t i = 0; i < control_elements.size(); ++i) {
     const WebFormControlElement& control_element = control_elements[i];
 
-    if (!IsAutoFillableElement(control_element))
+    if (!IsAutofillableElement(control_element))
       continue;
 
     const WebInputElement* input_element = toWebInputElement(&control_element);
@@ -542,7 +542,7 @@ void FormManager::ExtractForms(const WebFrame* frame) {
     form_element->form_element.getFormControlElements(control_elements);
     for (size_t j = 0; j < control_elements.size(); ++j) {
       WebFormControlElement element = control_elements[j];
-      if (!IsAutoFillableElement(element))
+      if (!IsAutofillableElement(element))
         continue;
 
       form_element->control_elements.push_back(element);
@@ -574,9 +574,9 @@ void FormManager::GetFormsInFrame(const WebFrame* frame,
     if (form_element->form_element.document().frame() != frame)
       continue;
 
-    // We need at least |kRequiredAutoFillFields| fields before appending this
+    // We need at least |kRequiredAutofillFields| fields before appending this
     // form to |forms|.
-    if (form_element->control_elements.size() < kRequiredAutoFillFields)
+    if (form_element->control_elements.size() < kRequiredAutofillFields)
       continue;
 
     if (requirements & REQUIRE_AUTOCOMPLETE &&
@@ -586,7 +586,7 @@ void FormManager::GetFormsInFrame(const WebFrame* frame,
     FormData form;
     WebFormElementToFormData(
         form_element->form_element, requirements, EXTRACT_VALUE, &form);
-    if (form.fields.size() >= kRequiredAutoFillFields)
+    if (form.fields.size() >= kRequiredAutofillFields)
       forms->push_back(form);
   }
 }
@@ -755,7 +755,7 @@ void FormManager::ResetFrame(const WebFrame* frame) {
   }
 }
 
-bool FormManager::FormWithNodeIsAutoFilled(const WebNode& node) {
+bool FormManager::FormWithNodeIsAutofilled(const WebNode& node) {
   FormElement* form_element = NULL;
   if (!FindCachedFormElementWithNode(node, &form_element))
     return false;
diff --git a/chrome/renderer/autofill/form_manager.h b/chrome/renderer/autofill/form_manager.h
index 0558bbb..212f042 100644
--- a/chrome/renderer/autofill/form_manager.h
+++ b/chrome/renderer/autofill/form_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -120,7 +120,7 @@ class FormManager {
   void ResetFrame(const WebKit::WebFrame* frame);
 
   // Returns true if |form| has any auto-filled fields.
-  bool FormWithNodeIsAutoFilled(const WebKit::WebNode& node);
+  bool FormWithNodeIsAutofilled(const WebKit::WebNode& node);
 
  private:
   // Stores the WebFormElement and the form control elements for a form.
diff --git a/chrome/renderer/autofill/form_manager_browsertest.cc b/chrome/renderer/autofill/form_manager_browsertest.cc
index 57b8e67..7442033 100644
--- a/chrome/renderer/autofill/form_manager_browsertest.cc
+++ b/chrome/renderer/autofill/form_manager_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -15,8 +15,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSelectElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSelectElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #include "webkit/glue/form_data.h"
@@ -2340,7 +2340,7 @@ TEST_F(FormManagerTest, MaxLengthFields) {
 }
 
 // This test re-creates the experience of typing in a field then selecting a
-// profile from the AutoFill suggestions popup.  The field that is being typed
+// profile from the Autofill suggestions popup.  The field that is being typed
 // into should be filled even though it's not technically empty.
 TEST_F(FormManagerTest, FillFormNonEmptyField) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
@@ -2819,7 +2819,7 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithAutofilledInitiatingNode) {
   EXPECT_FALSE(phone.isAutofilled());
 }
 
-TEST_F(FormManagerTest, FormWithNodeIsAutoFilled) {
+TEST_F(FormManagerTest, FormWithNodeIsAutofilled) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\" value=\"Wyatt\"/>"
            "  <INPUT type=\"text\" id=\"lastname\"/>"
@@ -2844,12 +2844,12 @@ TEST_F(FormManagerTest, FormWithNodeIsAutoFilled) {
       web_frame->document().getElementById("firstname").to<WebInputElement>();
 
   // Auto-filled attribute not set yet.
-  EXPECT_FALSE(form_manager.FormWithNodeIsAutoFilled(firstname));
+  EXPECT_FALSE(form_manager.FormWithNodeIsAutofilled(firstname));
 
   // Set the auto-filled attribute.
   firstname.setAutofilled(true);
 
-  EXPECT_TRUE(form_manager.FormWithNodeIsAutoFilled(firstname));
+  EXPECT_TRUE(form_manager.FormWithNodeIsAutofilled(firstname));
 }
 
 TEST_F(FormManagerTest, LabelForElementHidden) {
diff --git a/chrome/renderer/autofill/password_autofill_manager.cc b/chrome/renderer/autofill/password_autofill_manager.cc
index 235e856..1358346 100644
--- a/chrome/renderer/autofill/password_autofill_manager.cc
+++ b/chrome/renderer/autofill/password_autofill_manager.cc
@@ -296,7 +296,7 @@ bool PasswordAutofillManager::TextFieldHandlingKeyDown(
   return true;
 }
 
-bool PasswordAutofillManager::DidAcceptAutoFillSuggestion(
+bool PasswordAutofillManager::DidAcceptAutofillSuggestion(
     const WebKit::WebNode& node,
     const WebKit::WebString& value) {
   WebKit::WebInputElement input;
@@ -311,7 +311,7 @@ bool PasswordAutofillManager::DidAcceptAutoFillSuggestion(
                                  password.fill_data, true, true);
 }
 
-bool PasswordAutofillManager::DidSelectAutoFillSuggestion(
+bool PasswordAutofillManager::DidSelectAutofillSuggestion(
     const WebKit::WebNode& node) {
   WebKit::WebInputElement input;
   PasswordInfo password;
@@ -347,17 +347,17 @@ void PasswordAutofillManager::SendPasswordForms(WebKit::WebFrame* frame,
     return;
 
   if (only_visible) {
-    Send(new AutoFillHostMsg_PasswordFormsVisible(
+    Send(new AutofillHostMsg_PasswordFormsVisible(
         routing_id(), password_forms));
   } else {
-    Send(new AutoFillHostMsg_PasswordFormsFound(routing_id(), password_forms));
+    Send(new AutofillHostMsg_PasswordFormsFound(routing_id(), password_forms));
   }
 }
 
 bool PasswordAutofillManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PasswordAutofillManager, message)
-    IPC_MESSAGE_HANDLER(AutoFillMsg_FillPasswordForm, OnFillPasswordForm)
+    IPC_MESSAGE_HANDLER(AutofillMsg_FillPasswordForm, OnFillPasswordForm)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -459,8 +459,8 @@ bool PasswordAutofillManager::ShowSuggestionPopup(
   std::vector<string16> labels(suggestions.size());
   std::vector<string16> icons(suggestions.size());
   std::vector<int> ids(suggestions.size(), 0);
-  webview->applyAutoFillSuggestions(user_input, suggestions, labels, icons, ids,
-                                    -1);
+  webview->applyAutoFillSuggestions(
+      user_input, suggestions, labels, icons, ids, -1);
   return true;
 }
 
diff --git a/chrome/renderer/autofill/password_autofill_manager.h b/chrome/renderer/autofill/password_autofill_manager.h
index a1e9312..eb671e1 100644
--- a/chrome/renderer/autofill/password_autofill_manager.h
+++ b/chrome/renderer/autofill/password_autofill_manager.h
@@ -40,11 +40,11 @@ class PasswordAutofillManager : public RenderViewObserver,
 
   // Fills the password associated with user name |value|. Returns true if the
   // username and password fields were filled, false otherwise.
-  bool DidAcceptAutoFillSuggestion(const WebKit::WebNode& node,
+  bool DidAcceptAutofillSuggestion(const WebKit::WebNode& node,
                                    const WebKit::WebString& value);
   // A no-op.  No filling happens for selection.  But this method returns
   // true when |node| is fillable by password Autofill.
-  bool DidSelectAutoFillSuggestion(const WebKit::WebNode& node);
+  bool DidSelectAutofillSuggestion(const WebKit::WebNode& node);
 
  private:
   friend class PasswordAutofillManagerTest;
diff --git a/chrome/renderer/autofill/password_autofill_manager_unittest.cc b/chrome/renderer/autofill/password_autofill_manager_unittest.cc
index b11f16c..ac79404 100644
--- a/chrome/renderer/autofill/password_autofill_manager_unittest.cc
+++ b/chrome/renderer/autofill/password_autofill_manager_unittest.cc
@@ -65,7 +65,7 @@ class PasswordAutofillManagerTest : public RenderViewTest {
   // protected.
   void SimulateOnFillPasswordForm(
       const PasswordFormFillData& fill_data) {
-    AutoFillMsg_FillPasswordForm msg(0, fill_data);
+    AutofillMsg_FillPasswordForm msg(0, fill_data);
     password_autofill_->OnMessageReceived(msg);
   }
 
@@ -183,11 +183,11 @@ TEST_F(PasswordAutofillManagerTest, InitialAutocomplete) {
   // The form has been loaded, we should have sent the browser a message about
   // the form.
   const IPC::Message* msg = render_thread_.sink().GetFirstMessageMatching(
-      AutoFillHostMsg_PasswordFormsFound::ID);
+      AutofillHostMsg_PasswordFormsFound::ID);
   ASSERT_TRUE(msg != NULL);
 
   Tuple1<std::vector<PasswordForm> > forms;
-  AutoFillHostMsg_PasswordFormsFound::Read(msg, &forms);
+  AutofillHostMsg_PasswordFormsFound::Read(msg, &forms);
   ASSERT_EQ(1U, forms.a.size());
   PasswordForm password_form = forms.a[0];
   EXPECT_EQ(PasswordForm::SCHEME_HTML, password_form.scheme);
diff --git a/chrome/test/data/autofill/duplicate_profiles_test.html b/chrome/test/data/autofill/duplicate_profiles_test.html
index fd283db..d5f810e 100644
--- a/chrome/test/data/autofill/duplicate_profiles_test.html
+++ b/chrome/test/data/autofill/duplicate_profiles_test.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
   <head>
-    <title>AutoFill Form</title>
+    <title>Autofill Form</title>
   </head>
   <body>
     <form id="merge_dup" method="post">
diff --git a/chrome/test/data/autofill/merge/tools/autofill_merge_common.py b/chrome/test/data/autofill/merge/tools/autofill_merge_common.py
index be4d058..dbce7b3 100644
--- a/chrome/test/data/autofill/merge/tools/autofill_merge_common.py
+++ b/chrome/test/data/autofill/merge/tools/autofill_merge_common.py
@@ -32,7 +32,7 @@ def SerializeProfiles(profiles):
 
 
 def ColumnNameToFieldType(column_name):
-  """Converts the given |column_name| to the corresponding AutoFillField type.
+  """Converts the given |column_name| to the corresponding AutofillField type.
 
   |column_name| should be a string drawn from the column names of the
   autofill_profiles table in the Chromium "Web Data" database.
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index d01cfa3..7ebf2e9 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 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.
 #
@@ -28,7 +28,7 @@
     'all': [
       'autofill',
       # crbug.com/73439
-      '-autofill.AutoFillTest.testFilterMalformedEmailAddresses',
+      '-autofill.AutofillTest.testFilterMalformedEmailAddresses',
       'bookmark_bar',
       'bookmarks',
       'browser',
diff --git a/chrome/test/functional/autofill.py b/chrome/test/functional/autofill.py
index d1667c8..8189a92 100644
--- a/chrome/test/functional/autofill.py
+++ b/chrome/test/functional/autofill.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright (c) 2010 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.
 
@@ -12,7 +12,7 @@ import pyauto_functional  # Must be imported before pyauto
 import pyauto
 
 
-class AutoFillTest(pyauto.PyUITest):
+class AutofillTest(pyauto.PyUITest):
   """Tests that autofill works correctly"""
 
   def Debug(self):
diff --git a/chrome/test/functional/autofill_dataset_converter.py b/chrome/test/functional/autofill_dataset_converter.py
index 458145c..01a311d 100644
--- a/chrome/test/functional/autofill_dataset_converter.py
+++ b/chrome/test/functional/autofill_dataset_converter.py
@@ -1,11 +1,12 @@
 #!/usr/bin/python

+

 # 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.

 

 """Converts profile datasets to dictionary list for Autofill profiles.

 

-Used for test autofill.AutoFillTest.testMergeDuplicateProfilesInAutofill.

+Used for test autofill.AutofillTest.testMergeDuplicateProfilesInAutofill.

 Can be used as a stand alone script with -h to print out help text by running:

 python autofill_dataset_converter.py -h

 """

diff --git a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
index 3c5ec02..3418b8f2 100644
--- a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
@@ -226,21 +226,21 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, kEnableTranslate) {
 }
 
 // TestScribe ID - 425648.
-IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, kAutoFillEnabled) {
+IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, kAutofillEnabled) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAutoFillEnabled),
-            GetPrefs(1)->GetBoolean(prefs::kAutoFillEnabled));
+  ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAutofillEnabled),
+            GetPrefs(1)->GetBoolean(prefs::kAutofillEnabled));
 
-  bool new_kAutoFillEnabled = !GetVerifierPrefs()->GetBoolean(
-      prefs::kAutoFillEnabled);
-  GetVerifierPrefs()->SetBoolean(prefs::kAutoFillEnabled, new_kAutoFillEnabled);
-  GetPrefs(0)->SetBoolean(prefs::kAutoFillEnabled, new_kAutoFillEnabled);
+  bool new_kAutofillEnabled = !GetVerifierPrefs()->GetBoolean(
+      prefs::kAutofillEnabled);
+  GetVerifierPrefs()->SetBoolean(prefs::kAutofillEnabled, new_kAutofillEnabled);
+  GetPrefs(0)->SetBoolean(prefs::kAutofillEnabled, new_kAutofillEnabled);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
-  ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAutoFillEnabled),
-            GetPrefs(0)->GetBoolean(prefs::kAutoFillEnabled));
-  ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAutoFillEnabled),
-            GetPrefs(1)->GetBoolean(prefs::kAutoFillEnabled));
+  ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAutofillEnabled),
+            GetPrefs(0)->GetBoolean(prefs::kAutofillEnabled));
+  ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAutofillEnabled),
+            GetPrefs(1)->GetBoolean(prefs::kAutofillEnabled));
 }
 
 // TestScribe ID - 425666.
@@ -588,28 +588,28 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest,
 }
 
 // TestScribe ID - 433525.
-// The kAutoFillAuxiliaryProfilesEnabled preference key is currently only
+// The kAutofillAuxiliaryProfilesEnabled preference key is currently only
 // synced on Mac and not on Windows or Linux.
 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest,
-                       kAutoFillAuxiliaryProfilesEnabled) {
+                       kAutofillAuxiliaryProfilesEnabled) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled),
-            GetPrefs(1)->GetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled));
+  ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled),
+            GetPrefs(1)->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled));
 
-  GetVerifierPrefs()->SetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled, 0);
-  GetPrefs(0)->SetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled, 1);
+  GetVerifierPrefs()->SetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled, 0);
+  GetPrefs(0)->SetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled, 1);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
 #if defined(OS_MACOSX)
   ASSERT_NE(GetVerifierPrefs()->GetBoolean(
-                                prefs::kAutoFillAuxiliaryProfilesEnabled),
+                                prefs::kAutofillAuxiliaryProfilesEnabled),
             GetPrefs(1)->GetBoolean(
-                         prefs::kAutoFillAuxiliaryProfilesEnabled));
-  ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled),
-            GetPrefs(1)->GetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled));
+                         prefs::kAutofillAuxiliaryProfilesEnabled));
+  ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled),
+            GetPrefs(1)->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled));
 #else
-  ASSERT_NE(GetPrefs(1)->GetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled),
-            GetPrefs(0)->GetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled));
+  ASSERT_NE(GetPrefs(1)->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled),
+            GetPrefs(0)->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled));
 #endif  // OS_MACOSX
 }
 
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index a587dc0..2f7e371 100644
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2010 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.
 
@@ -2453,12 +2453,12 @@ class _GTestTextTestResult(unittest._TextTestResult):
   """A test result class that can print formatted text results to a stream.
 
   Results printed in conformance with gtest output format, like:
-  [ RUN        ] autofill.AutoFillTest.testAutofillInvalid: "test desc."
-  [         OK ] autofill.AutoFillTest.testAutofillInvalid
-  [ RUN        ] autofill.AutoFillTest.testFillProfile: "test desc."
-  [         OK ] autofill.AutoFillTest.testFillProfile
-  [ RUN        ] autofill.AutoFillTest.testFillProfileCrazyCharacters: "Test."
-  [         OK ] autofill.AutoFillTest.testFillProfileCrazyCharacters
+  [ RUN        ] autofill.AutofillTest.testAutofillInvalid: "test desc."
+  [         OK ] autofill.AutofillTest.testAutofillInvalid
+  [ RUN        ] autofill.AutofillTest.testFillProfile: "test desc."
+  [         OK ] autofill.AutofillTest.testFillProfile
+  [ RUN        ] autofill.AutofillTest.testFillProfileCrazyCharacters: "Test."
+  [         OK ] autofill.AutofillTest.testFillProfileCrazyCharacters
   """
   def __init__(self, stream, descriptions, verbosity):
     unittest._TextTestResult.__init__(self, stream, descriptions, verbosity)
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc
index af71771..de4364b 100644
--- a/chrome/test/render_view_test.cc
+++ b/chrome/test/render_view_test.cc
@@ -39,7 +39,7 @@ using WebKit::WebScriptController;
 using WebKit::WebScriptSource;
 using WebKit::WebString;
 using WebKit::WebURLRequest;
-using autofill::AutoFillAgent;
+using autofill::AutofillAgent;
 using autofill::PasswordAutofillManager;
 
 namespace {
@@ -142,10 +142,10 @@ void RenderViewTest::SetUp() {
   mock_keyboard_.reset(new MockKeyboard());
 
   // RenderView doesn't expose it's PasswordAutofillManager or
-  // AutoFillHelper objects, because it has no need to store them directly
+  // AutofillAgent objects, because it has no need to store them directly
   // (they're stored as RenderViewObserver*).  So just create another set.
   password_autofill_ = new PasswordAutofillManager(view_);
-  autofill_agent_ = new AutoFillAgent(view_, password_autofill_);
+  autofill_agent_ = new AutofillAgent(view_, password_autofill_);
 }
 
 void RenderViewTest::TearDown() {
diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h
index 2bc248c..672df2f 100644
--- a/chrome/test/render_view_test.h
+++ b/chrome/test/render_view_test.h
@@ -23,7 +23,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
 namespace autofill {
-class AutoFillAgent;
+class AutofillAgent;
 class PasswordAutofillManager;
 }
 class MockRenderProcess;
@@ -107,7 +107,7 @@ class RenderViewTest : public testing::Test {
   scoped_ptr<SandboxInitWrapper> sandbox_init_wrapper_;
 
   autofill::PasswordAutofillManager* password_autofill_;
-  autofill::AutoFillAgent* autofill_agent_;
+  autofill::AutofillAgent* autofill_agent_;
 };
 
 #endif  // CHROME_TEST_RENDER_VIEW_TEST_H_
diff --git a/chrome/test/webdriver/gtest_text_test_runner.py b/chrome/test/webdriver/gtest_text_test_runner.py
index d86082a..b0e9ed4 100644
--- a/chrome/test/webdriver/gtest_text_test_runner.py
+++ b/chrome/test/webdriver/gtest_text_test_runner.py
@@ -14,12 +14,12 @@ class _GTestTextTestResult(unittest._TextTestResult):
   """A test result class that can print formatted text results to a stream.
 
   Results printed in conformance with gtest output format, like:
-  [ RUN        ] autofill.AutoFillTest.testAutofillInvalid: "test desc."
-  [         OK ] autofill.AutoFillTest.testAutofillInvalid
-  [ RUN        ] autofill.AutoFillTest.testFillProfile: "test desc."
-  [         OK ] autofill.AutoFillTest.testFillProfile
-  [ RUN        ] autofill.AutoFillTest.testFillProfileCrazyCharacters: "Test."
-  [         OK ] autofill.AutoFillTest.testFillProfileCrazyCharacters
+  [ RUN        ] autofill.AutofillTest.testAutofillInvalid: "test desc."
+  [         OK ] autofill.AutofillTest.testAutofillInvalid
+  [ RUN        ] autofill.AutofillTest.testFillProfile: "test desc."
+  [         OK ] autofill.AutofillTest.testFillProfile
+  [ RUN        ] autofill.AutofillTest.testFillProfileCrazyCharacters: "Test."
+  [         OK ] autofill.AutofillTest.testFillProfileCrazyCharacters
   """
   def __init__(self, stream, descriptions, verbosity):
     unittest._TextTestResult.__init__(self, stream, descriptions, verbosity)
diff --git a/content/common/notification_type.h b/content/common/notification_type.h
index 5935f31..74dd32e 100644
--- a/content/common/notification_type.h
+++ b/content/common/notification_type.h
@@ -1200,13 +1200,13 @@ class NotificationType {
     // object.
     GOOGLE_SIGNIN_FAILED,
 
-    // AutoFill Notifications --------------------------------------------------
+    // Autofill Notifications --------------------------------------------------
 
-    // Sent when a popup with AutoFill suggestions is shown in the renderer.
+    // Sent when a popup with Autofill suggestions is shown in the renderer.
     // The source is the corresponding RenderViewHost. There are not details.
     AUTOFILL_DID_SHOW_SUGGESTIONS,
 
-    // Sent when a form is previewed or filled with AutoFill suggestions.
+    // Sent when a form is previewed or filled with Autofill suggestions.
     // The source is the corresponding RenderViewHost. There are not details.
     AUTOFILL_DID_FILL_FORM_DATA,
 
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 73b97d9..404a5ec 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -92,18 +92,18 @@
 #include "content/renderer/notification_provider.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
 #include "content/renderer/plugin_channel_host.h"
-#include "content/renderer/renderer_webapplicationcachehost_impl.h"
-#include "content/renderer/renderer_webstoragenamespace_impl.h"
 #include "content/renderer/render_view_observer.h"
 #include "content/renderer/render_view_visitor.h"
 #include "content/renderer/render_widget_fullscreen.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
+#include "content/renderer/renderer_webapplicationcachehost_impl.h"
+#include "content/renderer/renderer_webstoragenamespace_impl.h"
 #include "content/renderer/speech_input_dispatcher.h"
+#include "content/renderer/web_ui_bindings.h"
 #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/webplugin_delegate_proxy.h"
 #include "content/renderer/websharedworker_proxy.h"
 #include "content/renderer/webworker_proxy.h"
-#include "content/renderer/web_ui_bindings.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_switches.h"
 #include "media/base/message_loop_factory_impl.h"
@@ -279,7 +279,7 @@ using WebKit::WebWindowFeatures;
 using WebKit::WebWorker;
 using WebKit::WebWorkerClient;
 using appcache::WebApplicationCacheHostImpl;
-using autofill::AutoFillAgent;
+using autofill::AutofillAgent;
 using autofill::FormManager;
 using autofill::PasswordAutofillManager;
 using base::Time;
@@ -592,7 +592,7 @@ RenderView::RenderView(RenderThreadBase* render_thread,
   devtools_agent_ = new DevToolsAgent(this);
   PasswordAutofillManager* password_autofill_manager =
       new PasswordAutofillManager(this);
-  AutoFillAgent* autofill_agent = new AutoFillAgent(this,
+  AutofillAgent* autofill_agent = new AutofillAgent(this,
                                                     password_autofill_manager);
 
   webwidget_ = WebView::create(this, devtools_agent_, autofill_agent);
@@ -3012,7 +3012,7 @@ void RenderView::willSubmitForm(WebFrame* frame, const WebFormElement& form) {
           static_cast<FormManager::ExtractMask>(
               FormManager::EXTRACT_VALUE | FormManager::EXTRACT_OPTION_TEXT),
           &form_data)) {
-    Send(new AutoFillHostMsg_FormSubmitted(routing_id_, form_data));
+    Send(new AutofillHostMsg_FormSubmitted(routing_id_, form_data));
   }
 }
 
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 0efb6de..1edf444 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -1050,10 +1050,10 @@ TEST_F(RenderViewTest, SendForms) {
   // Verify that "FormsSeen" sends the expected number of fields.
   ProcessPendingMessages();
   const IPC::Message* message = render_thread_.sink().GetFirstMessageMatching(
-      AutoFillHostMsg_FormsSeen::ID);
+      AutofillHostMsg_FormsSeen::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
-  AutoFillHostMsg_FormsSeen::Param params;
-  AutoFillHostMsg_FormsSeen::Read(message, &params);
+  AutofillHostMsg_FormsSeen::Param params;
+  AutofillHostMsg_FormsSeen::Read(message, &params);
   const std::vector<FormData>& forms = params.a;
   ASSERT_EQ(1UL, forms.size());
   ASSERT_EQ(3UL, forms[0].fields.size());
@@ -1086,9 +1086,9 @@ TEST_F(RenderViewTest, SendForms) {
   WebInputElement firstname =
       document.getElementById("firstname").to<WebInputElement>();
 
-  // Accept suggestion that contains a label.  Labeled items indicate AutoFill
+  // Accept suggestion that contains a label.  Labeled items indicate Autofill
   // as opposed to Autocomplete.  We're testing this distinction below with
-  // the |AutoFillHostMsg_FillAutoFillFormData::ID| message.
+  // the |AutofillHostMsg_FillAutofillFormData::ID| message.
   autofill_agent_->didAcceptAutoFillSuggestion(
       firstname,
       WebKit::WebString::fromUTF8("Johnny"),
@@ -1098,10 +1098,10 @@ TEST_F(RenderViewTest, SendForms) {
 
   ProcessPendingMessages();
   const IPC::Message* message2 = render_thread_.sink().GetUniqueMessageMatching(
-      AutoFillHostMsg_FillAutoFillFormData::ID);
+      AutofillHostMsg_FillAutofillFormData::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message2);
-  AutoFillHostMsg_FillAutoFillFormData::Param params2;
-  AutoFillHostMsg_FillAutoFillFormData::Read(message2, &params2);
+  AutofillHostMsg_FillAutofillFormData::Param params2;
+  AutofillHostMsg_FillAutofillFormData::Read(message2, &params2);
   const FormData& form2 = params2.b;
   ASSERT_EQ(3UL, form2.fields.size());
   EXPECT_TRUE(form2.fields[0].StrictlyEqualsHack(
@@ -1141,7 +1141,7 @@ TEST_F(RenderViewTest, FillFormElement) {
   // Verify that "FormsSeen" isn't sent, as there are too few fields.
   ProcessPendingMessages();
   const IPC::Message* message = render_thread_.sink().GetFirstMessageMatching(
-      AutoFillHostMsg_FormsSeen::ID);
+      AutofillHostMsg_FormsSeen::ID);
   ASSERT_EQ(static_cast<IPC::Message*>(NULL), message);
 
   // Verify that |didAcceptAutoFillSuggestion()| sets the value of the expected
@@ -1164,7 +1164,7 @@ TEST_F(RenderViewTest, FillFormElement) {
 
   ProcessPendingMessages();
   const IPC::Message* message2 = render_thread_.sink().GetUniqueMessageMatching(
-      AutoFillHostMsg_FillAutoFillFormData::ID);
+      AutofillHostMsg_FillAutofillFormData::ID);
 
   // No message should be sent in this case.  |firstname| is filled directly.
   ASSERT_EQ(static_cast<IPC::Message*>(NULL), message2);
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 5b06486..c2e6a58 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -7,10 +7,10 @@
 #pragma once
 
 #include <algorithm>
-#include <string>
-#include <vector>
 #include <map>
 #include <set>
+#include <string>
+#include <vector>
 
 #include "base/format_macros.h"
 #include "base/string16.h"
@@ -67,7 +67,7 @@ enum IPCMessageStart {
   PepperFileMsgStart,
   SpeechInputMsgStart,
   PepperMsgStart,
-  AutoFillMsgStart,
+  AutofillMsgStart,
   SafeBrowsingMsgStart,
   P2PMsgStart,
   SocketStreamMsgStart,