| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/auto_reset.h" | 5 #include "base/auto_reset.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "content/browser/renderer_host/render_widget_host_impl.h" | 8 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 9 #include "content/browser/web_contents/web_contents_impl.h" | 9 #include "content/browser/web_contents/web_contents_impl.h" |
| 10 #include "content/common/input/synthetic_web_input_event_builders.h" | 10 #include "content/common/input/synthetic_web_input_event_builders.h" |
| 11 #include "content/common/input_messages.h" | 11 #include "content/common/input_messages.h" |
| 12 #include "content/public/browser/browser_message_filter.h" | 12 #include "content/public/browser/browser_message_filter.h" |
| 13 #include "content/public/browser/render_view_host.h" | 13 #include "content/public/browser/render_view_host.h" |
| 14 #include "content/public/browser/render_widget_host_view.h" | 14 #include "content/public/browser/render_widget_host_view.h" |
| 15 #include "content/public/common/content_switches.h" | 15 #include "content/public/common/content_switches.h" |
| 16 #include "content/public/test/content_browser_test.h" |
| 17 #include "content/public/test/content_browser_test_utils.h" |
| 16 #include "content/shell/browser/shell.h" | 18 #include "content/shell/browser/shell.h" |
| 17 #include "content/test/content_browser_test.h" | |
| 18 #include "content/test/content_browser_test_utils.h" | |
| 19 #include "third_party/WebKit/public/web/WebInputEvent.h" | 19 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 20 #include "ui/events/event_switches.h" | 20 #include "ui/events/event_switches.h" |
| 21 #include "ui/events/latency_info.h" | 21 #include "ui/events/latency_info.h" |
| 22 | 22 |
| 23 using blink::WebInputEvent; | 23 using blink::WebInputEvent; |
| 24 | 24 |
| 25 namespace { | 25 namespace { |
| 26 | 26 |
| 27 void GiveItSomeTime() { | 27 void GiveItSomeTime() { |
| 28 base::RunLoop run_loop; | 28 base::RunLoop run_loop; |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 INSTANTIATE_TEST_CASE_P(WithoutInputHandlerProxy, TouchInputBrowserTest, | 269 INSTANTIATE_TEST_CASE_P(WithoutInputHandlerProxy, TouchInputBrowserTest, |
| 270 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); | 270 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); |
| 271 #endif | 271 #endif |
| 272 | 272 |
| 273 #if defined(USE_AURA) || defined(OS_MACOSX) | 273 #if defined(USE_AURA) || defined(OS_MACOSX) |
| 274 INSTANTIATE_TEST_CASE_P(WithInputHandlerProxy, TouchInputBrowserTest, | 274 INSTANTIATE_TEST_CASE_P(WithInputHandlerProxy, TouchInputBrowserTest, |
| 275 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); | 275 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); |
| 276 #endif | 276 #endif |
| 277 | 277 |
| 278 } // namespace content | 278 } // namespace content |
| OLD | NEW |