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

content/shell/browser/layout_test/layout_test_browser_main.cc

 // Copyright 2014 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/browser/layout_test/layout_test_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/url_constants.h"
 #include "content/shell/browser/layout_test/blink_test_controller.h"
 #include "content/shell/browser/layout_test/test_info_extractor.h"
 #include "content/shell/browser/shell.h"
+#include "content/shell/common/layout_test/layout_test_switches.h"
 #include "content/shell/common/shell_switches.h"

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

shell_switches.h include needs to be retained for kContentShellDataPath

 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "net/base/filename_util.h"
 
 #if defined(OS_ANDROID)
 #include "base/run_loop.h"
 #include "content/shell/browser/layout_test/layout_test_android.h"
 #endif
 
 namespace {
 
@@ skipping 102 matching lines @@
   }
 
   exit_code = RunTests(main_runner);
 
 #if !defined(OS_ANDROID)
   main_runner->Shutdown();
 #endif
 
   return exit_code;
 }