MD Settings: Hook up import data dialog.

chrome/browser/ui/webui/settings/settings_import_data_handler.cc

Index: chrome/browser/ui/webui/settings/settings_import_data_handler.cc
diff --git a/chrome/browser/ui/webui/settings/settings_import_data_handler.cc b/chrome/browser/ui/webui/settings/settings_import_data_handler.cc
index 13e66cd9dfe9820f6351ab3ac59baaefae5af7c5..ced4cd230ecb22c4216be71dbd58e8e1e3e257d6 100644
--- a/chrome/browser/ui/webui/settings/settings_import_data_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_import_data_handler.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
@@ -111,31 +112,22 @@ void ImportDataHandler::StartImport(
 void ImportDataHandler::ImportData(const base::ListValue* args) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  std::string string_value;
-
   int browser_index;
-  if (!args->GetString(0, &string_value) ||
-      !base::StringToInt(string_value, &browser_index)) {
-    NOTREACHED();
-    return;
-  }
+  CHECK(args->GetInteger(0, &browser_index));
+
+  PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
 
   uint16_t selected_items = importer::NONE;
-  if (args->GetString(1, &string_value) && string_value == "true") {
-    selected_items |= importer::HISTORY;
-  }
-  if (args->GetString(2, &string_value) && string_value == "true") {
+  if (prefs->GetBoolean(prefs::kImportAutofillFormData))

[gab, 2017/02/23 20:57:30]

Hooking onto those prefs is wrong. Those are driving first run auto import.
Policies set for those shouldn't drive the import UI and even less honor first
run auto import's policies...

If you want prefs, you'll need new ones.

But I don't even think that's necessary... this UI is expected to be used only
once per user and I don't think the checkboxes have to be sticky, they're not
settings on their own, they're controls for a manual import and each import is
an independent action.

Filed http://crbug.com/695611, please address.

+    selected_items |= importer::AUTOFILL_FORM_DATA;
+  if (prefs->GetBoolean(prefs::kImportBookmarks))
     selected_items |= importer::FAVORITES;
-  }
-  if (args->GetString(3, &string_value) && string_value == "true") {
+  if (prefs->GetBoolean(prefs::kImportHistory))
+    selected_items |= importer::HISTORY;
+  if (prefs->GetBoolean(prefs::kImportSavedPasswords))
     selected_items |= importer::PASSWORDS;
-  }
-  if (args->GetString(4, &string_value) && string_value == "true") {

[gab, 2017/02/23 20:57:30]

Looks like import_data_overlay.js still has code to send these args even though
they're no longer honored...

            String($('import-browsers').selectedIndex),
            String($('import-history').checked),
            String($('import-favorites').checked),
            String($('import-passwords').checked),
            String($('import-search').checked),
            String($('import-autofill-form-data').checked)]);

that confused me when trying to figure out this code, please clean up.

+  if (prefs->GetBoolean(prefs::kImportSearchEngine))
     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);