Reintegrate 552 r66225-r66645....

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 66866)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -162,9 +162,6 @@
 // Disable support for cached byte-ranges.
 const char kDisableByteRangeSupport[]       = "disable-byte-range-support";
 
-// Disable click-to-play for blocked plug-ins.
-const char kDisableClickToPlay[]            = "disable-click-to-play";
-
 // Disables establishing a backup TCP connection if a specified timeout is
 // exceeded.
 const char kDisableConnectBackupJobs[]      = "disable-connect-backup-jobs";
@@ -393,6 +390,9 @@
 // until there's a server endpoint deployed.
 const char kEnableClearServerData[]         = "enable-clear-server-data";
 
+// Enable click-to-play for blocked plug-ins.
+const char kEnableClickToPlay[]            = "enable-click-to-play";
+
 // This applies only when the process type is "service". Enables the
 // Cloud Print Proxy component within the service process.
 const char kEnableCloudPrintProxy[]         = "enable-cloud-print-proxy";