diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 03:51:10 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 03:51:10 +0000 |
| commit | e9b738ea96bb9745c9ed4fe49daa707d0d874c35 (patch) | |
| tree | 9e6435d21eec15173be463d2472082c6a29066ed /ppapi | |
| parent | 1674649497e1a2f646741b7cb0239113d1f7111a (diff) | |
| download | chromium_src-e9b738ea96bb9745c9ed4fe49daa707d0d874c35.zip chromium_src-e9b738ea96bb9745c9ed4fe49daa707d0d874c35.tar.gz chromium_src-e9b738ea96bb9745c9ed4fe49daa707d0d874c35.tar.bz2 | |
Make sure that scoped_ptr<> cannot be used with ref-counted objects.
It's easy to type scoped_ptr<> instead of scoped_refptr<>. Such bugs are
hard to debug sometimes. This change adds compile-time check to make sure
that scoped_ptr<> is not used for ref-counted objects.
Also fixed one (benign) instance of scoped_ptr<> being used for a
ref-counted object.
Review URL: http://codereview.chromium.org/9958150
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/ppb_network_monitor_private_proxy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/ppb_network_monitor_private_proxy.cc b/ppapi/proxy/ppb_network_monitor_private_proxy.cc index 4fa2d6e..26252ac 100644 --- a/ppapi/proxy/ppb_network_monitor_private_proxy.cc +++ b/ppapi/proxy/ppb_network_monitor_private_proxy.cc @@ -82,7 +82,7 @@ PP_Resource PPB_NetworkMonitor_Private_Proxy::CreateProxyResource( if (!proxy) return 0; - scoped_ptr<NetworkMonitor> result( + scoped_refptr<NetworkMonitor> result( new NetworkMonitor(instance, proxy, callback, user_data)); proxy->monitors_->AddObserver(result.get()); @@ -103,7 +103,7 @@ PP_Resource PPB_NetworkMonitor_Private_Proxy::CreateProxyResource( result->AsWeakPtr(), proxy->current_list_)); } - return result.release()->GetReference(); + return result->GetReference(); } bool PPB_NetworkMonitor_Private_Proxy::OnMessageReceived( |