Revert 76840 - Removed GPU plugin....

chrome/app/chrome_main.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/app/chrome_main.h"
 
 #include "app/app_paths.h"
 #include "app/app_switches.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ skipping 499 matching lines @@
   if (command_line.HasSwitch(switches::kDiagnostics)) {
     return DiagnosticsMain(command_line);
   }
 
 #if defined(OS_WIN)
   // Must do this before any other usage of command line!
   if (HasDeprecatedArguments(command_line.command_line_string()))
     return 1;
 #endif
 
+  if (command_line.HasSwitch(switches::kEnableNaCl)) {
+    // NaCl currently requires two flags to run
+    CommandLine* singleton_command_line = CommandLine::ForCurrentProcess();
+    singleton_command_line->AppendSwitch(switches::kEnableGPUPlugin);
+  }
+
   base::ProcessId browser_pid = base::GetCurrentProcId();
   if (SubprocessIsBrowserChild(process_type)) {
 #if defined(OS_WIN) || defined(OS_MACOSX)
     std::string channel_name =
         command_line.GetSwitchValueASCII(switches::kProcessChannelID);
 
     int browser_pid_int;
     base::StringToInt(channel_name, &browser_pid_int);
     browser_pid = static_cast<base::ProcessId>(browser_pid_int);
     DCHECK_NE(browser_pid_int, 0);
@@ skipping 220 matching lines @@
 
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   logging::CleanupChromeLogging();
 
   chrome_main::LowLevelShutdown();
 
   return exit_code;
 }