OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/public/test/layouttest_support.h" | 5 #include "content/public/test/layouttest_support.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/callback.h" | 10 #include "base/callback.h" |
10 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
11 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
12 #include "build/build_config.h" | 13 #include "build/build_config.h" |
13 #include "components/test_runner/test_common.h" | 14 #include "components/test_runner/test_common.h" |
14 #include "components/test_runner/web_frame_test_proxy.h" | 15 #include "components/test_runner/web_frame_test_proxy.h" |
15 #include "components/test_runner/web_test_proxy.h" | 16 #include "components/test_runner/web_test_proxy.h" |
16 #include "content/browser/bluetooth/bluetooth_dispatcher_host.h" | 17 #include "content/browser/bluetooth/bluetooth_dispatcher_host.h" |
17 #include "content/browser/renderer_host/render_process_host_impl.h" | 18 #include "content/browser/renderer_host/render_process_host_impl.h" |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 fetcher->Start(view->mainFrame(), | 141 fetcher->Start(view->mainFrame(), |
141 false, | 142 false, |
142 base::Bind(&FetchManifestDoneCallback, | 143 base::Bind(&FetchManifestDoneCallback, |
143 base::Passed(&autodeleter), | 144 base::Passed(&autodeleter), |
144 callback)); | 145 callback)); |
145 } | 146 } |
146 | 147 |
147 void SetMockGamepadProvider(scoped_ptr<RendererGamepadProvider> provider) { | 148 void SetMockGamepadProvider(scoped_ptr<RendererGamepadProvider> provider) { |
148 RenderThreadImpl::current() | 149 RenderThreadImpl::current() |
149 ->blink_platform_impl() | 150 ->blink_platform_impl() |
150 ->SetPlatformEventObserverForTesting( | 151 ->SetPlatformEventObserverForTesting(blink::WebPlatformEventTypeGamepad, |
151 blink::WebPlatformEventTypeGamepad, | 152 std::move(provider)); |
152 provider.Pass()); | |
153 } | 153 } |
154 | 154 |
155 void SetMockDeviceLightData(const double data) { | 155 void SetMockDeviceLightData(const double data) { |
156 RendererBlinkPlatformImpl::SetMockDeviceLightDataForTesting(data); | 156 RendererBlinkPlatformImpl::SetMockDeviceLightDataForTesting(data); |
157 } | 157 } |
158 | 158 |
159 void SetMockDeviceMotionData(const WebDeviceMotionData& data) { | 159 void SetMockDeviceMotionData(const WebDeviceMotionData& data) { |
160 RendererBlinkPlatformImpl::SetMockDeviceMotionDataForTesting(data); | 160 RendererBlinkPlatformImpl::SetMockDeviceMotionDataForTesting(data); |
161 } | 161 } |
162 | 162 |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 result.append( | 454 result.append( |
455 DumpHistoryItem(entry->root_history_node(), | 455 DumpHistoryItem(entry->root_history_node(), |
456 8, | 456 8, |
457 index == current_index)); | 457 index == current_index)); |
458 } | 458 } |
459 result.append("===============================================\n"); | 459 result.append("===============================================\n"); |
460 return result; | 460 return result; |
461 } | 461 } |
462 | 462 |
463 } // namespace content | 463 } // namespace content |
OLD | NEW |