Don't expose --single-process and --in-process-plugins for official Chrome releases.

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

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

5 files changed, 8 insertions, 13 deletions

diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 57d49b9..6f77924 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -318,7 +318,11 @@ int ChromeMain(int argc, const char** argv) {
     PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
 
   bool single_process =
+#if defined (GOOGLE_CHROME_BUILD)
+    false;
+#else
     parsed_command_line.HasSwitch(switches::kSingleProcess);
+#endif
   if (single_process)
     RenderProcessHost::set_run_renderer_in_process(true);
 #if defined(OS_MACOSX)
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 2548d55..4d0849c 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -260,7 +260,9 @@ bool BrowserRenderProcessHost::Init() {
     switches::kRendererStartupDialog,
     switches::kNoSandbox,
     switches::kTestSandbox,
+#if !defined (GOOGLE_CHROME_BUILD)
     switches::kInProcessPlugins,
+#endif
     switches::kDomAutomationController,
     switches::kUserAgent,
     switches::kJavaScriptFlags,
@@ -297,10 +299,12 @@ bool BrowserRenderProcessHost::Init() {
   cmd_line.AppendSwitchWithValue(switches::kLang, locale);
 
   bool in_sandbox = !browser_command_line.HasSwitch(switches::kNoSandbox);
+#if !defined (GOOGLE_CHROME_BUILD)
   if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) {
     // In process plugins won't work if the sandbox is enabled.
     in_sandbox = false;
   }
+#endif
 
 #if defined(OS_WIN)
   bool child_needs_help =
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 2124ba7..b5ef095 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -48,7 +48,6 @@ const wchar_t UITest::kFailedNoCrashService[] =
     L"running. Start it manually before running this test (see the build "
     L"output directory).";
 bool UITest::in_process_renderer_ = false;
-bool UITest::in_process_plugins_ = false;
 bool UITest::no_sandbox_ = false;
 bool UITest::full_memory_dump_ = false;
 bool UITest::safe_plugins_ = false;
@@ -292,8 +291,6 @@ void UITest::LaunchBrowser(const CommandLine& arguments, bool clear_profile) {
   }
   if (in_process_renderer_)
     command_line.AppendSwitch(switches::kSingleProcess);
-  if (in_process_plugins_)
-    command_line.AppendSwitch(switches::kInProcessPlugins);
   if (no_sandbox_)
     command_line.AppendSwitch(switches::kNoSandbox);
   if (full_memory_dump_)
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 1bec6cf..a2f1ce8 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -223,13 +223,6 @@ class UITest : public testing::Test {
     in_process_renderer_ = value;
   }
 
-  // Get/Set a flag to run the plugins in the renderer process when running the
-  // tests.
-  static bool in_process_plugins() { return in_process_plugins_; }
-  static void set_in_process_plugins(bool value) {
-    in_process_plugins_ = value;
-  }
-
   // Get/Set a flag to run the renderer outside the sandbox when running the
   // tests
   static bool no_sandbox() { return no_sandbox_; }
@@ -428,7 +421,6 @@ class UITest : public testing::Test {
   FILETIME test_start_time_;            // Time the test was started
                                         // (so we can check for new crash dumps)
 #endif
-  static bool in_process_plugins_;
   static bool no_sandbox_;
   static bool safe_plugins_;
   static bool full_memory_dump_;        // If true, write full memory dump
diff --git a/chrome/test/ui/ui_test_suite.h b/chrome/test/ui/ui_test_suite.h
index d450a71..4961b3f 100644
--- a/chrome/test/ui/ui_test_suite.h
+++ b/chrome/test/ui/ui_test_suite.h
@@ -21,8 +21,6 @@ class UITestSuite : public ChromeTestSuite {
     const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
     UITest::set_in_process_renderer(
         parsed_command_line.HasSwitch(switches::kSingleProcess));
-    UITest::set_in_process_plugins(
-        parsed_command_line.HasSwitch(switches::kInProcessPlugins));
     UITest::set_no_sandbox(
         parsed_command_line.HasSwitch(switches::kNoSandbox));
     UITest::set_full_memory_dump(