Options/MD Settings: use new prefs to drive import data dialog

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/settings_import_data_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 100 matching lines @@
 
 void ImportDataHandler::ImportData(const base::ListValue* args) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   int browser_index;
   CHECK(args->GetInteger(0, &browser_index));
 
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
 
   uint16_t selected_items = importer::NONE;
-  if (prefs->GetBoolean(prefs::kImportAutofillFormData))
+  if (prefs->GetBoolean(prefs::kImportDialogAutofillFormData))
     selected_items |= importer::AUTOFILL_FORM_DATA;
-  if (prefs->GetBoolean(prefs::kImportBookmarks))
+  if (prefs->GetBoolean(prefs::kImportDialogBookmarks))
     selected_items |= importer::FAVORITES;
-  if (prefs->GetBoolean(prefs::kImportHistory))
+  if (prefs->GetBoolean(prefs::kImportDialogHistory))
     selected_items |= importer::HISTORY;
-  if (prefs->GetBoolean(prefs::kImportSavedPasswords))
+  if (prefs->GetBoolean(prefs::kImportDialogSavedPasswords))
     selected_items |= importer::PASSWORDS;
-  if (prefs->GetBoolean(prefs::kImportSearchEngine))
+  if (prefs->GetBoolean(prefs::kImportDialogSearchEngine))
     selected_items |= importer::SEARCH_ENGINES;
 
   const importer::SourceProfile& source_profile =
       importer_list_->GetSourceProfileAt(browser_index);
   uint16_t supported_items = source_profile.services_supported;
 
   uint16_t imported_items = (selected_items & supported_items);
   if (imported_items) {
     StartImport(source_profile, imported_items);
   } else {
@@ skipping 108 matching lines @@
                                   base::string16(),
                                   base::FilePath(),
                                   &file_type_info,
                                   0,
                                   base::FilePath::StringType(),
                                   browser->window()->GetNativeWindow(),
                                   NULL);
 }
 
 }  // namespace settings