Added --in-process-webgl command line argument to select the WebGL

implementation which runs in process rather than making the decision
based on the presence of --no-sandbox. Made this argument implicitly
disable the sandbox. Added it as an unsupported command line argument
so it pops up the infobar.

BUG=39721
TEST=ran WebGL demos on Mac and Windows with and without --in-process-webgl

Review URL: http://codereview.chromium.org/1599034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44729 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 1 deletions

diff --git a/chrome/common/sandbox_init_wrapper_mac.cc b/chrome/common/sandbox_init_wrapper_mac.cc
index 3ed61ed..8b98a54 100644
--- a/chrome/common/sandbox_init_wrapper_mac.cc
+++ b/chrome/common/sandbox_init_wrapper_mac.cc
@@ -26,7 +26,13 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
     // TODO(msneck): Remove the use of Unix sockets from Native Client and
     // then get rid of the SANDBOX_TYPE_NACL_PLUGIN enum.
     // See http://code.google.com/p/nativeclient/issues/detail?id=344
-    if (command_line.HasSwitch(switches::kInternalNaCl)) {
+    if (command_line.HasSwitch(switches::kEnableExperimentalWebGL) &&
+        command_line.HasSwitch(switches::kInProcessWebGL)) {
+      // TODO(kbr): this check seems to be necessary only on this
+      // platform because the sandbox is initialized later. Remove
+      // this once this flag is removed.
+      return true;
+    } else if (command_line.HasSwitch(switches::kInternalNaCl)) {
       sandbox_process_type = sandbox::SANDBOX_TYPE_NACL_PLUGIN;
     } else {
       sandbox_process_type = sandbox::SANDBOX_TYPE_RENDERER;