diff options
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/proxy_launcher.cc | 2 | ||||
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/render_view_test.h | 4 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/unit/chrome_test_suite.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc index e6cd724..baeff496 100644 --- a/chrome/test/automation/proxy_launcher.cc +++ b/chrome/test/automation/proxy_launcher.cc @@ -17,7 +17,6 @@ #include "chrome/common/automation_constants.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/debug_flags.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/url_constants.h" #include "chrome/test/chrome_process_util.h" @@ -26,6 +25,7 @@ #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/ui/ui_test.h" #include "content/common/child_process_info.h" +#include "content/common/debug_flags.h" namespace { diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 21790c3..0fda2e5 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -27,7 +27,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/main_function_params.h" #include "chrome/common/url_constants.h" #include "chrome/test/test_launcher_utils.h" #include "chrome/test/testing_browser_process.h" @@ -35,6 +34,7 @@ #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/main_function_params.h" #include "content/common/notification_type.h" #include "net/base/mock_host_resolver.h" #include "net/test/test_server.h" diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h index 96e9c77..c83a8d4 100644 --- a/chrome/test/render_view_test.h +++ b/chrome/test/render_view_test.h @@ -10,14 +10,14 @@ #include "base/command_line.h" #include "base/scoped_ptr.h" -#include "chrome/common/main_function_params.h" #include "chrome/common/native_web_keyboard_event.h" -#include "chrome/common/sandbox_init_wrapper.h" #include "chrome/renderer/mock_keyboard.h" #include "chrome/renderer/mock_render_thread.h" #include "chrome/renderer/render_view.h" #include "chrome/renderer/renderer_main_platform_delegate.h" #include "chrome/renderer/renderer_webkitclient_impl.h" +#include "content/common/main_function_params.h" +#include "content/common/sandbox_init_wrapper.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 2424006..11314fe 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -36,7 +36,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/debug_flags.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" @@ -49,6 +48,7 @@ #include "chrome/test/chrome_process_util.h" #include "chrome/test/test_launcher_utils.h" #include "chrome/test/test_switches.h" +#include "content/common/debug_flags.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" diff --git a/chrome/test/unit/chrome_test_suite.cc b/chrome/test/unit/chrome_test_suite.cc index 28f55e7..d6860ca 100644 --- a/chrome/test/unit/chrome_test_suite.cc +++ b/chrome/test/unit/chrome_test_suite.cc @@ -23,7 +23,7 @@ #if defined(OS_MACOSX) #include "base/mac/mac_util.h" -#include "chrome/common/chrome_application_mac.h" +#include "content/common/chrome_application_mac.h" #endif #if defined(OS_POSIX) |