Clear SingleProcess and InProcessGPU logic.

content/shell/app/shell_main_delegate.cc

 // Copyright (c) 2012 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 "content/shell/app/shell_main_delegate.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
@@ skipping 158 matching lines @@
     }
 
     command_line.AppendSwitch(switches::kEnableInbandTextTracks);
     command_line.AppendSwitch(switches::kMuteAudio);
 
 #if defined(USE_AURA)
     // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer.
     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
     // avoid removing MP4/H264/AAC so that layout tests can run on Android.
 #if !defined(OS_ANDROID)
     net::RemoveProprietaryMediaTypesAndCodecsForTests();
 #endif
 
     if (!WebKitTestPlatformInitialize()) {
       if (exit_code)
@@ skipping 102 matching lines @@
   browser_client_.reset(new ShellContentBrowserClient);
   return browser_client_.get();
 }
 
 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new ShellContentRendererClient);
   return renderer_client_.get();
 }
 
 }  // namespace content