diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 16:46:36 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 16:46:36 +0000 |
commit | cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622 (patch) | |
tree | 7b95f103fce509de887c8c5e643604855b57c0ba /apps | |
parent | 9f6e673c7f43f6ee414f72a74585dad8ebaceec3 (diff) | |
download | chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.zip chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.tar.gz chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.tar.bz2 |
Call scoped_refptr<T>::get() rather than relying on implicit "operator T*"
This upates calls to bound temporary objects to also use get().
While it has the same semantic equivalence to the existing code, this generally
represents a dangerous pattern - indeed, part of the whole motivation for this
change is to make this anti-pattern very visible to authors.
This change simply updates all of the call sites, to allow the "operator T*"
to be removed and preventing new instances. The existing instances will then be
reviewed for "suspicious" changes and updated to use/pass scoped_refptr<T>
rather than T*, as appropriate.
BUG=110610
TBR=darin
Review URL: https://codereview.chromium.org/15984016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_restore_service.cc | 4 | ||||
-rw-r--r-- | apps/shell_window_geometry_cache_unittest.cc | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc index 37a463b..f5cf21c 100644 --- a/apps/app_restore_service.cc +++ b/apps/app_restore_service.cc @@ -69,14 +69,14 @@ void AppRestoreService::HandleStartup(bool should_restore_apps) { for (ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { - const Extension* extension = *it; + const Extension* extension = it->get(); if (extension_prefs->IsExtensionRunning(extension->id())) { RecordAppStop(extension->id()); // If we are not restoring apps (e.g., because it is a clean restart), and // the app does not have retain permission, explicitly clear the retained // entries queue. if (should_restore_apps) { - RestoreApp(*it); + RestoreApp(it->get()); } else { SavedFilesService::Get(profile_)->ClearQueueIfNoRetainPermission( extension); diff --git a/apps/shell_window_geometry_cache_unittest.cc b/apps/shell_window_geometry_cache_unittest.cc index 456c165..8566b4c 100644 --- a/apps/shell_window_geometry_cache_unittest.cc +++ b/apps/shell_window_geometry_cache_unittest.cc @@ -30,9 +30,8 @@ class ShellWindowGeometryCacheTest : public testing::Test { ShellWindowGeometryCacheTest() : ui_thread_(BrowserThread::UI, &ui_message_loop_) { prefs_.reset(new extensions::TestExtensionPrefs( - ui_message_loop_.message_loop_proxy())); - cache_.reset( - new ShellWindowGeometryCache(&profile_, prefs_->prefs())); + ui_message_loop_.message_loop_proxy().get())); + cache_.reset(new ShellWindowGeometryCache(&profile_, prefs_->prefs())); cache_->SetSyncDelayForTests(0); } |