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

chrome/browser/resources/options/content_settings.js

Index: chrome/browser/resources/options/content_settings.js
diff --git a/chrome/browser/resources/options/content_settings.js b/chrome/browser/resources/options/content_settings.js
index 94faa90440dfb93af95225ceab410cbc3d36ae53..00b48e39e47c78baa778ff3e31e8f706db3d5c7a 100644
--- a/chrome/browser/resources/options/content_settings.js
+++ b/chrome/browser/resources/options/content_settings.js
@@ -1,4 +1,4 @@
-// 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.
 
@@ -65,9 +65,6 @@ cr.define('options', function() {
         OptionsPage.navigateToPage('cookies');
       };
 
-      if (!templateData.enable_click_to_play)
-        $('click_to_play').hidden = true;
-
       if (!templateData.enable_web_intents && $('intent-section'))
         $('intent-section').hidden = true;
     },