Content Shell: Introduce LayoutTestContentBrowserClient

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 ae2b566d814436d65b0007e35ebaf9997ac982f9..e2fd2b17942652627fa6af40fd85da379dbc9b4e 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -20,6 +20,7 @@
 #include "content/shell/app/shell_crash_reporter_client.h"
 #include "content/shell/app/webkit_test_platform_support.h"
 #include "content/shell/browser/layout_test/layout_test_browser_main.h"
+#include "content/shell/browser/layout_test/layout_test_content_browser_client.h"
 #include "content/shell/browser/shell_browser_main.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "content/shell/common/shell_switches.h"
@@ -308,7 +309,10 @@ void ShellMainDelegate::InitializeResourceBundle() {
 }
 
 ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
-  browser_client_.reset(new ShellContentBrowserClient);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
+    browser_client_.reset(new LayoutTestContentBrowserClient);

[Mike West, 2014/10/16 19:39:57]

Nit: I think I'd prefer a ternary if here. *shrug* Up to you.

[Peter Beverloo, 2014/10/17 11:06:31]

I chose this to be consistent with CreateContentRendererClient(). Changed
because I agree :-).

+  else
+    browser_client_.reset(new ShellContentBrowserClient);
   return browser_client_.get();
 }