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

Unified Diff: remoting/host/fake_desktop_environment.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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: remoting/host/fake_desktop_environment.cc
diff --git a/remoting/host/fake_desktop_environment.cc b/remoting/host/fake_desktop_environment.cc
index f399ae853103e46150dacc481b2543d5ae2d4f0b..bdf0d0a0d0b498af367cd30837ad42cca8a862ed 100644
--- a/remoting/host/fake_desktop_environment.cc
+++ b/remoting/host/fake_desktop_environment.cc
@@ -44,7 +44,7 @@ FakeDesktopEnvironment::~FakeDesktopEnvironment() {}
// DesktopEnvironment implementation.
scoped_ptr<AudioCapturer> FakeDesktopEnvironment::CreateAudioCapturer() {
- return scoped_ptr<AudioCapturer>();
+ return nullptr;
}
scoped_ptr<InputInjector> FakeDesktopEnvironment::CreateInputInjector() {
@@ -60,7 +60,7 @@ FakeDesktopEnvironment::CreateVideoCapturer() {
scoped_ptr<FakeDesktopCapturer> result(new FakeDesktopCapturer());
if (!frame_generator_.is_null())
result->set_frame_generator(frame_generator_);
- return result.PassAs<webrtc::DesktopCapturer>();
+ return result.Pass();
}
scoped_ptr<webrtc::MouseCursorMonitor>
@@ -76,7 +76,7 @@ void FakeDesktopEnvironment::SetCapabilities(const std::string& capabilities) {}
scoped_ptr<GnubbyAuthHandler> FakeDesktopEnvironment::CreateGnubbyAuthHandler(
protocol::ClientStub* client_stub) {
- return scoped_ptr<GnubbyAuthHandler>();
+ return nullptr;
}
FakeDesktopEnvironmentFactory::FakeDesktopEnvironmentFactory() {}
@@ -87,7 +87,7 @@ scoped_ptr<DesktopEnvironment> FakeDesktopEnvironmentFactory::Create(
base::WeakPtr<ClientSessionControl> client_session_control) {
scoped_ptr<FakeDesktopEnvironment> result(new FakeDesktopEnvironment());
result->set_frame_generator(frame_generator_);
- return result.PassAs<DesktopEnvironment>();
+ return result.Pass();
}
void FakeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {}

Powered by Google App Engine
This is Rietveld 408576698