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

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/cpu.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "cc/base/switches.h"
 #include "content/common/content_constants_internal.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/layouttest_support.h"
 #include "content/public/test/ppapi_test_utils.h"
 #include "content/shell/app/blink_test_platform_support.h"
 #include "content/shell/app/shell_crash_reporter_client.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/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"
 #include "content/shell/utility/shell_content_utility_client.h"
 #include "media/base/media_switches.h"
 #include "media/base/mime_util.h"
 #include "net/cookies/cookie_monster.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
@@ skipping 311 matching lines @@
 
   return renderer_client_.get();
 }
 
 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
   utility_client_.reset(new ShellContentUtilityClient);
   return utility_client_.get();
 }
 
 }  // namespace content