Move click-to-play to about:flags.

chrome/renderer/render_view.cc

Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 9b0a283c2b0ff4289bd6aa94f05cd8cd07f420f6..28d0f8699ed7d6b8bd23df7c6b9e3bc76ef6724b 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2726,12 +2726,7 @@ bool RenderView::allowImages(WebFrame* frame, bool enabled_per_settings) {
 }
 
 bool RenderView::allowPlugins(WebFrame* frame, bool enabled_per_settings) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableClickToPlay)) {
-    return WebFrameClient::allowPlugins(frame, enabled_per_settings);
-  }
-  return enabled_per_settings &&
-      AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS);
+  return WebFrameClient::allowPlugins(frame, enabled_per_settings);
 }