Reintegrate 552 r66225-r66645....

chrome/browser/renderer_host/browser_render_process_host.cc

 // Copyright (c) 2010 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 
 #include <algorithm>
@@ skipping 598 matching lines @@
 #if defined(OS_MACOSX)
     // Allow this to be set when invoking the browser and relayed along.
     switches::kEnableSandboxLogging,
     switches::kDisableFlashCoreAnimation,
 #endif
     switches::kRemoteShellPort,
     switches::kEnablePepperTesting,
     switches::kBlockNonSandboxedPlugins,
     switches::kDisableOutdatedPlugins,
     switches::kEnableRemoting,
-    switches::kDisableClickToPlay,
+    switches::kEnableClickToPlay,
     switches::kEnableResourceContentSettings,
     switches::kPrelaunchGpuProcess,
     switches::kEnableAcceleratedDecoding,
     switches::kEnableMatchPreview,
     switches::kDisableFileSystem
   };
   renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
                                  arraysize(kSwitchNames));
 
   // Disable databases in incognito mode.
@@ skipping 511 matching lines @@
         IPC::InvalidPlatformFileForTransit(),
         std::vector<std::string>(),
         std::string(),
         false));
   }
 }
 
 void BrowserRenderProcessHost::EnableAutoSpellCorrect(bool enable) {
   Send(new ViewMsg_SpellChecker_EnableAutoSpellCorrect(enable));
 }