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

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2011 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/chrome_content_browser_client.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 613 matching lines @@
       switches::kAllowLegacyExtensionManifests,
       switches::kAllowNaClSocketAPI,
       switches::kAllowScriptingGallery,
       switches::kAppsCheckoutURL,
       switches::kAppsGalleryURL,
       switches::kCloudPrintServiceURL,
       switches::kDebugPrint,
       switches::kDisablePrintPreview,
       switches::kDomAutomationController,
       switches::kDumpHistogramsOnExit,
-      switches::kEnableClickToPlay,
+      switches::kEnableBenchmarking,
       switches::kEnableCrxlessWebApps,
       switches::kEnableExperimentalExtensionApis,
       switches::kEnableInBrowserThumbnailing,
       switches::kEnableIPCFuzzing,
       switches::kEnableLazyBackgroundPages,
       switches::kEnableNaCl,
       switches::kEnablePlatformApps,
       switches::kEnablePrintPreview,
       switches::kEnableSearchProviderApiV2,
       switches::kEnableWatchdog,
@@ skipping 567 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome