diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 18:46:29 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 18:46:29 +0000 |
| commit | 5091c42ec0df2e8f6f9c5767a0ba82fa56a64841 (patch) | |
| tree | 0471d8461ab6b9e93d21ac55c7ab642a2c0db7de /remoting/host | |
| parent | 747b1d3d7cd1ee6ce2bd0a54d2198683ba70ba8f (diff) | |
| download | chromium_src-5091c42ec0df2e8f6f9c5767a0ba82fa56a64841.zip chromium_src-5091c42ec0df2e8f6f9c5767a0ba82fa56a64841.tar.gz chromium_src-5091c42ec0df2e8f6f9c5767a0ba82fa56a64841.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, since the clang tooling
infrastructure does not work on Windows. Also fixes a misuse of
scoped_ptr<T> in chrome_frame to hold memory allocated by operator
new[].
BUG=173286
R=alexeypa@chromium.org, erg@chromium.org, jochen@chromium.org, mmenke@chromium.org, tommi@chromium.org
Review URL: https://codereview.chromium.org/16943003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/setup/daemon_controller_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/host/setup/daemon_controller_win.cc b/remoting/host/setup/daemon_controller_win.cc index 04dcce4..1c33dbd 100644 --- a/remoting/host/setup/daemon_controller_win.cc +++ b/remoting/host/setup/daemon_controller_win.cc @@ -439,7 +439,7 @@ DaemonController::AsyncResult DaemonControllerWin::HResultToAsyncResult( void DaemonControllerWin::DoGetConfig(const GetConfigCallback& callback) { DCHECK(worker_thread_.message_loop_proxy()->BelongsToCurrentThread()); - scoped_ptr<base::DictionaryValue> dictionary_null(NULL); + scoped_ptr<base::DictionaryValue> dictionary_null; // Configure and start the Daemon Controller if it is installed already. HRESULT hr = ActivateController(); |