diff options
| author | vmpstr <vmpstr@chromium.org> | 2016-03-21 13:28:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-21 20:30:28 +0000 |
| commit | a34d11324e0767acd94d8754e3a117e072492cf4 (patch) | |
| tree | ac723766c79172c76341b45aab9c1914169b4466 /extensions | |
| parent | 8a2f463d3726f944f5ec279664b25118fd3ccf3c (diff) | |
| download | chromium_src-a34d11324e0767acd94d8754e3a117e072492cf4.zip chromium_src-a34d11324e0767acd94d8754e3a117e072492cf4.tar.gz chromium_src-a34d11324e0767acd94d8754e3a117e072492cf4.tar.bz2 | |
Add RetainedRef uses where needed.
This patch adds RetainedRef uses where they are required. These
changes will be required when we remove automatic unwrapping of
scoped_refptrs in Bind.
Please see the bug for more context.
R=tzik@chromium.org, thakis@chromium.org, danakj@chromium.org
BUG=589048
Review URL: https://codereview.chromium.org/1815363002
Cr-Commit-Position: refs/heads/master@{#382371}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/api/bluetooth/bluetooth_event_router.cc | 2 | ||||
| -rw-r--r-- | extensions/shell/browser/shell_extension_system.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/extensions/browser/api/bluetooth/bluetooth_event_router.cc b/extensions/browser/api/bluetooth/bluetooth_event_router.cc index d11d17e..0f9345b 100644 --- a/extensions/browser/api/bluetooth/bluetooth_event_router.cc +++ b/extensions/browser/api/bluetooth/bluetooth_event_router.cc @@ -100,7 +100,7 @@ void BluetoothEventRouter::StartDiscoverySession( GetAdapter(base::Bind( &IgnoreAdapterResultAndThen, base::Bind(&BluetoothEventRouter::StartDiscoverySessionImpl, - weak_ptr_factory_.GetWeakPtr(), make_scoped_refptr(adapter), + weak_ptr_factory_.GetWeakPtr(), base::RetainedRef(adapter), extension_id, callback, error_callback))); return; } diff --git a/extensions/shell/browser/shell_extension_system.cc b/extensions/shell/browser/shell_extension_system.cc index e3a75bf..2ed9d7b 100644 --- a/extensions/shell/browser/shell_extension_system.cc +++ b/extensions/shell/browser/shell_extension_system.cc @@ -151,11 +151,11 @@ AppSorting* ShellExtensionSystem::app_sorting() { void ShellExtensionSystem::RegisterExtensionWithRequestContexts( const Extension* extension, const base::Closure& callback) { - BrowserThread::PostTaskAndReply(BrowserThread::IO, FROM_HERE, - base::Bind(&InfoMap::AddExtension, info_map(), - make_scoped_refptr(extension), - base::Time::Now(), false, false), - callback); + BrowserThread::PostTaskAndReply( + BrowserThread::IO, FROM_HERE, + base::Bind(&InfoMap::AddExtension, info_map(), + base::RetainedRef(extension), base::Time::Now(), false, false), + callback); } void ShellExtensionSystem::UnregisterExtensionWithRequestContexts( |