Clear SingleProcess and InProcessGPU logic.

content/shell/app/shell_main_delegate.cc

Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 7f1d570adeb1f7d2ee6d09429730b2cdae306ed7..16082afbaa4a859def519961f6b317c2545f3265 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -176,6 +176,19 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
     command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
 #endif
 
+#if defined(CHROME_MULTIPLE_DLL_BROWSER)
+    if (command_line.HasSwitch(switches::kSingleProcess)) {
+      command_line.RemoveSwitch(switches::kSingleProcess);
+      LOG(ERROR) <<
+          "--single-process is not supported in chrome multiple dll browser.";
+    }
+    if (command_line.HasSwitch(switches::kInProcessGPU)) {
+      command_line.RemoveSwitch(switches::kInProcessGPU);
+      LOG(ERROR) <<
+          "--in-process-gpu is not supported in chrome multiple dll browser.";
+    }
+#endif

[dshwang, 2013/11/11 13:50:47]

How about this code? It looks good to me. :)

+
     net::CookieMonster::EnableFileScheme();
 
     // Unless/until WebM files are added to the media layout tests, we need to