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

chrome/test/data/webui/settings/import_data_dialog_test.js

 // 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.
 
 /**
  * @constructor
  * @implements {settings.ImportDataBrowserProxy}
  * @extends {settings.TestBrowserProxy}
  */
 var TestImportDataBrowserProxy = function() {
@@ skipping 57 matching lines @@
 
   function createBooleanPref(name) {
     return {
       key: name,
       type: chrome.settingsPrivate.PrefType.BOOLEAN,
       value: true,
     };
   }
 
   var prefs = {};
-  [
-    'import_history',
-    'import_bookmarks',
-    'import_saved_passwords',
-    'import_search_engine',
-    'import_autofill_form_data',
+  ['import_dialog_history', 'import_dialog_bookmarks',
+   'import_dialog_saved_passwords', 'import_dialog_search_engine',
+   'import_dialog_autofill_form_data',
   ].forEach(function(name) {
     prefs[name] = createBooleanPref(name);
   });
 
   var dialog = null;
 
   setup(function() {
     browserProxy = new TestImportDataBrowserProxy();
     browserProxy.setBrowserProfiles(browserProfiles);
     settings.ImportDataBrowserProxyImpl.instance_ = browserProxy;
@@ skipping 27 matching lines @@
     // Flip all prefs to false.
     Object.keys(prefs).forEach(function(prefName) {
       dialog.set('prefs.' + prefName + '.value', false);
     });
     assertTrue(dialog.$.import.disabled);
 
     // Change browser selection to "Import from Bookmarks HTML file".
     simulateBrowserProfileChange(1);
     assertTrue(dialog.$.import.disabled);
 
-    // Ensure everything except |import_bookmarks| is ignored.
-    dialog.set('prefs.import_history.value', true);
+    // Ensure everything except |import_dialog_bookmarks| is ignored.
+    dialog.set('prefs.import_dialog_history.value', true);
     assertTrue(dialog.$.import.disabled);
 
-    dialog.set('prefs.import_bookmarks.value', true);
+    dialog.set('prefs.import_dialog_bookmarks.value', true);
     assertFalse(dialog.$.import.disabled);
   });
 
   function assertInProgressButtons() {
     assertFalse(dialog.$.import.hidden);
     assertTrue(dialog.$.import.disabled);
     assertFalse(dialog.$.cancel.hidden);
     assertTrue(dialog.$.cancel.disabled);
     assertTrue(dialog.$.done.hidden);
     assertTrue(dialog.$$('paper-spinner').active);
@@ skipping 22 matching lines @@
 
       simulateImportStatusChange(settings.ImportDataStatus.SUCCEEDED);
       assertSucceededButtons();
 
       assertFalse(dialog.$.successIcon.parentElement.hidden);
       assertFalse(dialog.$$('settings-toggle-button').parentElement.hidden);
     });
   });
 
   test('ImportFromBrowserProfile', function() {
-    dialog.set('prefs.import_bookmarks.value', false);
+    dialog.set('prefs.import_dialog_bookmarks.value', false);
 
     var expectedIndex = 0;
     simulateBrowserProfileChange(expectedIndex);
     MockInteractions.tap(dialog.$.import);
     return browserProxy.whenCalled('importData').then(function(actualIndex) {
       assertEquals(expectedIndex, actualIndex);
 
       simulateImportStatusChange(settings.ImportDataStatus.IN_PROGRESS);
       assertInProgressButtons();
 
       simulateImportStatusChange(settings.ImportDataStatus.SUCCEEDED);
       assertSucceededButtons();
 
       assertFalse(dialog.$.successIcon.parentElement.hidden);
       assertTrue(dialog.$$('settings-toggle-button').parentElement.hidden);
     });
   });
 
   test('ImportError', function() {
     simulateImportStatusChange(settings.ImportDataStatus.FAILED);
     assertFalse(dialog.$.dialog.open);
   });
 });