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 "components/test_runner/web_test_interfaces.h" | 5 #include "components/test_runner/web_test_interfaces.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
| 9 #include "base/memory/ptr_util.h" |
9 #include "components/test_runner/app_banner_client.h" | 10 #include "components/test_runner/app_banner_client.h" |
10 #include "components/test_runner/mock_web_audio_device.h" | 11 #include "components/test_runner/mock_web_audio_device.h" |
11 #include "components/test_runner/mock_web_media_stream_center.h" | 12 #include "components/test_runner/mock_web_media_stream_center.h" |
12 #include "components/test_runner/mock_web_midi_accessor.h" | 13 #include "components/test_runner/mock_web_midi_accessor.h" |
13 #include "components/test_runner/mock_webrtc_peer_connection_handler.h" | 14 #include "components/test_runner/mock_webrtc_peer_connection_handler.h" |
14 #include "components/test_runner/test_interfaces.h" | 15 #include "components/test_runner/test_interfaces.h" |
15 #include "components/test_runner/test_runner.h" | 16 #include "components/test_runner/test_runner.h" |
16 #include "components/test_runner/web_frame_test_client.h" | 17 #include "components/test_runner/web_frame_test_client.h" |
17 #include "components/test_runner/web_test_proxy.h" | 18 #include "components/test_runner/web_test_proxy.h" |
18 #include "components/test_runner/web_view_test_client.h" | 19 #include "components/test_runner/web_view_test_client.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 | 74 |
74 WebMIDIAccessor* WebTestInterfaces::CreateMIDIAccessor( | 75 WebMIDIAccessor* WebTestInterfaces::CreateMIDIAccessor( |
75 WebMIDIAccessorClient* client) { | 76 WebMIDIAccessorClient* client) { |
76 return new MockWebMIDIAccessor(client, interfaces_.get()); | 77 return new MockWebMIDIAccessor(client, interfaces_.get()); |
77 } | 78 } |
78 | 79 |
79 WebAudioDevice* WebTestInterfaces::CreateAudioDevice(double sample_rate) { | 80 WebAudioDevice* WebTestInterfaces::CreateAudioDevice(double sample_rate) { |
80 return new MockWebAudioDevice(sample_rate); | 81 return new MockWebAudioDevice(sample_rate); |
81 } | 82 } |
82 | 83 |
83 scoped_ptr<blink::WebAppBannerClient> | 84 std::unique_ptr<blink::WebAppBannerClient> |
84 WebTestInterfaces::CreateAppBannerClient() { | 85 WebTestInterfaces::CreateAppBannerClient() { |
85 scoped_ptr<AppBannerClient> client(new AppBannerClient); | 86 std::unique_ptr<AppBannerClient> client(new AppBannerClient); |
86 interfaces_->SetAppBannerClient(client.get()); | 87 interfaces_->SetAppBannerClient(client.get()); |
87 return std::move(client); | 88 return std::move(client); |
88 } | 89 } |
89 | 90 |
90 scoped_ptr<WebFrameTestClient> WebTestInterfaces::CreateWebFrameTestClient( | 91 std::unique_ptr<WebFrameTestClient> WebTestInterfaces::CreateWebFrameTestClient( |
91 WebTestProxyBase* web_test_proxy_base) { | 92 WebTestProxyBase* web_test_proxy_base) { |
92 return make_scoped_ptr(new WebFrameTestClient(interfaces_->GetTestRunner(), | 93 return base::WrapUnique(new WebFrameTestClient(interfaces_->GetTestRunner(), |
93 interfaces_->GetDelegate(), | 94 interfaces_->GetDelegate(), |
94 web_test_proxy_base)); | 95 web_test_proxy_base)); |
95 } | 96 } |
96 | 97 |
97 scoped_ptr<WebViewTestClient> WebTestInterfaces::CreateWebViewTestClient( | 98 std::unique_ptr<WebViewTestClient> WebTestInterfaces::CreateWebViewTestClient( |
98 WebTestProxyBase* web_test_proxy_base) { | 99 WebTestProxyBase* web_test_proxy_base) { |
99 return make_scoped_ptr(new WebViewTestClient(interfaces_->GetTestRunner(), | 100 return base::WrapUnique( |
100 web_test_proxy_base)); | 101 new WebViewTestClient(interfaces_->GetTestRunner(), web_test_proxy_base)); |
101 } | 102 } |
102 | 103 |
103 std::vector<blink::WebView*> WebTestInterfaces::GetWindowList() { | 104 std::vector<blink::WebView*> WebTestInterfaces::GetWindowList() { |
104 std::vector<blink::WebView*> result; | 105 std::vector<blink::WebView*> result; |
105 for (WebTestProxyBase* proxy : interfaces_->GetWindowList()) | 106 for (WebTestProxyBase* proxy : interfaces_->GetWindowList()) |
106 result.push_back(proxy->web_view()); | 107 result.push_back(proxy->web_view()); |
107 return result; | 108 return result; |
108 } | 109 } |
109 | 110 |
110 } // namespace test_runner | 111 } // namespace test_runner |
OLD | NEW |