OLD | NEW |
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2014 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/shell/renderer/layout_test/layout_test_content_renderer_client
.h" | 5 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client
.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/debugger.h" | 9 #include "base/debug/debugger.h" |
10 #include "components/test_runner/mock_credential_manager_client.h" | 10 #include "components/test_runner/mock_credential_manager_client.h" |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 clipboard_.reset(new MockWebClipboardImpl); | 160 clipboard_.reset(new MockWebClipboardImpl); |
161 return clipboard_.get(); | 161 return clipboard_.get(); |
162 } | 162 } |
163 | 163 |
164 WebThemeEngine* LayoutTestContentRendererClient::OverrideThemeEngine() { | 164 WebThemeEngine* LayoutTestContentRendererClient::OverrideThemeEngine() { |
165 return LayoutTestRenderProcessObserver::GetInstance() | 165 return LayoutTestRenderProcessObserver::GetInstance() |
166 ->test_interfaces() | 166 ->test_interfaces() |
167 ->ThemeEngine(); | 167 ->ThemeEngine(); |
168 } | 168 } |
169 | 169 |
170 scoped_ptr<blink::WebAppBannerClient> | 170 std::unique_ptr<blink::WebAppBannerClient> |
171 LayoutTestContentRendererClient::CreateAppBannerClient( | 171 LayoutTestContentRendererClient::CreateAppBannerClient( |
172 RenderFrame* render_frame) { | 172 RenderFrame* render_frame) { |
173 test_runner::WebTestInterfaces* interfaces = | 173 test_runner::WebTestInterfaces* interfaces = |
174 LayoutTestRenderProcessObserver::GetInstance()->test_interfaces(); | 174 LayoutTestRenderProcessObserver::GetInstance()->test_interfaces(); |
175 return interfaces->CreateAppBannerClient(); | 175 return interfaces->CreateAppBannerClient(); |
176 } | 176 } |
177 | 177 |
178 scoped_ptr<MediaStreamRendererFactory> | 178 std::unique_ptr<MediaStreamRendererFactory> |
179 LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() { | 179 LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() { |
180 #if defined(ENABLE_WEBRTC) | 180 #if defined(ENABLE_WEBRTC) |
181 return scoped_ptr<MediaStreamRendererFactory>( | 181 return std::unique_ptr<MediaStreamRendererFactory>( |
182 new TestMediaStreamRendererFactory()); | 182 new TestMediaStreamRendererFactory()); |
183 #else | 183 #else |
184 return nullptr; | 184 return nullptr; |
185 #endif | 185 #endif |
186 } | 186 } |
187 | 187 |
188 } // namespace content | 188 } // namespace content |
OLD | NEW |