summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 00:35:13 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 00:35:13 +0000
commit3c2dc955e2d6bbcc20fd18512c09cc916e796b0a (patch)
treefff266eb50e04302ce4f632a938a1963b4b1fefe /remoting/host
parent27b7b64d69423a0e50b740f0b9d81c46a3de33be (diff)
downloadchromium_src-3c2dc955e2d6bbcc20fd18512c09cc916e796b0a.zip
chromium_src-3c2dc955e2d6bbcc20fd18512c09cc916e796b0a.tar.gz
chromium_src-3c2dc955e2d6bbcc20fd18512c09cc916e796b0a.tar.bz2
Rewrite scoped_ptr<T>(NULL) to use the default ctor in remoting/.
This is the result of running the rewrite_scoped_ptr_ctor_null tool across all files built on Linux in the remoting/ directory. BUG=173286 Review URL: https://chromiumcodereview.appspot.com/16964002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/client_session.cc4
-rw-r--r--remoting/host/input_injector_linux.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc
index cf282dd..2ce1400 100644
--- a/remoting/host/client_session.cc
+++ b/remoting/host/client_session.cc
@@ -417,7 +417,7 @@ scoped_ptr<VideoEncoder> ClientSession::CreateVideoEncoder(
}
NOTIMPLEMENTED();
- return scoped_ptr<VideoEncoder>(NULL);
+ return scoped_ptr<VideoEncoder>();
}
// static
@@ -434,7 +434,7 @@ scoped_ptr<AudioEncoder> ClientSession::CreateAudioEncoder(
}
NOTIMPLEMENTED();
- return scoped_ptr<AudioEncoder>(NULL);
+ return scoped_ptr<AudioEncoder>();
}
} // namespace remoting
diff --git a/remoting/host/input_injector_linux.cc b/remoting/host/input_injector_linux.cc
index bafbb76..45221d1 100644
--- a/remoting/host/input_injector_linux.cc
+++ b/remoting/host/input_injector_linux.cc
@@ -500,7 +500,7 @@ scoped_ptr<InputInjector> InputInjector::Create(
scoped_ptr<InputInjectorLinux> injector(
new InputInjectorLinux(main_task_runner));
if (!injector->Init())
- return scoped_ptr<InputInjector>(NULL);
+ return scoped_ptr<InputInjector>();
return injector.PassAs<InputInjector>();
}