Merge 119773 - Move click-to-play out of chrome://flags.

chrome/browser/resources/options/content_settings_exceptions_area.js

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.contentSettings', function() {
   const InlineEditableItemList = options.InlineEditableItemList;
   const InlineEditableItem = options.InlineEditableItem;
   const ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
    * Creates a new exceptions list item.
@@ skipping 342 matching lines @@
           this.contentType = parentNode.getAttribute('contentType');
           break;
         }
       }
 
       this.mode = this.getAttribute('mode');
 
       var exceptionList = this;
 
       // Whether the exceptions in this list allow an 'Ask every time' option.
-      this.enableAskOption = (this.contentType == 'plugins' &&
-                              templateData.enable_click_to_play);
+      this.enableAskOption = this.contentType == 'plugins';
 
       this.autoExpands = true;
       this.reset();
     },
 
     /**
      * Creates an item to go in the list.
      * @param {Object} entry The element from the data model for this row.
      */
     createItem: function(entry) {
@@ skipping 167 matching lines @@
     }
   };
 
   return {
     ExceptionsListItem: ExceptionsListItem,
     ExceptionsAddRowListItem: ExceptionsAddRowListItem,
     ExceptionsList: ExceptionsList,
     ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
   };
 });