Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2284)

Unified Diff: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

Issue 2846843002: [blink] Unique pointers in Platform.h (Closed)
Patch Set: fix compilation (and again) Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8562261948d5688c3a1054d852f5bb2e5db993e2..5c0be1c2c1d6ef8270d61062a24c1dcd7cd1a308 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,6 +34,8 @@
#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"
@@ -163,7 +165,7 @@ void LayoutTestContentRendererClient::RenderViewCreated(
->InitializeWebViewWithMocks(render_view->GetWebView());
}
-WebMediaStreamCenter*
+std::unique_ptr<WebMediaStreamCenter>
LayoutTestContentRendererClient::OverrideCreateWebMediaStreamCenter(
WebMediaStreamCenterClient* client) {
#if BUILDFLAG(ENABLE_WEBRTC)
@@ -171,11 +173,11 @@ LayoutTestContentRendererClient::OverrideCreateWebMediaStreamCenter(
LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();
return interfaces->CreateMediaStreamCenter(client);
#else
- return NULL;
+ return nullptr;
#endif
}
-WebRTCPeerConnectionHandler*
+std::unique_ptr<WebRTCPeerConnectionHandler>
LayoutTestContentRendererClient::OverrideCreateWebRTCPeerConnectionHandler(
WebRTCPeerConnectionHandlerClient* client) {
#if BUILDFLAG(ENABLE_WEBRTC)
@@ -183,11 +185,11 @@ LayoutTestContentRendererClient::OverrideCreateWebRTCPeerConnectionHandler(
LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();
return interfaces->CreateWebRTCPeerConnectionHandler(client);
#else
- return NULL;
+ return nullptr;
#endif
}
-WebMIDIAccessor*
+std::unique_ptr<WebMIDIAccessor>
LayoutTestContentRendererClient::OverrideCreateMIDIAccessor(
WebMIDIAccessorClient* client) {
test_runner::WebTestInterfaces* interfaces =
@@ -195,7 +197,8 @@ LayoutTestContentRendererClient::OverrideCreateMIDIAccessor(
return interfaces->CreateMIDIAccessor(client);
}
-WebAudioDevice* LayoutTestContentRendererClient::OverrideCreateAudioDevice(
+std::unique_ptr<WebAudioDevice>
+LayoutTestContentRendererClient::OverrideCreateAudioDevice(
const blink::WebAudioLatencyHint& latency_hint) {
const double hw_buffer_size = 128;
const double hw_sample_rate = 44100;
« no previous file with comments | « content/shell/renderer/layout_test/layout_test_content_renderer_client.h ('k') | content/shell/test_runner/test_plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698