MD Settings: Fix editing name of default search engine.

chrome/test/data/webui/settings/search_engines_page_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.
 
 cr.define('settings_search_engines_page', function() {
   /**
    * @param {boolean} canBeDefault
    * @param {boolean} canBeEdited
    * @param {boolean} canBeRemoved
    * @return {!SearchEngine}
    */
   var createSampleSearchEngine = function(
       canBeDefault, canBeEdited, canBeRemoved) {
     return {
       canBeDefault: canBeDefault,
       canBeEdited: canBeEdited,
       canBeRemoved: canBeRemoved,
       default: false,
-      displayName: "Google",
+      displayName: "Google displayName",
       iconURL: "http://www.google.com/favicon.ico",
       isOmniboxExtension: false,
       keyword: "google.com",
       modelIndex: 0,
       name: "Google",
       url: "https://search.foo.com/search?p=%s",
       urlLocked: false,
     };
   };
 
   /** @return {!SearchEngine} */
   var createSampleOmniboxExtension = function() {
     return {
       canBeDefault: false,
       canBeEdited: false,
       canBeRemoved: false,
       default: false,
-      displayName: "Omnibox extension",
+      displayName: "Omnibox extension displayName",
       extension: {
         icon: "chrome://extension-icon/some-extension-icon",
         id: "dummyextensionid",
         name: "Omnibox extension"
       },
       isOmniboxExtension: true,
       keyword: "oe",
       modelIndex: 6,
       name: "Omnibox extension",
       url: "chrome-extension://dummyextensionid/?q=%s",
@@ skipping 88 matching lines @@
       });
 
     });
   }
 
   function registerSearchEngineEntryTests() {
     suite('SearchEngineEntryTests', function() {
       /** @type {?SettingsSearchEngineEntryElement} */
       var entry = null;
 
+      /** @type {!settings_search.TestSearchEnginesBrowserProxy} */
       var browserProxy = null;
 
+      /** @type {!SearchEngine} */
+      var searchEngine = createSampleSearchEngine(true, true, true);
+
       setup(function() {
         browserProxy = new settings_search.TestSearchEnginesBrowserProxy();
         settings.SearchEnginesBrowserProxyImpl.instance_ = browserProxy;
         PolymerTest.clearBody();
         entry = document.createElement('settings-search-engine-entry');
-        entry.set('engine', createSampleSearchEngine(true, true, true));
+        entry.set('engine', searchEngine);
         document.body.appendChild(entry);
       });
 
       teardown(function() { entry.remove(); });
 
+      // Test that the <search-engine-entry> is populated according to its
+      // underlying SearchEngine model.
+      test('Initialization', function() {
+        var nameElement = entry.$$('.name');
+        assertTrue(!!nameElement);
+        assertEquals(searchEngine.displayName, nameElement.textContent);
+
+        var keywordElement = entry.$$('.keyword-column');
+        assertTrue(!!keywordElement);
+        assertEquals(searchEngine.keyword, keywordElement.textContent);
+
+        var urlElement = entry.$$('.url-column');
+        assertTrue(!!urlElement);
+        assertEquals(searchEngine.url, urlElement.textContent);
+      });
+
       test('Remove_Enabled', function() {
         var deleteButton = entry.$.delete;
         assertTrue(!!deleteButton);
         assertFalse(deleteButton.hidden);
         MockInteractions.tap(deleteButton);
         return browserProxy.whenCalled('removeSearchEngine').then(
             function(modelIndex) {
               assertEquals(entry.engine.modelIndex, modelIndex);
             });
       });
@@ skipping 15 matching lines @@
         assertTrue(!!editButton);
         assertFalse(editButton.hidden);
         MockInteractions.tap(editButton);
         return browserProxy.whenCalled('searchEngineEditStarted').then(
             function(modelIndex) {
               assertEquals(engine.modelIndex, modelIndex);
               var dialog = entry.$$('settings-search-engine-dialog');
               assertTrue(!!dialog);
 
               // Check that the paper-input fields are pre-populated.
-              assertEquals(engine.displayName, dialog.$.searchEngine.value);
+              assertEquals(engine.name, dialog.$.searchEngine.value);
               assertEquals(engine.keyword, dialog.$.keyword.value);
               assertEquals(engine.url, dialog.$.queryUrl.value);
 
               assertFalse(dialog.$.actionButton.disabled);
             });
       });
 
       /**
        * Checks that the given button is disabled (by being hidden), for the
        * given search engine.
@@ skipping 132 matching lines @@
 
   return {
     registerTests: function() {
       registerDialogTests();
       registerSearchEngineEntryTests();
       registerOmniboxExtensionEntryTests();
       registerPageTests();
     },
   };
 });