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

content/shell/common/shell_switches.h

Index: content/shell/common/shell_switches.h
diff --git a/content/shell/common/shell_switches.h b/content/shell/common/shell_switches.h
index 4c61a110ac4b6b0cb3e017e29dfcb635c091f391..5ee6fde8303da4a477d93410c9f8b95677cf0084 100644
--- a/content/shell/common/shell_switches.h
+++ b/content/shell/common/shell_switches.h
@@ -12,27 +12,22 @@
 
 namespace switches {
 
-extern const char kAllowExternalPages[];

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

I tried to see where the switches are used and moved ones mostly used only under
layout_tests.  OTOH, some of them seemed rather generic (i.e.
kEnableAccelerated2DCanvas)... hmmm...

-extern const char kCheckLayoutTestSysDeps[];
 extern const char kContentBrowserTest[];
 extern const char kContentShellDataPath[];
 extern const char kCrashDumpsDir[];
-extern const char kCrashOnFailure[];
-extern const char kEnableAccelerated2DCanvas[];
-extern const char kEnableFontAntialiasing[];
-extern const char kAlwaysUseComplexText[];
-extern const char kEnableLeakDetection[];
-extern const char kEncodeBinary[];
-extern const char kExposeInternalsForTesting[];
 extern const char kIsolateSitesForTesting[];
 extern const char kRegisterFontFiles[];
-extern const char kRunLayoutTest[];
-extern const char kStableReleaseMode[];
 extern const char kContentShellHostWindowSize[];
 
 // Returns list of extra font files to be made accessible to the renderer.
 std::vector<std::string> GetSideloadFontFiles();
 
+// Tells if content shell is running layout tests.
+// TODO(lukasza): The function below somewhat violates the layering (by
+// enabling shell -> layout_tests dependency) but at least narrows the extent of
+// the dependency to a single switch...
+bool IsRunLayoutTestSwitchPresent();

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

This is a bit of a weird method, but I think it is worth introducing it, because
otherwise we would still need to drag in the whole layout_test_switches.h into 
content/shell/browser/shell.cc, content/shell/common/shell_content_client.cc.

I guess one can look at this as 1 out of 3 remaining shell -> layout_test
dependencies (the include is hidden in shell_switches.cc).

+
 }  // namespace switches
 
 #endif  // CONTENT_SHELL_COMMON_SHELL_SWITCHES_H_