| Index: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
|
| diff --git a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
|
| index 5c0be1c2c1d6ef8270d61062a24c1dcd7cd1a308..8562261948d5688c3a1054d852f5bb2e5db993e2 100644
|
| --- a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
|
| +++ b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
|
| @@ -34,8 +34,6 @@
|
| #include "media/media_features.h"
|
| #include "third_party/WebKit/public/platform/WebAudioLatencyHint.h"
|
| #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
|
| -#include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandler.h"
|
| -#include "third_party/WebKit/public/platform/modules/webmidi/WebMIDIAccessor.h"
|
| #include "third_party/WebKit/public/web/WebFrameWidget.h"
|
| #include "third_party/WebKit/public/web/WebKit.h"
|
| #include "third_party/WebKit/public/web/WebPluginParams.h"
|
| @@ -165,7 +163,7 @@
|
| ->InitializeWebViewWithMocks(render_view->GetWebView());
|
| }
|
|
|
| -std::unique_ptr<WebMediaStreamCenter>
|
| +WebMediaStreamCenter*
|
| LayoutTestContentRendererClient::OverrideCreateWebMediaStreamCenter(
|
| WebMediaStreamCenterClient* client) {
|
| #if BUILDFLAG(ENABLE_WEBRTC)
|
| @@ -173,11 +171,11 @@
|
| LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();
|
| return interfaces->CreateMediaStreamCenter(client);
|
| #else
|
| - return nullptr;
|
| -#endif
|
| -}
|
| -
|
| -std::unique_ptr<WebRTCPeerConnectionHandler>
|
| + return NULL;
|
| +#endif
|
| +}
|
| +
|
| +WebRTCPeerConnectionHandler*
|
| LayoutTestContentRendererClient::OverrideCreateWebRTCPeerConnectionHandler(
|
| WebRTCPeerConnectionHandlerClient* client) {
|
| #if BUILDFLAG(ENABLE_WEBRTC)
|
| @@ -185,11 +183,11 @@
|
| LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();
|
| return interfaces->CreateWebRTCPeerConnectionHandler(client);
|
| #else
|
| - return nullptr;
|
| -#endif
|
| -}
|
| -
|
| -std::unique_ptr<WebMIDIAccessor>
|
| + return NULL;
|
| +#endif
|
| +}
|
| +
|
| +WebMIDIAccessor*
|
| LayoutTestContentRendererClient::OverrideCreateMIDIAccessor(
|
| WebMIDIAccessorClient* client) {
|
| test_runner::WebTestInterfaces* interfaces =
|
| @@ -197,8 +195,7 @@
|
| return interfaces->CreateMIDIAccessor(client);
|
| }
|
|
|
| -std::unique_ptr<WebAudioDevice>
|
| -LayoutTestContentRendererClient::OverrideCreateAudioDevice(
|
| +WebAudioDevice* LayoutTestContentRendererClient::OverrideCreateAudioDevice(
|
| const blink::WebAudioLatencyHint& latency_hint) {
|
| const double hw_buffer_size = 128;
|
| const double hw_sample_rate = 44100;
|
|
|