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

chrome/browser/content_settings/host_content_settings_map.cc

 // 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.
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 312 matching lines @@
   // DEFAULT, ALLOW and BLOCK are always allowed.
   if (setting == CONTENT_SETTING_DEFAULT ||
       setting == CONTENT_SETTING_ALLOW ||
       setting == CONTENT_SETTING_BLOCK) {
     return true;
   }
   switch (content_type) {
     case CONTENT_SETTINGS_TYPE_COOKIES:
       return setting == CONTENT_SETTING_SESSION_ONLY;
     case CONTENT_SETTINGS_TYPE_PLUGINS:
-      return setting == CONTENT_SETTING_ASK &&
-             CommandLine::ForCurrentProcess()->HasSwitch(
-                 switches::kEnableClickToPlay);
+      return setting == CONTENT_SETTING_ASK;

[Peter Kasting, 2012/01/30 20:35:22]

Nit: Just remove this line and group with the 4 below.

[Bernhard Bauer, 2012/01/30 20:56:47]

Done.

     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
     case CONTENT_SETTINGS_TYPE_INTENTS:
     case CONTENT_SETTINGS_TYPE_MOUSELOCK:
       return setting == CONTENT_SETTING_ASK;
     default:
       return false;
   }
 }
 
@@ skipping 109 matching lines @@
     }
   }
 
   if (info) {
     info->source = content_settings::SETTING_SOURCE_NONE;
     info->primary_pattern = ContentSettingsPattern();
     info->secondary_pattern = ContentSettingsPattern();
   }
   return NULL;
 }