Move layout-test-specific switches from shell_switches to layout_test_switches.h

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 298f67367cc2295a3d92e876ba6b500e5d5db068..5a4c73f0ee4f49c73696c1fb6b163e4b56ec0d36 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -26,6 +26,7 @@
 #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/layout_test/layout_test_switches.h"

[Łukasz Anforowicz, 2016/03/04 17:51:15]

1 out of 3 remaining shell -> layout_test includes.  I think this one is ok,
because it mostly switches between generic and layout-test-specific
functionality.  Example below:

ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
  browser_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch(
                            switches::kRunLayoutTest)
                            ? new LayoutTestContentBrowserClient
                            : new ShellContentBrowserClient);

  return browser_client_.get();
}

[Łukasz Anforowicz, 2016/03/04 17:59:37]

BTW: To get rid of the include of layout_test_switches.h here we would have to
handle:

- kRunLayoutTest (easy - can use switches::IsRunLayoutTestSwitchPresent)

- kCheckLayoutTestSysDeps

- kStableReleaseMode

I kind of arbitrarily decided that I do not want to widen the layering hole in
shell_switches.h and introduce IsCheckLayoutTestSysDepsSwitchPresent and/or
IsStableReleaseModeSwitchPresent.

 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client.h"
 #include "content/shell/renderer/shell_content_renderer_client.h"