summaryrefslogtreecommitdiffstats
path: root/tools/android
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 18:01:22 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 18:01:22 +0000
commit045bb81bc17cc4b2ac3cb0189e0548f1b57d1877 (patch)
tree6ae00fe915c0b7aed020cafb157376ca53d9eb4f /tools/android
parent6ee5cf1519016517362ff6fe2e3a87f9a3c31e0a (diff)
downloadchromium_src-045bb81bc17cc4b2ac3cb0189e0548f1b57d1877.zip
chromium_src-045bb81bc17cc4b2ac3cb0189e0548f1b57d1877.tar.gz
chromium_src-045bb81bc17cc4b2ac3cb0189e0548f1b57d1877.tar.bz2
Rewrite scoped_ptr<T>(NULL) to use the default ctor.
This is a manual cleanup of call sites that invoke scoped_ptr<T>'s constructor with an explicit NULL argument that are only built on Android. BUG=173286 R=rlarocque@chromium.org, yfriedman@chromium.org Review URL: https://codereview.chromium.org/17780002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/android')
-rw-r--r--tools/android/forwarder2/daemon.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc
index afbf41c..d993834 100644
--- a/tools/android/forwarder2/daemon.cc
+++ b/tools/android/forwarder2/daemon.cc
@@ -151,7 +151,7 @@ scoped_ptr<Socket> ConnectToUnixDomainSocket(
}
return socket.Pass();
}
- return scoped_ptr<Socket>(NULL);
+ return scoped_ptr<Socket>();
}
} // namespace