Implement "Autofill form data" import for Firefox

chrome/browser/ui/webui/options/import_data_handler.cc

Index: chrome/browser/ui/webui/options/import_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index 5b38dc0e16c4257c437fae1b6ce200e47b693c54..4fe6fa4267f839e4474f1afd3517e0cabd13c21d 100644
--- a/chrome/browser/ui/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -55,20 +55,21 @@ void ImportDataHandler::GetLocalizedValues(
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
-    { "importFromLabel", IDS_IMPORT_FROM_LABEL },
-    { "importLoading", IDS_IMPORT_LOADING_PROFILES },
-    { "importDescription", IDS_IMPORT_ITEMS_LABEL },
-    { "importHistory", IDS_IMPORT_HISTORY_CHKBOX },
-    { "importFavorites", IDS_IMPORT_FAVORITES_CHKBOX },
-    { "importSearch", IDS_IMPORT_SEARCH_ENGINES_CHKBOX },
-    { "importPasswords", IDS_IMPORT_PASSWORDS_CHKBOX },
-    { "importChooseFile", IDS_IMPORT_CHOOSE_FILE },
-    { "importCommit", IDS_IMPORT_COMMIT },
-    { "noProfileFound", IDS_IMPORT_NO_PROFILE_FOUND },
-    { "importSucceeded", IDS_IMPORT_SUCCEEDED },
-    { "findYourImportedBookmarks", IDS_IMPORT_FIND_YOUR_BOOKMARKS },
+    {"importFromLabel", IDS_IMPORT_FROM_LABEL},

[Ilya Sherman, 2014/08/20 05:47:41]

nit: Are the diffs in these lines a result of running "git cl format" (or in
line with what that tool would output)?  If not, please revert the diffs.  (IMO,
either style is fine; but the code review tool makes these diffs look more
significant than they are, which makes them a red herring for this CL.  Hence,
I'd only include this change if the clang format tool is more opinionated than I
am about which style is correct.)

[Nikhil, 2014/08/20 11:29:17]

Yep, this is a result of running "git cl format".

+    {"importLoading", IDS_IMPORT_LOADING_PROFILES},
+    {"importDescription", IDS_IMPORT_ITEMS_LABEL},
+    {"importHistory", IDS_IMPORT_HISTORY_CHKBOX},
+    {"importFavorites", IDS_IMPORT_FAVORITES_CHKBOX},
+    {"importSearch", IDS_IMPORT_SEARCH_ENGINES_CHKBOX},
+    {"importPasswords", IDS_IMPORT_PASSWORDS_CHKBOX},
+    {"importAutofillFormData", IDS_IMPORT_AUTOFILL_FORM_DATA_CHKBOX},
+    {"importChooseFile", IDS_IMPORT_CHOOSE_FILE},
+    {"importCommit", IDS_IMPORT_COMMIT},
+    {"noProfileFound", IDS_IMPORT_NO_PROFILE_FOUND},
+    {"importSucceeded", IDS_IMPORT_SUCCEEDED},
+    {"findYourImportedBookmarks", IDS_IMPORT_FIND_YOUR_BOOKMARKS},
 #if defined(OS_MACOSX)
-    { "macPasswordKeychain", IDS_IMPORT_PASSWORD_KEYCHAIN_WARNING },
+    {"macPasswordKeychain", IDS_IMPORT_PASSWORD_KEYCHAIN_WARNING},
 #endif
   };
 
@@ -152,6 +153,9 @@ void ImportDataHandler::ImportData(const base::ListValue* args) {
   if (args->GetString(4, &string_value) && string_value == "true") {
     selected_items |= importer::SEARCH_ENGINES;
   }
+  if (args->GetString(5, &string_value) && string_value == "true") {
+    selected_items |= importer::AUTOFILL_FORM_DATA;
+  }
 
   const importer::SourceProfile& source_profile =
       importer_list_->GetSourceProfileAt(browser_index);
@@ -186,6 +190,9 @@ void ImportDataHandler::InitializePage() {
         (browser_services & importer::PASSWORDS) != 0);
     browser_profile->SetBoolean("search",
         (browser_services & importer::SEARCH_ENGINES) != 0);
+    browser_profile->SetBoolean(
+        "autofillformdata",

[Ilya Sherman, 2014/08/20 05:47:41]

nit: Even though the style above is wrong, please match it (or update all of the
lines to use the more correct style).

[Nikhil, 2014/08/20 11:29:16]

This was result of "git cl format". I've matched it with above.

[Ilya Sherman, 2014/08/20 20:47:22]

Yep, I think "git cl format" did the right thing for this line, but it's odd
given that the other lines use a different format.  It would be good to fix up
the formatting for all of these lines as a small follow-up CL.

[Nikhil, 2014/08/21 07:35:36]

Acknowledged.

+        (browser_services & importer::AUTOFILL_FORM_DATA) != 0);
 
     browser_profile->SetBoolean("show_bottom_bar",
 #if defined(OS_MACOSX)