Options: Two fixes for Autofill lists.

chrome/browser/resources/options/inline_editable_list.js

 // Copyright (c) 2011 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('options', function() {
   const DeletableItem = options.DeletableItem;
   const DeletableItemList = options.DeletableItemList;
 
   /**
    * Creates a new list item with support for inline editing.
@@ skipping 124 matching lines @@
         var focusElement = this.editClickTarget_ || this.initialFocusElement;
         this.editClickTarget_ = null;
 
         // When this is called in response to the selectedChange event,
         // the list grabs focus immediately afterwards. Thus we must delay
         // our focus grab.
         var self = this;
         if (focusElement) {
           window.setTimeout(function() {
             // Make sure we are still in edit mode by the time we execute.
-            if (self.editing) {
+            if (self.editing && self.focusPlaceholder) {
               focusElement.focus();
               focusElement.select();
             }
           }, 50);
         }
       } else {
         if (!this.editCancelled_ && this.hasBeenEdited &&
             this.currentInputIsValid) {
           if (this.isPlaceholder)
             this.parentNode.focusPlaceholder = true;
@@ skipping 90 matching lines @@
         inputEl.setAttribute('displaymode', 'edit');
         inputEl.staticVersion = textEl;
       } else {
         // At this point |this| is not attached to the parent list yet, so give
         // a short timeout in order for the attachment to occur.
         var self = this;
         window.setTimeout(function() {
           var list = self.parentNode;
           if (list && list.focusPlaceholder) {
             list.focusPlaceholder = false;
-            inputEl.focus();
+            if (list.shouldFocusPlaceholder())
+              inputEl.focus();
           }
         }, 50);
       }
 
       inputEl.addEventListener('focus', this.handleFocus_.bind(this));
       container.appendChild(inputEl);
       this.editFields_.push(inputEl);
 
       return container;
     },
@@ skipping 133 matching lines @@
      */
     handleListFocusChange_: function(e) {
       var leadItem = this.getListItemByIndex(this.selectionModel.leadIndex);
       if (leadItem) {
         if (e.newValue)
           leadItem.updateEditState();
         else
           leadItem.editing = false;
       }
     },
+
+    /**
+     * May be overridden by subclasses to disable focusing the placeholder.
+     * @return true if the placeholder element should be focused on edit commit.
+     */
+    shouldFocusPlaceholder: function() {
+      return true;
+    },
   };
 
   // Export
   return {
     InlineEditableItem: InlineEditableItem,
     InlineEditableItemList: InlineEditableItemList,
   };
 });