Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Linux fixes, Part 2 of N BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/16295003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203625 0039d316-1c4b-4281-b951-d872f2087c98
author: rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2013-06-02 21:15:09 +0000
committer: rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2013-06-02 21:15:09 +0000
commit: dc24976fc87171d50b49f37bbaaa23ae53e51f4b (patch)
tree: 8d7c684afa0d65e22efc3384197ef5b50d867160
parent: fc72bb18b111ff63e57135d97de6d59291f3b7b8 (diff)
download: chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.zip
chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.gz
chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.bz2
148 files changed, 1327 insertions, 1174 deletions
diff --git a/chrome/browser/autocomplete/bookmark_provider_unittest.cc b/chrome/browser/autocomplete/bookmark_provider_unittest.cc
index 7127c98..c4915ec 100644
--- a/chrome/browser/autocomplete/bookmark_provider_unittest.cc
+++ b/chrome/browser/autocomplete/bookmark_provider_unittest.cc
@@ -74,7 +74,7 @@ void BookmarkProviderTest::SetUp() {
   profile_.reset(new TestingProfile());
   DCHECK(profile_.get());
   provider_ = new BookmarkProvider(this, profile_.get());
-  DCHECK(provider_);
+  DCHECK(provider_.get());
   provider_->set_bookmark_model_for_testing(model_.get());
 
   const BookmarkNode* other_node = model_->other_node();
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index b1db4b1..7900271 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -1929,7 +1929,7 @@ TEST_F(SearchProviderTest, NavigationInline) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
     QueryForInput(ASCIIToUTF16(cases[i].input), false, false);
     SearchProvider::NavigationResult result(
-        *provider_, GURL(cases[i].url), string16(), false, 0);
+        *provider_.get(), GURL(cases[i].url), string16(), false, 0);
     AutocompleteMatch match(provider_->NavigationToMatch(result));
     EXPECT_EQ(cases[i].inline_offset, match.inline_autocomplete_offset);
     EXPECT_EQ(ASCIIToUTF16(cases[i].fill_into_edit), match.fill_into_edit);
@@ -1941,7 +1941,7 @@ TEST_F(SearchProviderTest, NavigationInlineSchemeSubstring) {
   const string16 input(ASCIIToUTF16("ht"));
   const string16 url(ASCIIToUTF16("http://a.com"));
   const SearchProvider::NavigationResult result(
-      *provider_, GURL(url), string16(), false, 0);
+      *provider_.get(), GURL(url), string16(), false, 0);
 
   // Check the offset and strings when inline autocompletion is allowed.
   QueryForInput(input, false, false);
@@ -1963,7 +1963,7 @@ TEST_F(SearchProviderTest, NavigationInlineDomainClassify) {
   QueryForInput(ASCIIToUTF16("w"), false, false);
   const GURL url("http://www.wow.com");
   const SearchProvider::NavigationResult result(
-      *provider_, url, string16(), false, 0);
+      *provider_.get(), url, string16(), false, 0);
   AutocompleteMatch match(provider_->NavigationToMatch(result));
   EXPECT_EQ(5U, match.inline_autocomplete_offset);
   EXPECT_EQ(ASCIIToUTF16("www.wow.com"), match.fill_into_edit);
@@ -2124,9 +2124,11 @@ TEST_F(SearchProviderTest, RemoveStaleResultsTest) {
         break;
       if (cases[i].results[j].is_navigation_result) {
         provider_->default_results_.navigation_results.push_back(
-            SearchProvider::NavigationResult(
-                *provider_, GURL(suggestion), string16(),
-                false, cases[i].results[j].relevance));
+            SearchProvider::NavigationResult(*provider_.get(),
+                                             GURL(suggestion),
+                                             string16(),
+                                             false,
+                                             cases[i].results[j].relevance));
       } else {
         provider_->default_results_.suggest_results.push_back(
             SearchProvider::SuggestResult(ASCIIToUTF16(suggestion), false,
diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc
index 0b994e4..0648954 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider.cc
@@ -56,7 +56,7 @@ ShortcutsProvider::ShortcutsProvider(AutocompleteProviderListener* listener,
       initialized_(false) {
   scoped_refptr<history::ShortcutsBackend> backend =
       ShortcutsBackendFactory::GetForProfile(profile_);
-  if (backend) {
+  if (backend.get()) {
     backend->AddObserver(this);
     if (backend->initialized())
       initialized_ = true;
@@ -119,7 +119,7 @@ void ShortcutsProvider::DeleteMatch(const AutocompleteMatch& match) {
 ShortcutsProvider::~ShortcutsProvider() {
   scoped_refptr<history::ShortcutsBackend> backend =
       ShortcutsBackendFactory::GetForProfileIfExists(profile_);
-  if (backend)
+  if (backend.get())
     backend->RemoveObserver(this);
 }
 
@@ -135,7 +135,7 @@ void ShortcutsProvider::DeleteMatchesWithURLs(const std::set<GURL>& urls) {
 void ShortcutsProvider::DeleteShortcutsWithURLs(const std::set<GURL>& urls) {
   scoped_refptr<history::ShortcutsBackend> backend =
       ShortcutsBackendFactory::GetForProfileIfExists(profile_);
-  if (!backend)
+  if (!backend.get())
     return;  // We are off the record.
   for (std::set<GURL>::const_iterator url = urls.begin(); url != urls.end();
        ++url)
@@ -145,7 +145,7 @@ void ShortcutsProvider::DeleteShortcutsWithURLs(const std::set<GURL>& urls) {
 void ShortcutsProvider::GetMatches(const AutocompleteInput& input) {
   scoped_refptr<history::ShortcutsBackend> backend =
       ShortcutsBackendFactory::GetForProfileIfExists(profile_);
-  if (!backend)
+  if (!backend.get())
     return;
   // Get the URLs from the shortcuts database with keys that partially or
   // completely match the search term.
diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
index 0685fd3..63f7295 100644
--- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
@@ -645,8 +645,8 @@ TEST_F(ShortcutsProviderTest, DeleteMatch) {
   EXPECT_FALSE(backend_->shortcuts_map().end() ==
                backend_->shortcuts_map().find(ASCIIToUTF16("erase")));
 
-  AutocompleteMatch match(provider_, 1200, true,
-                          AutocompleteMatchType::HISTORY_TITLE);
+  AutocompleteMatch match(
+      provider_.get(), 1200, true, AutocompleteMatchType::HISTORY_TITLE);
 
   match.destination_url = GURL(shortcuts_to_test_delete[0].url);
   match.contents = ASCIIToUTF16(shortcuts_to_test_delete[0].contents);
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index de4e029..6f35f7f 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -211,7 +211,7 @@ bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
       GetChannelMode(use_named_interface),
       this,
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
-  channel_->AddFilter(automation_resource_message_filter_);
+  channel_->AddFilter(automation_resource_message_filter_.get());
 
 #if defined(OS_CHROMEOS)
   if (use_initial_load_observers_) {
diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc
index 7c5d15d..fafded1 100644
--- a/chrome/browser/automation/automation_resource_message_filter.cc
+++ b/chrome/browser/automation/automation_resource_message_filter.cc
@@ -263,7 +263,7 @@ void AutomationResourceMessageFilter::RegisterRenderViewInIOThread(
   // instances. If the filter instances are different it means that a new
   // automation channel (External host process) was created for this tab.
   if (automation_details_iter != filtered_render_views_.Get().end() &&
-      automation_details_iter->second.filter == filter) {
+      automation_details_iter->second.filter.get() == filter) {
     DCHECK_GT(automation_details_iter->second.ref_count, 0);
     automation_details_iter->second.ref_count++;
     // The tab handle and the pending status may have changed:-
@@ -321,7 +321,7 @@ void AutomationResourceMessageFilter::ResumePendingRenderViewInIOThread(
   DCHECK(automation_details_iter->second.is_pending_render_view);
 
   AutomationResourceMessageFilter* old_filter =
-      automation_details_iter->second.filter;
+      automation_details_iter->second.filter.get();
   DCHECK(old_filter != NULL);
 
   filtered_render_views_.Get()[renderer_key] =
@@ -394,7 +394,7 @@ void AutomationResourceMessageFilter::GetCookiesForUrl(
       filtered_render_views_.Get().find(renderer_key));
 
   DCHECK(automation_details_iter != filtered_render_views_.Get().end());
-  DCHECK(automation_details_iter->second.filter != NULL);
+  DCHECK(automation_details_iter->second.filter.get() != NULL);
 
   int completion_callback_id = GetNextCompletionCallbackId();
   DCHECK(!ContainsKey(completion_callback_map_.Get(), completion_callback_id));
@@ -409,13 +409,14 @@ void AutomationResourceMessageFilter::GetCookiesForUrl(
 
   completion_callback_map_.Get()[completion_callback_id] = cookie_info;
 
-  DCHECK(automation_details_iter->second.filter != NULL);
+  DCHECK(automation_details_iter->second.filter.get() != NULL);
 
-  if (automation_details_iter->second.filter) {
-    automation_details_iter->second.filter->Send(
-        new AutomationMsg_GetCookiesFromHost(
-            automation_details_iter->second.tab_handle, url,
-            completion_callback_id));
+  if (automation_details_iter->second.filter.get()) {
+    automation_details_iter->second.filter
+        ->Send(new AutomationMsg_GetCookiesFromHost(
+              automation_details_iter->second.tab_handle,
+              url,
+              completion_callback_id));
   }
 }
 
@@ -446,12 +447,12 @@ void AutomationResourceMessageFilter::SetCookiesForUrl(
       filtered_render_views_.Get().find(RendererId(
           render_process_id, render_view_id)));
   DCHECK(automation_details_iter != filtered_render_views_.Get().end());
-  DCHECK(automation_details_iter->second.filter != NULL);
+  DCHECK(automation_details_iter->second.filter.get() != NULL);
 
-  if (automation_details_iter->second.filter) {
-    automation_details_iter->second.filter->Send(
-        new AutomationMsg_SetCookieAsync(
-            automation_details_iter->second.tab_handle, url, cookie_line));
+  if (automation_details_iter->second.filter.get()) {
+    automation_details_iter->second.filter
+        ->Send(new AutomationMsg_SetCookieAsync(
+              automation_details_iter->second.tab_handle, url, cookie_line));
   }
 }
 
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 93c6684..ed9815a 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -3674,7 +3674,7 @@ void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,
       ExtensionActionManager::Get(browser->profile());
   for (ExtensionList::const_iterator it = all.begin();
        it != all.end(); ++it) {
-    const Extension* extension = *it;
+    const Extension* extension = it->get();
     std::string id = extension->id();
     DictionaryValue* extension_value = new DictionaryValue;
     extension_value->SetString("id", id);
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index 8591261d..bf3ed52 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -108,9 +108,9 @@ URLRequestAutomationJob::URLRequestAutomationJob(
       upload_size_(0),
       weak_factory_(this) {
   DVLOG(1) << "URLRequestAutomationJob create. Count: " << ++instance_count_;
-  DCHECK(message_filter_ != NULL);
+  DCHECK(message_filter_.get() != NULL);
 
-  if (message_filter_) {
+  if (message_filter_.get()) {
     id_ = message_filter_->NewAutomationRequestId();
     DCHECK_NE(id_, 0);
   }
@@ -152,9 +152,12 @@ net::URLRequestJob* URLRequestAutomationJob::Factory(
       if (AutomationResourceMessageFilter::LookupRegisteredRenderView(
               child_id, route_id, &details)) {
         URLRequestAutomationJob* job = new URLRequestAutomationJob(
-            request, network_delegate,
+            request,
+            network_delegate,
             request->context()->http_user_agent_settings(),
-            details.tab_handle, info->GetRequestID(), details.filter,
+            details.tab_handle,
+            info->GetRequestID(),
+            details.filter.get(),
             details.is_pending_render_view);
         return job;
       }
@@ -208,7 +211,7 @@ bool URLRequestAutomationJob::ReadRawData(
   pending_buf_ = buf;
   pending_buf_size_ = buf_size;
 
-  if (message_filter_) {
+  if (message_filter_.get()) {
     message_filter_->Send(new AutomationMsg_RequestRead(tab_, id_, buf_size));
     SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
   } else {
@@ -223,7 +226,7 @@ bool URLRequestAutomationJob::ReadRawData(
 bool URLRequestAutomationJob::GetMimeType(std::string* mime_type) const {
   if (!mime_type_.empty()) {
     *mime_type = mime_type_;
-  } else if (headers_) {
+  } else if (headers_.get()) {
     headers_->GetMimeType(mime_type);
   }
 
@@ -231,13 +234,13 @@ bool URLRequestAutomationJob::GetMimeType(std::string* mime_type) const {
 }
 
 bool URLRequestAutomationJob::GetCharset(std::string* charset) {
-  if (headers_)
+  if (headers_.get())
     return headers_->GetCharset(charset);
   return false;
 }
 
 void URLRequestAutomationJob::GetResponseInfo(net::HttpResponseInfo* info) {
-  if (headers_)
+  if (headers_.get())
     info->headers = headers_;
   if (request_->url().SchemeIsSecure()) {
     // Make up a fake certificate for this response since we don't have
@@ -257,7 +260,7 @@ void URLRequestAutomationJob::GetResponseInfo(net::HttpResponseInfo* info) {
 }
 
 int URLRequestAutomationJob::GetResponseCode() const {
-  if (headers_)
+  if (headers_.get())
     return headers_->response_code();
 
   static const int kDefaultResponseCode = 200;
@@ -359,7 +362,7 @@ void URLRequestAutomationJob::OnDataAvailable(
   // Clear any IO pending status.
   SetStatus(net::URLRequestStatus());
 
-  if (pending_buf_ && pending_buf_->data()) {
+  if (pending_buf_.get() && pending_buf_->data()) {
     DCHECK_GE(pending_buf_size_, bytes.size());
     const int bytes_to_copy = std::min(bytes.size(), pending_buf_size_);
     memcpy(pending_buf_->data(), &bytes[0], bytes_to_copy);
@@ -403,7 +406,7 @@ void URLRequestAutomationJob::OnRequestEnd(
     // 2. In response to a read request.
     if (!has_response_started()) {
       NotifyStartError(status);
-    } else if (pending_buf_) {
+    } else if (pending_buf_.get()) {
       pending_buf_ = NULL;
       pending_buf_size_ = 0;
       NotifyDone(status);
@@ -426,7 +429,7 @@ void URLRequestAutomationJob::Cleanup() {
   id_ = 0;
   tab_ = 0;
 
-  DCHECK(!message_filter_);
+  DCHECK(!message_filter_.get());
   DisconnectFromMessageFilter();
 
   pending_buf_ = NULL;
@@ -506,13 +509,13 @@ void URLRequestAutomationJob::StartAsync() {
   automation_request.resource_type = resource_type;
   automation_request.load_flags = request_->load_flags();
 
-  DCHECK(message_filter_);
-  message_filter_->Send(new AutomationMsg_RequestStart(
-      tab_, id_, automation_request));
+  DCHECK(message_filter_.get());
+  message_filter_->Send(
+      new AutomationMsg_RequestStart(tab_, id_, automation_request));
 }
 
 void URLRequestAutomationJob::DisconnectFromMessageFilter() {
-  if (message_filter_) {
+  if (message_filter_.get()) {
     message_filter_->UnRegisterRequest(this);
     message_filter_ = NULL;
   }
@@ -533,7 +536,7 @@ void URLRequestAutomationJob::NotifyJobCompletionTask() {
     NotifyDone(request_status_);
   }
   // Reset any pending reads.
-  if (pending_buf_) {
+  if (pending_buf_.get()) {
     pending_buf_ = NULL;
     pending_buf_size_ = 0;
     NotifyReadComplete(0);
diff --git a/chrome/browser/automation/url_request_automation_job.h b/chrome/browser/automation/url_request_automation_job.h
index ee806b0..7a73144 100644
--- a/chrome/browser/automation/url_request_automation_job.h
+++ b/chrome/browser/automation/url_request_automation_job.h
@@ -71,7 +71,7 @@ class URLRequestAutomationJob : public net::URLRequestJob {
   }
 
   AutomationResourceMessageFilter* message_filter() const {
-    return message_filter_;
+    return message_filter_.get();
   }
 
   // Resumes a job, which was waiting for the external host to connect to the
diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc
index 0dfc126..3544f5a 100644
--- a/chrome/browser/background/background_application_list_model.cc
+++ b/chrome/browser/background/background_application_list_model.cc
@@ -226,7 +226,7 @@ void BackgroundApplicationListModel::DissociateApplicationData(
 const Extension* BackgroundApplicationListModel::GetExtension(
     int position) const {
   DCHECK(position >= 0 && static_cast<size_t>(position) < extensions_.size());
-  return extensions_[position];
+  return extensions_[position].get();
 }
 
 const BackgroundApplicationListModel::Application*
diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc
index 1b632d5..a40f27d 100644
--- a/chrome/browser/background/background_application_list_model_unittest.cc
+++ b/chrome/browser/background/background_application_list_model_unittest.cc
@@ -148,45 +148,45 @@ TEST_F(BackgroundApplicationListModelTest, MAYBE_ExplicitTest) {
   ASSERT_EQ(0U, model->size());
 
   // Add alternating Extensions and Background Apps
-  ASSERT_FALSE(IsBackgroundApp(*ext1));
-  service->AddExtension(ext1);
+  ASSERT_FALSE(IsBackgroundApp(*ext1.get()));
+  service->AddExtension(ext1.get());
   ASSERT_EQ(1U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
-  ASSERT_TRUE(IsBackgroundApp(*bgapp1));
-  service->AddExtension(bgapp1);
+  ASSERT_TRUE(IsBackgroundApp(*bgapp1.get()));
+  service->AddExtension(bgapp1.get());
   ASSERT_EQ(2U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
-  ASSERT_FALSE(IsBackgroundApp(*ext2));
-  service->AddExtension(ext2);
+  ASSERT_FALSE(IsBackgroundApp(*ext2.get()));
+  service->AddExtension(ext2.get());
   ASSERT_EQ(3U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
-  ASSERT_TRUE(IsBackgroundApp(*bgapp2));
-  service->AddExtension(bgapp2);
+  ASSERT_TRUE(IsBackgroundApp(*bgapp2.get()));
+  service->AddExtension(bgapp2.get());
   ASSERT_EQ(4U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
-  ASSERT_FALSE(IsBackgroundApp(*ext3));
-  service->AddExtension(ext3);
+  ASSERT_FALSE(IsBackgroundApp(*ext3.get()));
+  service->AddExtension(ext3.get());
   ASSERT_EQ(5U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
 
   // Remove in FIFO order.
-  ASSERT_FALSE(IsBackgroundApp(*ext1));
+  ASSERT_FALSE(IsBackgroundApp(*ext1.get()));
   service->UninstallExtension(ext1->id(), false, NULL);
   ASSERT_EQ(4U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
-  ASSERT_TRUE(IsBackgroundApp(*bgapp1));
+  ASSERT_TRUE(IsBackgroundApp(*bgapp1.get()));
   service->UninstallExtension(bgapp1->id(), false, NULL);
   ASSERT_EQ(3U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
-  ASSERT_FALSE(IsBackgroundApp(*ext2));
+  ASSERT_FALSE(IsBackgroundApp(*ext2.get()));
   service->UninstallExtension(ext2->id(), false, NULL);
   ASSERT_EQ(2U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
-  ASSERT_TRUE(IsBackgroundApp(*bgapp2));
+  ASSERT_TRUE(IsBackgroundApp(*bgapp2.get()));
   service->UninstallExtension(bgapp2->id(), false, NULL);
   ASSERT_EQ(1U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
-  ASSERT_FALSE(IsBackgroundApp(*ext3));
+  ASSERT_FALSE(IsBackgroundApp(*ext3.get()));
   service->UninstallExtension(ext3->id(), false, NULL);
   ASSERT_EQ(0U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
@@ -214,12 +214,12 @@ TEST_F(BackgroundApplicationListModelTest, AddRemovePermissionsTest) {
   ASSERT_EQ(0U, model->size());
 
   // Add one (non-background) extension and one background application
-  ASSERT_FALSE(IsBackgroundApp(*ext));
-  service->AddExtension(ext);
+  ASSERT_FALSE(IsBackgroundApp(*ext.get()));
+  service->AddExtension(ext.get());
   ASSERT_EQ(1U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
-  ASSERT_TRUE(IsBackgroundApp(*bgapp));
-  service->AddExtension(bgapp);
+  ASSERT_TRUE(IsBackgroundApp(*bgapp.get()));
+  service->AddExtension(bgapp.get());
   ASSERT_EQ(2U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
 
@@ -257,13 +257,13 @@ void AddExtension(ExtensionService* service,
   }
   scoped_refptr<Extension> extension =
       CreateExtension(GenerateUniqueExtensionName(), create_background);
-  ASSERT_EQ(BackgroundApplicationListModel::IsBackgroundApp(*extension,
+  ASSERT_EQ(BackgroundApplicationListModel::IsBackgroundApp(*extension.get(),
                                                             service->profile()),
             create_background);
   extensions->insert(extension);
   ++*count;
   ASSERT_EQ(*count, extensions->size());
-  service->AddExtension(extension);
+  service->AddExtension(extension.get());
   ASSERT_EQ(*count, service->extensions()->size());
   ASSERT_EQ(*expected, model->size());
 }
@@ -289,7 +289,7 @@ void RemoveExtension(ExtensionService* service,
     }
     scoped_refptr<Extension> extension = cursor->get();
     std::string id = extension->id();
-    if (BackgroundApplicationListModel::IsBackgroundApp(*extension,
+    if (BackgroundApplicationListModel::IsBackgroundApp(*extension.get(),
                                                         service->profile())) {
       --*expected;
     }
@@ -323,17 +323,17 @@ void TogglePermission(ExtensionService* service,
     }
     scoped_refptr<Extension> extension = cursor->get();
     std::string id = extension->id();
-    if (BackgroundApplicationListModel::IsBackgroundApp(*extension,
+    if (BackgroundApplicationListModel::IsBackgroundApp(*extension.get(),
                                                         service->profile())) {
       --*expected;
       ASSERT_EQ(*count, extensions->size());
-      RemoveBackgroundPermission(service, extension);
+      RemoveBackgroundPermission(service, extension.get());
       ASSERT_EQ(*count, service->extensions()->size());
       ASSERT_EQ(*expected, model->size());
     } else {
       ++*expected;
       ASSERT_EQ(*count, extensions->size());
-      AddBackgroundPermission(service, extension);
+      AddBackgroundPermission(service, extension.get());
       ASSERT_EQ(*count, service->extensions()->size());
       ASSERT_EQ(*expected, model->size());
     }
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index a959e97..ff5325a 100644
--- a/chrome/browser/background/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -139,14 +139,13 @@ void NotificationImageReady(
     notification_icon = rb.GetImageNamed(IDR_EXTENSION_DEFAULT_ICON);
   }
   string16 title;  // no notification title
-  DesktopNotificationService::AddIconNotification(
-      extension_url,
-      title,
-      message,
-      notification_icon,
-      string16(),
-      delegate,
-      profile);
+  DesktopNotificationService::AddIconNotification(extension_url,
+                                                  title,
+                                                  message,
+                                                  notification_icon,
+                                                  string16(),
+                                                  delegate.get(),
+                                                  profile);
 }
 #endif
 
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 881b775..b5e5eff 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -123,8 +123,8 @@ void BackgroundModeManager::BackgroundModeData::BuildProfileMenu(
              applications_->begin();
          cursor != applications_->end();
          ++cursor, ++position) {
-      const gfx::ImageSkia* icon = applications_->GetIcon(*cursor);
-      DCHECK(position == applications_->GetPosition(*cursor));
+      const gfx::ImageSkia* icon = applications_->GetIcon(cursor->get());
+      DCHECK(position == applications_->GetPosition(cursor->get()));
       const std::string& name = (*cursor)->name();
       menu->AddItem(position, UTF8ToUTF16(name));
       if (icon)
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index bdef521..72ec056 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -219,7 +219,7 @@ BookmarkModel::~BookmarkModel() {
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     BookmarkModelBeingDeleted(this));
 
-  if (store_) {
+  if (store_.get()) {
     // The store maintains a reference back to us. We need to tell it we're gone
     // so that it doesn't try and invoke a method back on us again.
     store_->BookmarkModelDeleted();
@@ -253,7 +253,7 @@ void BookmarkModel::Load(
                  content::Source<Profile>(profile_));
 
   // Load the bookmarks. BookmarkStorage notifies us when done.
-  store_ = new BookmarkStorage(profile_, this, task_runner);
+  store_ = new BookmarkStorage(profile_, this, task_runner.get());
   store_->LoadBookmarks(CreateLoadDetails());
 }
 
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 0d1214d..2d7ccf9 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -680,9 +680,9 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
 
 DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
   DCHECK(CalledOnValidThread());
-  if (!download_request_limiter_)
+  if (!download_request_limiter_.get())
     download_request_limiter_ = new DownloadRequestLimiter();
-  return download_request_limiter_;
+  return download_request_limiter_.get();
 }
 
 BackgroundModeManager* BrowserProcessImpl::background_mode_manager() {
@@ -813,11 +813,11 @@ void BrowserProcessImpl::CreateLocalState() {
   scoped_refptr<PrefRegistrySimple> pref_registry = new PrefRegistrySimple;
 
   // Register local state preferences.
-  chrome::RegisterLocalState(pref_registry);
+  chrome::RegisterLocalState(pref_registry.get());
 
   local_state_.reset(
       chrome_prefs::CreateLocalState(local_state_path,
-                                     local_state_task_runner_,
+                                     local_state_task_runner_.get(),
                                      policy_service(),
                                      NULL,
                                      pref_registry,
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
index ba19455..69280ee 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
@@ -41,8 +41,8 @@ void BrowsingDataAppCacheHelper::StartFetching(const base::Closure& callback) {
   appcache_info_callback_.Reset(
       base::Bind(&BrowsingDataAppCacheHelper::OnFetchComplete,
                  base::Unretained(this)));
-  appcache_service_->
-      GetAllAppCacheInfo(info_collection_, appcache_info_callback_.callback());
+  appcache_service_->GetAllAppCacheInfo(info_collection_.get(),
+                                        appcache_info_callback_.callback());
 }
 
 void BrowsingDataAppCacheHelper::DeleteAppCacheGroup(
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper.h b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
index c29fa80..d1eddc6 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
@@ -31,7 +31,7 @@ class BrowsingDataAppCacheHelper
 
   appcache::AppCacheInfoCollection* info_collection() const {
     DCHECK(!is_fetching_);
-    return info_collection_;
+    return info_collection_.get();
   }
 
  protected:
diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
index ff769e7..f5819af 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
@@ -63,7 +63,7 @@ void BrowsingDataCookieHelper::FetchCookiesOnIOThread() {
   scoped_refptr<net::CookieMonster> cookie_monster =
       request_context_getter_->GetURLRequestContext()->
       cookie_store()->GetCookieMonster();
-  if (cookie_monster) {
+  if (cookie_monster.get()) {
     cookie_monster->GetAllCookiesAsync(
         base::Bind(&BrowsingDataCookieHelper::OnFetchComplete, this));
   } else {
@@ -93,7 +93,7 @@ void BrowsingDataCookieHelper::DeleteCookieOnIOThread(
   scoped_refptr<net::CookieMonster> cookie_monster =
       request_context_getter_->GetURLRequestContext()->
       cookie_store()->GetCookieMonster();
-  if (cookie_monster) {
+  if (cookie_monster.get()) {
     cookie_monster->DeleteCanonicalCookieAsync(
         cookie, net::CookieMonster::DeleteCookieCallback());
   }
diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper.h b/chrome/browser/browsing_data/browsing_data_cookie_helper.h
index 8fedfe3..a94c0c1 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper.h
@@ -46,7 +46,7 @@ class BrowsingDataCookieHelper
   virtual ~BrowsingDataCookieHelper();
 
   net::URLRequestContextGetter* request_context_getter() {
-    return request_context_getter_;
+    return request_context_getter_.get();
   }
 
  private:
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
index ab1d7c3..228c752 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
@@ -85,10 +85,9 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, DISABLED_FetchData) {
   CreateDatabases();
   scoped_refptr<BrowsingDataDatabaseHelper> database_helper(
       new BrowsingDataDatabaseHelper(browser()->profile()));
-  StopTestOnCallback stop_test_on_callback(database_helper);
-  database_helper->StartFetching(
-      base::Bind(&StopTestOnCallback::Callback,
-                 base::Unretained(&stop_test_on_callback)));
+  StopTestOnCallback stop_test_on_callback(database_helper.get());
+  database_helper->StartFetching(base::Bind(
+      &StopTestOnCallback::Callback, base::Unretained(&stop_test_on_callback)));
   // Blocks until StopTestOnCallback::Callback is notified.
   content::RunMessageLoop();
 }
diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
index 049ba79..d5c16d2 100644
--- a/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
@@ -82,7 +82,7 @@ BrowsingDataFileSystemHelperImpl::BrowsingDataFileSystemHelperImpl(
     fileapi::FileSystemContext* filesystem_context)
     : filesystem_context_(filesystem_context),
       is_fetching_(false) {
-  DCHECK(filesystem_context_);
+  DCHECK(filesystem_context_.get());
 }
 
 BrowsingDataFileSystemHelperImpl::~BrowsingDataFileSystemHelperImpl() {
@@ -132,14 +132,11 @@ void BrowsingDataFileSystemHelperImpl::FetchFileSystemInfoInFileThread() {
     // We can call these synchronous methods as we've already verified that
     // we're running on the FILE thread.
     int64 persistent_usage = quota_util->GetOriginUsageOnFileThread(
-        filesystem_context_, current,
-        fileapi::kFileSystemTypePersistent);
+        filesystem_context_.get(), current, fileapi::kFileSystemTypePersistent);
     int64 temporary_usage = quota_util->GetOriginUsageOnFileThread(
-        filesystem_context_, current,
-        fileapi::kFileSystemTypeTemporary);
+        filesystem_context_.get(), current, fileapi::kFileSystemTypeTemporary);
     int64 syncable_usage = quota_util->GetOriginUsageOnFileThread(
-        filesystem_context_, current,
-        fileapi::kFileSystemTypeSyncable);
+        filesystem_context_.get(), current, fileapi::kFileSystemTypeSyncable);
     file_system_info_.push_back(
         FileSystemInfo(
             current,
diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
index 8ce8867..67df9c0 100644
--- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
@@ -117,44 +117,48 @@ TEST_F(BrowsingDataHelperTest, TestMatches) {
   // Protect kOrigin1.
   mock_policy->AddProtected(kOrigin1.GetOrigin());
 
-  EXPECT_FALSE(Match(kOrigin1, kUnprotected, mock_policy));
-  EXPECT_TRUE(Match(kOrigin2, kUnprotected, mock_policy));
-  EXPECT_FALSE(Match(kOriginExt, kUnprotected, mock_policy));
-  EXPECT_FALSE(Match(kOriginDevTools, kUnprotected, mock_policy));
-
-  EXPECT_TRUE(Match(kOrigin1, kProtected, mock_policy));
-  EXPECT_FALSE(Match(kOrigin2, kProtected, mock_policy));
-  EXPECT_FALSE(Match(kOriginExt, kProtected, mock_policy));
-  EXPECT_FALSE(Match(kOriginDevTools, kProtected, mock_policy));
-
-  EXPECT_FALSE(Match(kOrigin1, kExtension, mock_policy));
-  EXPECT_FALSE(Match(kOrigin2, kExtension, mock_policy));
-  EXPECT_TRUE(Match(kOriginExt, kExtension, mock_policy));
-  EXPECT_FALSE(Match(kOriginDevTools, kExtension, mock_policy));
-
-  EXPECT_TRUE(Match(kOrigin1, kUnprotected | kProtected, mock_policy));
-  EXPECT_TRUE(Match(kOrigin2, kUnprotected | kProtected, mock_policy));
-  EXPECT_FALSE(Match(kOriginExt, kUnprotected | kProtected, mock_policy));
-  EXPECT_FALSE(Match(kOriginDevTools, kUnprotected | kProtected, mock_policy));
-
-  EXPECT_FALSE(Match(kOrigin1, kUnprotected | kExtension, mock_policy));
-  EXPECT_TRUE(Match(kOrigin2, kUnprotected | kExtension, mock_policy));
-  EXPECT_TRUE(Match(kOriginExt, kUnprotected | kExtension, mock_policy));
-  EXPECT_FALSE(Match(kOriginDevTools, kUnprotected | kExtension, mock_policy));
-
-  EXPECT_TRUE(Match(kOrigin1, kProtected | kExtension, mock_policy));
-  EXPECT_FALSE(Match(kOrigin2, kProtected | kExtension, mock_policy));
-  EXPECT_TRUE(Match(kOriginExt, kProtected | kExtension, mock_policy));
-  EXPECT_FALSE(Match(kOriginDevTools, kProtected | kExtension, mock_policy));
-
-  EXPECT_TRUE(Match(kOrigin1, kUnprotected | kProtected | kExtension,
-      mock_policy));
-  EXPECT_TRUE(Match(kOrigin2, kUnprotected | kProtected | kExtension,
-      mock_policy));
-  EXPECT_TRUE(Match(kOriginExt, kUnprotected | kProtected | kExtension,
-      mock_policy));
-  EXPECT_FALSE(Match(kOriginDevTools, kUnprotected | kProtected | kExtension,
-      mock_policy));
+  EXPECT_FALSE(Match(kOrigin1, kUnprotected, mock_policy.get()));
+  EXPECT_TRUE(Match(kOrigin2, kUnprotected, mock_policy.get()));
+  EXPECT_FALSE(Match(kOriginExt, kUnprotected, mock_policy.get()));
+  EXPECT_FALSE(Match(kOriginDevTools, kUnprotected, mock_policy.get()));
+
+  EXPECT_TRUE(Match(kOrigin1, kProtected, mock_policy.get()));
+  EXPECT_FALSE(Match(kOrigin2, kProtected, mock_policy.get()));
+  EXPECT_FALSE(Match(kOriginExt, kProtected, mock_policy.get()));
+  EXPECT_FALSE(Match(kOriginDevTools, kProtected, mock_policy.get()));
+
+  EXPECT_FALSE(Match(kOrigin1, kExtension, mock_policy.get()));
+  EXPECT_FALSE(Match(kOrigin2, kExtension, mock_policy.get()));
+  EXPECT_TRUE(Match(kOriginExt, kExtension, mock_policy.get()));
+  EXPECT_FALSE(Match(kOriginDevTools, kExtension, mock_policy.get()));
+
+  EXPECT_TRUE(Match(kOrigin1, kUnprotected | kProtected, mock_policy.get()));
+  EXPECT_TRUE(Match(kOrigin2, kUnprotected | kProtected, mock_policy.get()));
+  EXPECT_FALSE(Match(kOriginExt, kUnprotected | kProtected, mock_policy.get()));
+  EXPECT_FALSE(
+      Match(kOriginDevTools, kUnprotected | kProtected, mock_policy.get()));
+
+  EXPECT_FALSE(Match(kOrigin1, kUnprotected | kExtension, mock_policy.get()));
+  EXPECT_TRUE(Match(kOrigin2, kUnprotected | kExtension, mock_policy.get()));
+  EXPECT_TRUE(Match(kOriginExt, kUnprotected | kExtension, mock_policy.get()));
+  EXPECT_FALSE(
+      Match(kOriginDevTools, kUnprotected | kExtension, mock_policy.get()));
+
+  EXPECT_TRUE(Match(kOrigin1, kProtected | kExtension, mock_policy.get()));
+  EXPECT_FALSE(Match(kOrigin2, kProtected | kExtension, mock_policy.get()));
+  EXPECT_TRUE(Match(kOriginExt, kProtected | kExtension, mock_policy.get()));
+  EXPECT_FALSE(
+      Match(kOriginDevTools, kProtected | kExtension, mock_policy.get()));
+
+  EXPECT_TRUE(Match(
+      kOrigin1, kUnprotected | kProtected | kExtension, mock_policy.get()));
+  EXPECT_TRUE(Match(
+      kOrigin2, kUnprotected | kProtected | kExtension, mock_policy.get()));
+  EXPECT_TRUE(Match(
+      kOriginExt, kUnprotected | kProtected | kExtension, mock_policy.get()));
+  EXPECT_FALSE(Match(kOriginDevTools,
+                     kUnprotected | kProtected | kExtension,
+                     mock_policy.get()));
 }
 
 }  // namespace
diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
index 269c647..75e2a32 100644
--- a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
@@ -113,10 +113,9 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, CallbackCompletes) {
   scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper(
       new BrowsingDataLocalStorageHelper(browser()->profile()));
   CreateLocalStorageFilesForTest();
-  StopTestOnCallback stop_test_on_callback(local_storage_helper);
-  local_storage_helper->StartFetching(
-      base::Bind(&StopTestOnCallback::Callback,
-                 base::Unretained(&stop_test_on_callback)));
+  StopTestOnCallback stop_test_on_callback(local_storage_helper.get());
+  local_storage_helper->StartFetching(base::Bind(
+      &StopTestOnCallback::Callback, base::Unretained(&stop_test_on_callback)));
   // Blocks until StopTestOnCallback::Callback is notified.
   content::RunMessageLoop();
 }
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
index abb2ae0..0c9827d 100644
--- a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
@@ -42,7 +42,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test {
     helper_ = new BrowsingDataQuotaHelperImpl(
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
-        quota_manager_);
+        quota_manager_.get());
   }
 
   virtual void TearDown() OVERRIDE {
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 8021497..a4e1b8f 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -745,8 +745,8 @@ void BrowsingDataRemover::ClearCacheOnIOThread() {
   // This function should be called on the IO thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(STATE_NONE, next_cache_state_);
-  DCHECK(main_context_getter_);
-  DCHECK(media_context_getter_);
+  DCHECK(main_context_getter_.get());
+  DCHECK(media_context_getter_.get());
 
   next_cache_state_ = STATE_CREATE_MAIN;
   DoClearCache(net::OK);
@@ -764,8 +764,9 @@ void BrowsingDataRemover::DoClearCache(int rv) {
       case STATE_CREATE_MEDIA: {
         // Get a pointer to the cache.
         net::URLRequestContextGetter* getter =
-            (next_cache_state_ == STATE_CREATE_MAIN) ?
-                main_context_getter_ : media_context_getter_;
+            (next_cache_state_ == STATE_CREATE_MAIN)
+                ? main_context_getter_.get()
+                : media_context_getter_.get();
         net::HttpTransactionFactory* factory =
             getter->GetURLRequestContext()->http_transaction_factory();
 
@@ -877,9 +878,8 @@ void BrowsingDataRemover::OnGotLocalStorageUsageInfo(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   for (size_t i = 0; i < infos.size(); ++i) {
-    if (!BrowsingDataHelper::DoesOriginMatchMask(infos[i].origin,
-                                                 origin_set_mask_,
-                                                 special_storage_policy_))
+    if (!BrowsingDataHelper::DoesOriginMatchMask(
+            infos[i].origin, origin_set_mask_, special_storage_policy_.get()))
       continue;
 
     if (infos[i].last_modified >= delete_begin_ &&
@@ -906,9 +906,8 @@ void BrowsingDataRemover::OnGotSessionStorageUsageInfo(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   for (size_t i = 0; i < infos.size(); ++i) {
-    if (!BrowsingDataHelper::DoesOriginMatchMask(infos[i].origin,
-                                                 origin_set_mask_,
-                                                 special_storage_policy_))
+    if (!BrowsingDataHelper::DoesOriginMatchMask(
+            infos[i].origin, origin_set_mask_, special_storage_policy_.get()))
       continue;
 
     dom_storage_context_->DeleteSessionStorage(infos[i]);
@@ -968,7 +967,7 @@ void BrowsingDataRemover::OnGotQuotaManagedOrigins(
 
     if (!BrowsingDataHelper::DoesOriginMatchMask(origin->GetOrigin(),
                                                  origin_set_mask_,
-                                                 special_storage_policy_))
+                                                 special_storage_policy_.get()))
       continue;
 
     ++quota_managed_origins_to_delete_count_;
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 7a30180..ca282dd 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -238,7 +238,7 @@ class RemoveSafeBrowsingCookieTester : public RemoveCookieTester {
       : browser_process_(TestingBrowserProcess::GetGlobal()) {
     scoped_refptr<SafeBrowsingService> sb_service =
         SafeBrowsingService::CreateSafeBrowsingService();
-    browser_process_->SetSafeBrowsingService(sb_service);
+    browser_process_->SetSafeBrowsingService(sb_service.get());
     sb_service->Initialize();
     base::MessageLoop::current()->RunUntilIdle();
 
@@ -623,15 +623,15 @@ class BrowsingDataRemoverTest : public testing::Test,
   }
 
   quota::MockQuotaManager* GetMockManager() {
-    if (!quota_manager_) {
+    if (!quota_manager_.get()) {
       quota_manager_ = new quota::MockQuotaManager(
-        profile_->IsOffTheRecord(),
-        profile_->GetPath(),
-        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
-        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
-        profile_->GetExtensionSpecialStoragePolicy());
+          profile_->IsOffTheRecord(),
+          profile_->GetPath(),
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
+          profile_->GetExtensionSpecialStoragePolicy());
     }
-    return quota_manager_;
+    return quota_manager_.get();
   }
 
   // content::NotificationObserver implementation.
@@ -775,7 +775,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveUnprotectedLocalStorageForever) {
   scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
       new MockExtensionSpecialStoragePolicy;
   mock_policy->AddProtected(kOrigin1.GetOrigin());
-  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
 
   RemoveLocalStorageTester tester(GetProfile());
 
@@ -801,7 +801,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveProtectedLocalStorageForever) {
   scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
       new MockExtensionSpecialStoragePolicy;
   mock_policy->AddProtected(kOrigin1.GetOrigin());
-  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
 
   RemoveLocalStorageTester tester(GetProfile());
 
@@ -1178,7 +1178,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedUnprotectedOrigins) {
   scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
       new MockExtensionSpecialStoragePolicy;
   mock_policy->AddProtected(kOrigin1.GetOrigin());
-  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
 
   PopulateTestQuotaManagedData(GetMockManager());
 
@@ -1212,7 +1212,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedSpecificOrigin) {
   scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
       new MockExtensionSpecialStoragePolicy;
   mock_policy->AddProtected(kOrigin1.GetOrigin());
-  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
 
   PopulateTestQuotaManagedData(GetMockManager());
 
@@ -1247,7 +1247,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedOrigins) {
   scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
       new MockExtensionSpecialStoragePolicy;
   mock_policy->AddProtected(kOrigin1.GetOrigin());
-  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+  GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
 
   PopulateTestQuotaManagedData(GetMockManager());
 
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 4c22203..a313b69 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -313,9 +313,9 @@ void CookieTreeAppCacheNode::DeleteStoredObjects() {
   LocalDataContainer* container = GetLocalDataContainerForNode(this);
 
   if (container) {
-    DCHECK(container->appcache_helper_);
-    container->appcache_helper_->DeleteAppCacheGroup(
-        appcache_info_->manifest_url);
+    DCHECK(container->appcache_helper_.get());
+    container->appcache_helper_
+        ->DeleteAppCacheGroup(appcache_info_->manifest_url);
     container->appcache_info_[origin_url_].erase(appcache_info_);
   }
 }
@@ -959,7 +959,7 @@ void CookiesTreeModel::UpdateSearchResults(const string16& filter) {
 
 const ExtensionSet* CookiesTreeModel::ExtensionsProtectingNode(
     const CookieTreeNode& cookie_node) {
-  if (!special_storage_policy_)
+  if (!special_storage_policy_.get())
     return NULL;
 
   CookieTreeNode::DetailedInfo info = cookie_node.GetDetailedInfo();
diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
index 5452af6..ef4e8b6 100644
--- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
@@ -79,7 +79,7 @@ class CookiesTreeModelTest : public testing::Test {
         new CookieSettings(profile_->GetHostContentSettingsMap(),
                            profile_->GetPrefs());
     special_storage_policy_ =
-        new ExtensionSpecialStoragePolicy(cookie_settings);
+        new ExtensionSpecialStoragePolicy(cookie_settings.get());
   }
 
   virtual void TearDown() OVERRIDE {
@@ -97,21 +97,19 @@ class CookiesTreeModelTest : public testing::Test {
 
   scoped_ptr<CookiesTreeModel> CreateCookiesTreeModelWithInitialSample() {
     LocalDataContainer* container = new LocalDataContainer(
-        mock_browsing_data_cookie_helper_,
-        mock_browsing_data_database_helper_,
-        mock_browsing_data_local_storage_helper_,
-        mock_browsing_data_session_storage_helper_,
-        mock_browsing_data_appcache_helper_,
-        mock_browsing_data_indexed_db_helper_,
-        mock_browsing_data_file_system_helper_,
-        mock_browsing_data_quota_helper_,
-        mock_browsing_data_server_bound_cert_helper_,
-        mock_browsing_data_flash_lso_helper_);
+        mock_browsing_data_cookie_helper_.get(),
+        mock_browsing_data_database_helper_.get(),
+        mock_browsing_data_local_storage_helper_.get(),
+        mock_browsing_data_session_storage_helper_.get(),
+        mock_browsing_data_appcache_helper_.get(),
+        mock_browsing_data_indexed_db_helper_.get(),
+        mock_browsing_data_file_system_helper_.get(),
+        mock_browsing_data_quota_helper_.get(),
+        mock_browsing_data_server_bound_cert_helper_.get(),
+        mock_browsing_data_flash_lso_helper_.get());
 
     CookiesTreeModel* cookies_model =
-        new CookiesTreeModel(container,
-                             special_storage_policy_,
-                             false);
+        new CookiesTreeModel(container, special_storage_policy_.get(), false);
     mock_browsing_data_cookie_helper_->
         AddCookieSamples(GURL("http://foo1"), "A=1");
     mock_browsing_data_cookie_helper_->
@@ -820,18 +818,19 @@ TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
 }
 
 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
-  LocalDataContainer* container = new LocalDataContainer(
-      mock_browsing_data_cookie_helper_,
-      mock_browsing_data_database_helper_,
-      mock_browsing_data_local_storage_helper_,
-      mock_browsing_data_session_storage_helper_,
-      mock_browsing_data_appcache_helper_,
-      mock_browsing_data_indexed_db_helper_,
-      mock_browsing_data_file_system_helper_,
-      mock_browsing_data_quota_helper_,
-      mock_browsing_data_server_bound_cert_helper_,
-      mock_browsing_data_flash_lso_helper_);
-  CookiesTreeModel cookies_model(container, special_storage_policy_, false);
+  LocalDataContainer* container =
+      new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
+                             mock_browsing_data_database_helper_.get(),
+                             mock_browsing_data_local_storage_helper_.get(),
+                             mock_browsing_data_session_storage_helper_.get(),
+                             mock_browsing_data_appcache_helper_.get(),
+                             mock_browsing_data_indexed_db_helper_.get(),
+                             mock_browsing_data_file_system_helper_.get(),
+                             mock_browsing_data_quota_helper_.get(),
+                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_flash_lso_helper_.get());
+  CookiesTreeModel cookies_model(
+      container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1"), "A=1");
@@ -908,18 +907,19 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
 }
 
 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
-  LocalDataContainer* container = new LocalDataContainer(
-      mock_browsing_data_cookie_helper_,
-      mock_browsing_data_database_helper_,
-      mock_browsing_data_local_storage_helper_,
-      mock_browsing_data_session_storage_helper_,
-      mock_browsing_data_appcache_helper_,
-      mock_browsing_data_indexed_db_helper_,
-      mock_browsing_data_file_system_helper_,
-      mock_browsing_data_quota_helper_,
-      mock_browsing_data_server_bound_cert_helper_,
-      mock_browsing_data_flash_lso_helper_);
-  CookiesTreeModel cookies_model(container, special_storage_policy_,false);
+  LocalDataContainer* container =
+      new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
+                             mock_browsing_data_database_helper_.get(),
+                             mock_browsing_data_local_storage_helper_.get(),
+                             mock_browsing_data_session_storage_helper_.get(),
+                             mock_browsing_data_appcache_helper_.get(),
+                             mock_browsing_data_indexed_db_helper_.get(),
+                             mock_browsing_data_file_system_helper_.get(),
+                             mock_browsing_data_quota_helper_.get(),
+                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_flash_lso_helper_.get());
+  CookiesTreeModel cookies_model(
+      container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1"), "A=1");
@@ -999,18 +999,19 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
 }
 
 TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) {
-  LocalDataContainer* container = new LocalDataContainer(
-      mock_browsing_data_cookie_helper_,
-      mock_browsing_data_database_helper_,
-      mock_browsing_data_local_storage_helper_,
-      mock_browsing_data_session_storage_helper_,
-      mock_browsing_data_appcache_helper_,
-      mock_browsing_data_indexed_db_helper_,
-      mock_browsing_data_file_system_helper_,
-      mock_browsing_data_quota_helper_,
-      mock_browsing_data_server_bound_cert_helper_,
-      mock_browsing_data_flash_lso_helper_);
-  CookiesTreeModel cookies_model(container, special_storage_policy_,false);
+  LocalDataContainer* container =
+      new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
+                             mock_browsing_data_database_helper_.get(),
+                             mock_browsing_data_local_storage_helper_.get(),
+                             mock_browsing_data_session_storage_helper_.get(),
+                             mock_browsing_data_appcache_helper_.get(),
+                             mock_browsing_data_indexed_db_helper_.get(),
+                             mock_browsing_data_file_system_helper_.get(),
+                             mock_browsing_data_quota_helper_.get(),
+                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_flash_lso_helper_.get());
+  CookiesTreeModel cookies_model(
+      container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1"), "A=1");
@@ -1041,18 +1042,19 @@ TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) {
 }
 
 TEST_F(CookiesTreeModelTest, OriginOrdering) {
-  LocalDataContainer* container = new LocalDataContainer(
-      mock_browsing_data_cookie_helper_,
-      mock_browsing_data_database_helper_,
-      mock_browsing_data_local_storage_helper_,
-      mock_browsing_data_session_storage_helper_,
-      mock_browsing_data_appcache_helper_,
-      mock_browsing_data_indexed_db_helper_,
-      mock_browsing_data_file_system_helper_,
-      mock_browsing_data_quota_helper_,
-      mock_browsing_data_server_bound_cert_helper_,
-      mock_browsing_data_flash_lso_helper_);
-  CookiesTreeModel cookies_model(container, special_storage_policy_, false);
+  LocalDataContainer* container =
+      new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
+                             mock_browsing_data_database_helper_.get(),
+                             mock_browsing_data_local_storage_helper_.get(),
+                             mock_browsing_data_session_storage_helper_.get(),
+                             mock_browsing_data_appcache_helper_.get(),
+                             mock_browsing_data_indexed_db_helper_.get(),
+                             mock_browsing_data_file_system_helper_.get(),
+                             mock_browsing_data_quota_helper_.get(),
+                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_flash_lso_helper_.get());
+  CookiesTreeModel cookies_model(
+      container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://a.foo2.com"), "A=1");
@@ -1088,18 +1090,19 @@ TEST_F(CookiesTreeModelTest, OriginOrdering) {
 
 TEST_F(CookiesTreeModelTest, ContentSettings) {
   GURL host("http://xyz.com/");
-  LocalDataContainer* container = new LocalDataContainer(
-      mock_browsing_data_cookie_helper_,
-      mock_browsing_data_database_helper_,
-      mock_browsing_data_local_storage_helper_,
-      mock_browsing_data_session_storage_helper_,
-      mock_browsing_data_appcache_helper_,
-      mock_browsing_data_indexed_db_helper_,
-      mock_browsing_data_file_system_helper_,
-      mock_browsing_data_quota_helper_,
-      mock_browsing_data_server_bound_cert_helper_,
-      mock_browsing_data_flash_lso_helper_);
-  CookiesTreeModel cookies_model(container, special_storage_policy_, false);
+  LocalDataContainer* container =
+      new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
+                             mock_browsing_data_database_helper_.get(),
+                             mock_browsing_data_local_storage_helper_.get(),
+                             mock_browsing_data_session_storage_helper_.get(),
+                             mock_browsing_data_appcache_helper_.get(),
+                             mock_browsing_data_indexed_db_helper_.get(),
+                             mock_browsing_data_file_system_helper_.get(),
+                             mock_browsing_data_quota_helper_.get(),
+                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_flash_lso_helper_.get());
+  CookiesTreeModel cookies_model(
+      container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1");
   mock_browsing_data_cookie_helper_->Notify();
@@ -1161,18 +1164,19 @@ TEST_F(CookiesTreeModelTest, FileSystemFilter) {
 }
 
 TEST_F(CookiesTreeModelTest, CookiesFilter) {
-  LocalDataContainer* container = new LocalDataContainer(
-      mock_browsing_data_cookie_helper_,
-      mock_browsing_data_database_helper_,
-      mock_browsing_data_local_storage_helper_,
-      mock_browsing_data_session_storage_helper_,
-      mock_browsing_data_appcache_helper_,
-      mock_browsing_data_indexed_db_helper_,
-      mock_browsing_data_file_system_helper_,
-      mock_browsing_data_quota_helper_,
-      mock_browsing_data_server_bound_cert_helper_,
-      mock_browsing_data_flash_lso_helper_);
-  CookiesTreeModel cookies_model(container, special_storage_policy_, false);
+  LocalDataContainer* container =
+      new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
+                             mock_browsing_data_database_helper_.get(),
+                             mock_browsing_data_local_storage_helper_.get(),
+                             mock_browsing_data_session_storage_helper_.get(),
+                             mock_browsing_data_appcache_helper_.get(),
+                             mock_browsing_data_indexed_db_helper_.get(),
+                             mock_browsing_data_file_system_helper_.get(),
+                             mock_browsing_data_quota_helper_.get(),
+                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_flash_lso_helper_.get());
+  CookiesTreeModel cookies_model(
+      container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://123.com"), "A=1");
diff --git a/chrome/browser/browsing_data/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc
index de9ce74..f051296 100644
--- a/chrome/browser/browsing_data/local_data_container.cc
+++ b/chrome/browser/browsing_data/local_data_container.cc
@@ -45,24 +45,24 @@ void LocalDataContainer::Init(CookiesTreeModel* model) {
   DCHECK(!model_);
   model_ = model;
 
-  DCHECK(cookie_helper_);
+  DCHECK(cookie_helper_.get());
   cookie_helper_->StartFetching(
       base::Bind(&LocalDataContainer::OnCookiesModelInfoLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 
-  if (database_helper_) {
+  if (database_helper_.get()) {
     database_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnDatabaseModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  if (local_storage_helper_) {
+  if (local_storage_helper_.get()) {
     local_storage_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnLocalStorageModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  if (session_storage_helper_) {
+  if (session_storage_helper_.get()) {
     session_storage_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnSessionStorageModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
@@ -70,37 +70,37 @@ void LocalDataContainer::Init(CookiesTreeModel* model) {
 
   // TODO(michaeln): When all of the UI implementations have been updated, make
   // this a required parameter.
-  if (appcache_helper_) {
+  if (appcache_helper_.get()) {
     appcache_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnAppCacheModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  if (indexed_db_helper_) {
+  if (indexed_db_helper_.get()) {
     indexed_db_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnIndexedDBModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  if (file_system_helper_) {
+  if (file_system_helper_.get()) {
     file_system_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnFileSystemModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  if (quota_helper_) {
+  if (quota_helper_.get()) {
     quota_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnQuotaModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  if (server_bound_cert_helper_) {
+  if (server_bound_cert_helper_.get()) {
     server_bound_cert_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnServerBoundCertModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  if (flash_lso_helper_) {
+  if (flash_lso_helper_.get()) {
     flash_lso_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnFlashLSOInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
@@ -115,7 +115,7 @@ void LocalDataContainer::OnAppCacheModelInfoLoaded() {
 
   scoped_refptr<AppCacheInfoCollection> appcache_info =
       appcache_helper_->info_collection();
-  if (!appcache_info || appcache_info->infos_by_origin.empty())
+  if (!appcache_info.get() || appcache_info->infos_by_origin.empty())
     return;
 
   for (InfoByOrigin::const_iterator origin =
diff --git a/chrome/browser/captive_portal/captive_portal_detector.cc b/chrome/browser/captive_portal/captive_portal_detector.cc
index e1bb561..26f1a20 100644
--- a/chrome/browser/captive_portal/captive_portal_detector.cc
+++ b/chrome/browser/captive_portal/captive_portal_detector.cc
@@ -60,7 +60,7 @@ void CaptivePortalDetector::DetectCaptivePortal(
                                              net::URLFetcher::GET,
                                              this));
   url_fetcher_->SetAutomaticallyRetryOn5xx(false);
-  url_fetcher_->SetRequestContext(request_context_);
+  url_fetcher_->SetRequestContext(request_context_.get());
 
   // Can't safely use net::LOAD_DISABLE_CERT_REVOCATION_CHECKING here,
   // since then the connection may be reused without checking the cert.
diff --git a/chrome/browser/certificate_viewer.cc b/chrome/browser/certificate_viewer.cc
index 38d502d..4c2c6e6 100644
--- a/chrome/browser/certificate_viewer.cc
+++ b/chrome/browser/certificate_viewer.cc
@@ -17,5 +17,5 @@ void ShowCertificateViewerByID(content::WebContents* web_contents,
     // we displayed the page info.
     return;
   }
-  ShowCertificateViewer(web_contents, parent, cert);
+  ShowCertificateViewer(web_contents, parent, cert.get());
 }
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index b832799..61306d3c 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -793,7 +793,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   {
     TRACE_EVENT0("startup",
       "ChromeBrowserMainParts::PreCreateThreadsImpl:InitBrowswerProcessImpl");
-    browser_process_.reset(new BrowserProcessImpl(local_state_task_runner,
+    browser_process_.reset(new BrowserProcessImpl(local_state_task_runner.get(),
                                                   parsed_command_line()));
   }
 
@@ -819,9 +819,8 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
             switches::kProfilingOutputFile));
   }
 
-  local_state_ = InitializeLocalState(local_state_task_runner,
-                                      parsed_command_line(),
-                                      is_first_run);
+  local_state_ = InitializeLocalState(
+      local_state_task_runner.get(), parsed_command_line(), is_first_run);
 
   // These members must be initialized before returning from this function.
   master_prefs_.reset(new first_run::MasterPrefs);
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 393fec0..10cda3a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1612,9 +1612,9 @@ void ChromeContentBrowserClient::SelectClientCertificate(
       const std::vector<scoped_refptr<net::X509Certificate> >&
           all_client_certs = cert_request_info->client_certs;
       for (size_t i = 0; i < all_client_certs.size(); ++i) {
-        if (CertMatchesFilter(*all_client_certs[i], *filter_dict)) {
+        if (CertMatchesFilter(*all_client_certs[i].get(), *filter_dict)) {
           // Use the first certificate that is matched by the filter.
-          callback.Run(all_client_certs[i]);
+          callback.Run(all_client_certs[i].get());
           return;
         }
       }
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index 6572f11..b227855 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -138,16 +138,16 @@ TEST_F(PrefProviderTest, Incognito) {
   builder.WithUserPrefs(user_prefs);
   scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
       new user_prefs::PrefRegistrySyncable);
-  PrefServiceSyncable* regular_prefs = builder.CreateSyncable(registry);
+  PrefServiceSyncable* regular_prefs = builder.CreateSyncable(registry.get());
 
-  chrome::RegisterUserPrefs(registry);
+  chrome::RegisterUserPrefs(registry.get());
 
   builder.WithUserPrefs(otr_user_prefs);
   scoped_refptr<user_prefs::PrefRegistrySyncable> otr_registry(
       new user_prefs::PrefRegistrySyncable);
-  PrefServiceSyncable* otr_prefs = builder.CreateSyncable(otr_registry);
+  PrefServiceSyncable* otr_prefs = builder.CreateSyncable(otr_registry.get());
 
-  chrome::RegisterUserPrefs(otr_registry);
+  chrome::RegisterUserPrefs(otr_registry.get());
 
   TestingProfile::Builder profile_builder;
   profile_builder.SetPrefService(make_scoped_ptr(regular_prefs));
diff --git a/chrome/browser/content_settings/local_shared_objects_container.h b/chrome/browser/content_settings/local_shared_objects_container.h
index 0bdd9a9..450698c 100644
--- a/chrome/browser/content_settings/local_shared_objects_container.h
+++ b/chrome/browser/content_settings/local_shared_objects_container.h
@@ -38,28 +38,26 @@ class LocalSharedObjectsContainer {
   scoped_ptr<CookiesTreeModel> CreateCookiesTreeModel() const;
 
   CannedBrowsingDataAppCacheHelper* appcaches() const {
-    return appcaches_;
-  }
-  CannedBrowsingDataCookieHelper* cookies() const {
-    return cookies_;
+    return appcaches_.get();
   }
+  CannedBrowsingDataCookieHelper* cookies() const { return cookies_.get(); }
   CannedBrowsingDataDatabaseHelper* databases() const {
-    return databases_;
+    return databases_.get();
   }
   CannedBrowsingDataFileSystemHelper* file_systems() const {
-    return file_systems_;
+    return file_systems_.get();
   }
   CannedBrowsingDataIndexedDBHelper* indexed_dbs() const {
-    return indexed_dbs_;
+    return indexed_dbs_.get();
   }
   CannedBrowsingDataLocalStorageHelper* local_storages() const {
-    return local_storages_;
+    return local_storages_.get();
   }
   CannedBrowsingDataServerBoundCertHelper* server_bound_certs() const {
-    return server_bound_certs_;
+    return server_bound_certs_.get();
   }
   CannedBrowsingDataLocalStorageHelper* session_storages() const {
-    return session_storages_;
+    return session_storages_.get();
   }
 
  private:
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc
index c303a38..de1e871 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc
@@ -163,7 +163,7 @@ net::URLRequestJob* ProtocolHandlerRegistry::IOThreadDelegate::MaybeCreateJob(
 ProtocolHandlerRegistry::JobInterceptorFactory::JobInterceptorFactory(
     IOThreadDelegate* io_thread_delegate)
     : io_thread_delegate_(io_thread_delegate) {
-  DCHECK(io_thread_delegate_);
+  DCHECK(io_thread_delegate_.get());
   DetachFromThread();
 }
 
@@ -301,7 +301,7 @@ void ProtocolHandlerRegistry::Delegate::RegisterWithOSAsDefaultClient(
   // and it will be automatically freed once all its tasks have finished.
   scoped_refptr<ShellIntegration::DefaultProtocolClientWorker> worker;
   worker = CreateShellWorker(observer, protocol);
-  observer->SetWorker(worker);
+  observer->SetWorker(worker.get());
   registry->default_client_observers_.push_back(observer);
   worker->StartSetAsDefault();
 }
@@ -474,7 +474,7 @@ void ProtocolHandlerRegistry::InitProtocolSettings() {
       DefaultClientObserver* observer = delegate_->CreateShellObserver(this);
       scoped_refptr<ShellIntegration::DefaultProtocolClientWorker> worker;
       worker = delegate_->CreateShellWorker(observer, handler.protocol());
-      observer->SetWorker(worker);
+      observer->SetWorker(worker.get());
       default_client_observers_.push_back(observer);
       worker->StartCheckIsDefault();
     }
@@ -882,6 +882,6 @@ ProtocolHandlerRegistry::CreateJobInterceptorFactory() {
   // this is always created on the UI thread (in profile_io's
   // InitializeOnUIThread. Any method calls must be done
   // on the IO thread (this is checked).
-  return scoped_ptr<JobInterceptorFactory>(new JobInterceptorFactory(
-      io_thread_delegate_));
+  return scoped_ptr<JobInterceptorFactory>(
+      new JobInterceptorFactory(io_thread_delegate_.get()));
 }
diff --git a/chrome/browser/devtools/adb_client_socket.cc b/chrome/browser/devtools/adb_client_socket.cc
index d434e0d..615b1be 100644
--- a/chrome/browser/devtools/adb_client_socket.cc
+++ b/chrome/browser/devtools/adb_client_socket.cc
@@ -141,7 +141,9 @@ class HttpOverAdbSocket {
     scoped_refptr<net::StringIOBuffer> request_buffer =
         new net::StringIOBuffer(request_);
 
-    result = socket_->Write(request_buffer, request_buffer->size(),
+    result = socket_->Write(
+        request_buffer.get(),
+        request_buffer->size(),
         base::Bind(&HttpOverAdbSocket::ReadResponse, base::Unretained(this)));
     if (result != net::ERR_IO_PENDING)
       ReadResponse(result);
@@ -154,9 +156,12 @@ class HttpOverAdbSocket {
     scoped_refptr<net::IOBuffer> response_buffer =
         new net::IOBuffer(kBufferSize);
 
-    result = socket_->Read(response_buffer, kBufferSize,
-        base::Bind(&HttpOverAdbSocket::OnResponseData, base::Unretained(this),
-                   response_buffer, -1));
+    result = socket_->Read(response_buffer.get(),
+                           kBufferSize,
+                           base::Bind(&HttpOverAdbSocket::OnResponseData,
+                                      base::Unretained(this),
+                                      response_buffer,
+                                      -1));
     if (result != net::ERR_IO_PENDING)
       OnResponseData(response_buffer, -1, result);
   }
@@ -204,9 +209,12 @@ class HttpOverAdbSocket {
       return;
     }
 
-    result = socket_->Read(response_buffer, kBufferSize,
-        base::Bind(&HttpOverAdbSocket::OnResponseData, base::Unretained(this),
-                   response_buffer, bytes_total));
+    result = socket_->Read(response_buffer.get(),
+                           kBufferSize,
+                           base::Bind(&HttpOverAdbSocket::OnResponseData,
+                                      base::Unretained(this),
+                                      response_buffer,
+                                      bytes_total));
     if (result != net::ERR_IO_PENDING)
       OnResponseData(response_buffer, bytes_total, result);
   }
@@ -376,9 +384,12 @@ void AdbClientSocket::SendCommand(const std::string& command,
                                   const CommandCallback& callback) {
   scoped_refptr<net::StringIOBuffer> request_buffer =
       new net::StringIOBuffer(EncodeMessage(command));
-  int result = socket_->Write(request_buffer, request_buffer->size(),
-      base::Bind(&AdbClientSocket::ReadResponse, base::Unretained(this),
-                 callback, is_void));
+  int result = socket_->Write(request_buffer.get(),
+                              request_buffer->size(),
+                              base::Bind(&AdbClientSocket::ReadResponse,
+                                         base::Unretained(this),
+                                         callback,
+                                         is_void));
   if (result != net::ERR_IO_PENDING)
     ReadResponse(callback, is_void, result);
 }
@@ -392,9 +403,13 @@ void AdbClientSocket::ReadResponse(const CommandCallback& callback,
   }
   scoped_refptr<net::IOBuffer> response_buffer =
       new net::IOBuffer(kBufferSize);
-  result = socket_->Read(response_buffer, kBufferSize,
-      base::Bind(&AdbClientSocket::OnResponseHeader, base::Unretained(this),
-                 callback, is_void, response_buffer));
+  result = socket_->Read(response_buffer.get(),
+                         kBufferSize,
+                         base::Bind(&AdbClientSocket::OnResponseHeader,
+                                    base::Unretained(this),
+                                    callback,
+                                    is_void,
+                                    response_buffer));
   if (result != net::ERR_IO_PENDING)
     OnResponseHeader(callback, is_void, response_buffer, result);
 }
@@ -460,9 +475,14 @@ void AdbClientSocket::OnResponseData(
   }
 
   // Read tail
-  result = socket_->Read(response_buffer, kBufferSize,
-      base::Bind(&AdbClientSocket::OnResponseData, base::Unretained(this),
-                 callback, new_response, response_buffer, bytes_left));
+  result = socket_->Read(response_buffer.get(),
+                         kBufferSize,
+                         base::Bind(&AdbClientSocket::OnResponseData,
+                                    base::Unretained(this),
+                                    callback,
+                                    new_response,
+                                    response_buffer,
+                                    bytes_left));
   if (result > 0)
     OnResponseData(callback, new_response, response_buffer, bytes_left, result);
   else if (result != net::ERR_IO_PENDING)
diff --git a/chrome/browser/devtools/devtools_adb_bridge.cc b/chrome/browser/devtools/devtools_adb_bridge.cc
index 3ef3e55..139f44c 100644
--- a/chrome/browser/devtools/devtools_adb_bridge.cc
+++ b/chrome/browser/devtools/devtools_adb_bridge.cc
@@ -369,7 +369,9 @@ class AgentHostDelegate : public base::RefCountedThreadSafe<AgentHostDelegate>,
   void StartListeningOnHandlerThread() {
     scoped_refptr<net::IOBuffer> response_buffer =
         new net::IOBuffer(kBufferSize);
-    int result = socket_->Read(response_buffer, kBufferSize,
+    int result = socket_->Read(
+        response_buffer.get(),
+        kBufferSize,
         base::Bind(&AgentHostDelegate::OnBytesRead, this, response_buffer));
     if (result != net::ERR_IO_PENDING)
       OnBytesRead(response_buffer, result);
@@ -408,7 +410,9 @@ class AgentHostDelegate : public base::RefCountedThreadSafe<AgentHostDelegate>,
       return;
     }
 
-    result = socket_->Read(response_buffer, kBufferSize,
+    result = socket_->Read(
+        response_buffer.get(),
+        kBufferSize,
         base::Bind(&AgentHostDelegate::OnBytesRead, this, response_buffer));
     if (result != net::ERR_IO_PENDING)
       OnBytesRead(response_buffer, result);
@@ -422,8 +426,10 @@ class AgentHostDelegate : public base::RefCountedThreadSafe<AgentHostDelegate>,
         new net::StringIOBuffer(encoded_frame);
     if (!socket_)
       return;
-    int result = socket_->Write(request_buffer, request_buffer->size(),
-        base::Bind(&AgentHostDelegate::CloseIfNecessary, this));
+    int result =
+        socket_->Write(request_buffer.get(),
+                       request_buffer->size(),
+                       base::Bind(&AgentHostDelegate::CloseIfNecessary, this));
     if (result != net::ERR_IO_PENDING)
       CloseIfNecessary(result);
   }
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index d5b6889..aba868a 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -345,7 +345,7 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest {
     if (WorkerService::GetInstance()->TerminateWorker(
             worker_data->worker_process_id, worker_data->worker_route_id)) {
       WorkerService::GetInstance()->AddObserver(
-          new WorkerTerminationObserver(worker_data));
+          new WorkerTerminationObserver(worker_data.get()));
       return;
     }
     FAIL() << "Failed to terminate worker.\n";
@@ -392,8 +392,7 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest {
             worker_data->worker_process_id,
             worker_data->worker_route_id));
     DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
-        agent_host,
-        window_->GetDevToolsClientHostForTest());
+        agent_host.get(), window_->GetDevToolsClientHostForTest());
     RenderViewHost* client_rvh = window_->GetRenderViewHost();
     WebContents* client_contents = WebContents::FromRenderViewHost(client_rvh);
     if (client_contents->IsLoading()) {
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index f398065..5120c9f 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -213,7 +213,7 @@ DevToolsWindow* DevToolsWindow::GetDockedInstanceForInspectedTab(
     return NULL;
   scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetOrCreateFor(
       inspected_web_contents->GetRenderViewHost()));
-  DevToolsWindow* window = FindDevToolsWindow(agent);
+  DevToolsWindow* window = FindDevToolsWindow(agent.get());
   return window && window->IsDocked() ? window : NULL;
 }
 
@@ -630,10 +630,11 @@ WebContents* DevToolsWindow::OpenURLFromTab(WebContents* source,
   DevToolsManager* manager = DevToolsManager::GetInstance();
   scoped_refptr<DevToolsAgentHost> agent_host(
       manager->GetDevToolsAgentHostFor(frontend_host_.get()));
-  if (!agent_host)
+  if (!agent_host.get())
     return NULL;
   manager->ClientHostClosing(frontend_host_.get());
-  manager->RegisterDevToolsClientHostFor(agent_host, frontend_host_.get());
+  manager->RegisterDevToolsClientHostFor(agent_host.get(),
+                                         frontend_host_.get());
 
   chrome::NavigateParams nav_params(profile_, params.url, params.transition);
   FillNavigateParamsFromOpenURLParams(&nav_params, params);
@@ -815,14 +816,15 @@ DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
   DevToolsManager* manager = DevToolsManager::GetInstance();
-  DevToolsWindow* window = FindDevToolsWindow(agent);
+  DevToolsWindow* window = FindDevToolsWindow(agent.get());
   bool do_open = force_open;
   if (!window) {
     Profile* profile = Profile::FromBrowserContext(
         inspected_rvh->GetProcess()->GetBrowserContext());
     DevToolsDockSide dock_side = GetDockSideFromPrefs(profile);
     window = Create(profile, GURL(), inspected_rvh, dock_side, false);
-    manager->RegisterDevToolsClientHostFor(agent, window->frontend_host_.get());
+    manager->RegisterDevToolsClientHostFor(agent.get(),
+                                           window->frontend_host_.get());
     do_open = true;
   }
 
diff --git a/chrome/browser/devtools/tethering_adb_filter.cc b/chrome/browser/devtools/tethering_adb_filter.cc
index d3d14a8..7505f8f 100644
--- a/chrome/browser/devtools/tethering_adb_filter.cc
+++ b/chrome/browser/devtools/tethering_adb_filter.cc
@@ -100,9 +100,11 @@ class SocketTunnel {
 
   void Pump(net::StreamSocket* from, net::StreamSocket* to) {
     scoped_refptr<net::IOBuffer> buffer = new net::IOBuffer(kBufferSize);
-    int result = from->Read(buffer, kBufferSize,
-          base::Bind(&SocketTunnel::OnRead, base::Unretained(this), from, to,
-                     buffer));
+    int result = from->Read(
+        buffer.get(),
+        kBufferSize,
+        base::Bind(
+            &SocketTunnel::OnRead, base::Unretained(this), from, to, buffer));
     if (result != net::ERR_IO_PENDING)
       OnRead(from, to, buffer, result);
   }
@@ -118,12 +120,16 @@ class SocketTunnel {
 
     int total = result;
     scoped_refptr<net::DrainableIOBuffer> drainable =
-        new net::DrainableIOBuffer(buffer, total);
+        new net::DrainableIOBuffer(buffer.get(), total);
 
     ++pending_writes_;
-    result = to->Write(drainable, total,
+    result = to->Write(drainable.get(),
+                       total,
                        base::Bind(&SocketTunnel::OnWritten,
-                                  base::Unretained(this), drainable, from, to));
+                                  base::Unretained(this),
+                                  drainable,
+                                  from,
+                                  to));
     if (result != net::ERR_IO_PENDING)
       OnWritten(drainable, from, to, result);
   }
@@ -141,9 +147,12 @@ class SocketTunnel {
     drainable->DidConsume(result);
     if (drainable->BytesRemaining() > 0) {
       ++pending_writes_;
-      result = to->Write(drainable, drainable->BytesRemaining(),
+      result = to->Write(drainable.get(),
+                         drainable->BytesRemaining(),
                          base::Bind(&SocketTunnel::OnWritten,
-                                    base::Unretained(this), drainable, from,
+                                    base::Unretained(this),
+                                    drainable,
+                                    from,
                                     to));
       if (result != net::ERR_IO_PENDING)
         OnWritten(drainable, from, to, result);
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 7feb006..c05df6d 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -515,7 +515,8 @@ void ChromeDownloadManagerDelegate::Observe(
 
   scoped_refptr<extensions::CrxInstaller> installer =
       content::Source<extensions::CrxInstaller>(source).ptr();
-  content::DownloadOpenDelayedCallback callback = crx_installers_[installer];
+  content::DownloadOpenDelayedCallback callback =
+      crx_installers_[installer.get()];
   crx_installers_.erase(installer.get());
   callback.Run(installer->did_handle_successfully());
 }
diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
index d2dc590..2f438c0 100644
--- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -201,7 +201,7 @@ void ChromeDownloadManagerDelegateTest::TearDown() {
 }
 
 void ChromeDownloadManagerDelegateTest::VerifyAndClearExpectations() {
-  ::testing::Mock::VerifyAndClearExpectations(delegate_);
+  ::testing::Mock::VerifyAndClearExpectations(delegate_.get());
 }
 
 content::MockDownloadItem*
diff --git a/chrome/browser/download/download_service.cc b/chrome/browser/download/download_service.cc
index 77cc833..7838e2d 100644
--- a/chrome/browser/download/download_service.cc
+++ b/chrome/browser/download/download_service.cc
@@ -42,7 +42,7 @@ ChromeDownloadManagerDelegate* DownloadService::GetDownloadManagerDelegate() {
 
   // In case the delegate has already been set by
   // SetDownloadManagerDelegateForTesting.
-  if (!manager_delegate_)
+  if (!manager_delegate_.get())
     manager_delegate_ = new ChromeDownloadManagerDelegate(profile_);
 
   manager_delegate_->SetDownloadManager(manager);
diff --git a/chrome/browser/download/save_package_file_picker.cc b/chrome/browser/download/save_package_file_picker.cc
index 693d900..8d249ed 100644
--- a/chrome/browser/download/save_package_file_picker.cc
+++ b/chrome/browser/download/save_package_file_picker.cc
@@ -242,7 +242,7 @@ void SavePackageFilePicker::FileSelected(
     DCHECK(index >= kSelectFileHtmlOnlyIndex &&
            index <= kSelectFileCompleteIndex);
     save_type = kIndexToSaveType[index];
-    if (select_file_dialog_ &&
+    if (select_file_dialog_.get() &&
         select_file_dialog_->HasMultipleFileTypeChoices())
       download_prefs_->SetSaveFileType(save_type);
 #endif
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index 9ca1052..27ac325 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -85,9 +85,9 @@ class ActiveTabTest : public ChromeRenderViewHostTestHarness {
                  const GURL& url,
                  int tab_id) {
     return PermissionsData::CanExecuteScriptOnPage(
-               extension, url, url, tab_id, NULL, -1, NULL) &&
+               extension.get(), url, url, tab_id, NULL, -1, NULL) &&
            PermissionsData::CanCaptureVisiblePage(
-               extension, url, tab_id, NULL) &&
+               extension.get(), url, tab_id, NULL) &&
            HasTabsPermission(extension, tab_id);
   }
 
@@ -101,9 +101,9 @@ class ActiveTabTest : public ChromeRenderViewHostTestHarness {
                  int tab_id) {
     // Note: can't check HasTabsPermission because it isn't URL specific.
     return !PermissionsData::CanExecuteScriptOnPage(
-               extension, url, url, tab_id, NULL, -1, NULL) &&
+               extension.get(), url, url, tab_id, NULL, -1, NULL) &&
            !PermissionsData::CanCaptureVisiblePage(
-               extension, url, tab_id, NULL);
+               extension.get(), url, tab_id, NULL);
   }
 
   bool HasTabsPermission(const scoped_refptr<const Extension>& extension) {
@@ -142,9 +142,9 @@ TEST_F(ActiveTabTest, GrantToSinglePage) {
   EXPECT_FALSE(HasTabsPermission(another_extension));
   EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
 
-  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
   active_tab_permission_granter()->GrantIfRequested(
-      extension_without_active_tab);
+      extension_without_active_tab.get());
 
   // Granted to extension and extension_without_active_tab, but the latter
   // doesn't have the activeTab permission so not granted.
@@ -170,22 +170,22 @@ TEST_F(ActiveTabTest, GrantToSinglePage) {
   EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
 
   // But they should still be able to be granted again.
-  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
 
   EXPECT_TRUE(IsAllowed(extension, google));
   EXPECT_TRUE(IsBlocked(another_extension, google));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
 
   // And grant a few more times redundantly for good measure.
-  active_tab_permission_granter()->GrantIfRequested(extension);
-  active_tab_permission_granter()->GrantIfRequested(extension);
-  active_tab_permission_granter()->GrantIfRequested(another_extension);
-  active_tab_permission_granter()->GrantIfRequested(another_extension);
-  active_tab_permission_granter()->GrantIfRequested(another_extension);
-  active_tab_permission_granter()->GrantIfRequested(extension);
-  active_tab_permission_granter()->GrantIfRequested(extension);
-  active_tab_permission_granter()->GrantIfRequested(another_extension);
-  active_tab_permission_granter()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
+  active_tab_permission_granter()->GrantIfRequested(another_extension.get());
+  active_tab_permission_granter()->GrantIfRequested(another_extension.get());
+  active_tab_permission_granter()->GrantIfRequested(another_extension.get());
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
+  active_tab_permission_granter()->GrantIfRequested(another_extension.get());
+  active_tab_permission_granter()->GrantIfRequested(another_extension.get());
 
   EXPECT_TRUE(IsAllowed(extension, google));
   EXPECT_TRUE(IsAllowed(another_extension, google));
@@ -209,10 +209,10 @@ TEST_F(ActiveTabTest, GrantToSinglePage) {
 
   // Should be able to grant to multiple extensions at the same time (if they
   // have the activeTab permission, of course).
-  active_tab_permission_granter()->GrantIfRequested(extension);
-  active_tab_permission_granter()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
+  active_tab_permission_granter()->GrantIfRequested(another_extension.get());
   active_tab_permission_granter()->GrantIfRequested(
-      extension_without_active_tab);
+      extension_without_active_tab.get());
 
   EXPECT_TRUE(IsBlocked(extension, google));
   EXPECT_TRUE(IsBlocked(another_extension, google));
@@ -225,10 +225,10 @@ TEST_F(ActiveTabTest, GrantToSinglePage) {
   // Should be able to go back to URLs that were previously cleared.
   NavigateAndCommit(google);
 
-  active_tab_permission_granter()->GrantIfRequested(extension);
-  active_tab_permission_granter()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
+  active_tab_permission_granter()->GrantIfRequested(another_extension.get());
   active_tab_permission_granter()->GrantIfRequested(
-      extension_without_active_tab);
+      extension_without_active_tab.get());
 
   EXPECT_TRUE(IsAllowed(extension, google));
   EXPECT_TRUE(IsAllowed(another_extension, google));
@@ -244,30 +244,29 @@ TEST_F(ActiveTabTest, Uninstalling) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
-  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
 
-  EXPECT_TRUE(active_tab_permission_granter()->IsGranted(extension));
+  EXPECT_TRUE(active_tab_permission_granter()->IsGranted(extension.get()));
   EXPECT_TRUE(IsAllowed(extension, google));
 
   // Uninstalling the extension should clear its tab permissions.
-  UnloadedExtensionInfo details(
-      extension,
-      extension_misc::UNLOAD_REASON_DISABLE);
+  UnloadedExtensionInfo details(extension.get(),
+                                extension_misc::UNLOAD_REASON_DISABLE);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(Profile::FromBrowserContext(
           web_contents()->GetBrowserContext())),
       content::Details<UnloadedExtensionInfo>(&details));
 
-  EXPECT_FALSE(active_tab_permission_granter()->IsGranted(extension));
+  EXPECT_FALSE(active_tab_permission_granter()->IsGranted(extension.get()));
   // Note: can't EXPECT_FALSE(IsAllowed) here because uninstalled extensions
   // are just that... considered to be uninstalled, and the manager might
   // just ignore them from here on.
 
   // Granting the extension again should give them back.
-  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
 
-  EXPECT_TRUE(active_tab_permission_granter()->IsGranted(extension));
+  EXPECT_TRUE(active_tab_permission_granter()->IsGranted(extension.get()));
   EXPECT_TRUE(IsAllowed(extension, google));
 }
 
@@ -275,7 +274,7 @@ TEST_F(ActiveTabTest, OnlyActiveTab) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
-  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
 
   EXPECT_TRUE(IsAllowed(extension, google, tab_id()));
   EXPECT_TRUE(IsBlocked(extension, google, tab_id() + 1));
@@ -286,7 +285,7 @@ TEST_F(ActiveTabTest, NavigateInPage) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
-  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
 
   // Perform an in-page navigation. The extension should not lose the temporary
   // permission.
@@ -303,7 +302,7 @@ TEST_F(ActiveTabTest, NavigateInPage) {
   EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, chromium, tab_id()));
 
-  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension.get());
 
   EXPECT_FALSE(IsAllowed(extension, google, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));
diff --git a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
index fd8b7c6..6cf0f74 100644
--- a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
+++ b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
@@ -60,7 +60,7 @@ class ExtensionAlarmsTest : public BrowserWithTestWindowTest {
         extensions::Manifest::UNPACKED);
 
     // Make sure there's a RenderViewHost for alarms to warn into.
-    AddTab(browser(), BackgroundInfo::GetBackgroundURL(extension_));
+    AddTab(browser(), BackgroundInfo::GetBackgroundURL(extension_.get()));
     contents_ = browser()->tab_strip_model()->GetActiveWebContents();
 
     test_clock_->SetNow(base::Time::FromDoubleT(10));
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
index 6d4170a..11c91f5 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
@@ -247,7 +247,7 @@ bool BluetoothGetProfilesFunction::DoWork(
 bool BluetoothGetAdapterStateFunction::DoWork(
     scoped_refptr<BluetoothAdapter> adapter) {
   bluetooth::AdapterState state;
-  PopulateAdapterState(*adapter, &state);
+  PopulateAdapterState(*adapter.get(), &state);
   SetResult(state.ToValue().release());
   SendResponse(true);
   return true;
@@ -447,7 +447,7 @@ void BluetoothReadFunction::Work() {
     return;
 
   scoped_refptr<net::GrowableIOBuffer> buffer(new net::GrowableIOBuffer);
-  success_ = socket_->Receive(buffer);
+  success_ = socket_->Receive(buffer.get());
   if (success_)
     SetResult(base::BinaryValue::CreateWithCopiedBuffer(buffer->StartOfBuffer(),
                                                         buffer->offset()));
@@ -501,8 +501,9 @@ void BluetoothWriteFunction::Work() {
   scoped_refptr<net::WrappedIOBuffer> wrapped_io_buffer(
       new net::WrappedIOBuffer(data_to_write_->GetBuffer()));
   scoped_refptr<net::DrainableIOBuffer> drainable_io_buffer(
-      new net::DrainableIOBuffer(wrapped_io_buffer, data_to_write_->GetSize()));
-  success_ = socket_->Send(drainable_io_buffer);
+      new net::DrainableIOBuffer(wrapped_io_buffer.get(),
+                                 data_to_write_->GetSize()));
+  success_ = socket_->Send(drainable_io_buffer.get());
   if (success_) {
     if (drainable_io_buffer->BytesConsumed() > 0)
       SetResult(
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc
index a840e14..f000d5e 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc
@@ -168,54 +168,41 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Profiles) {
   scoped_refptr<TestBluetoothAddProfileFunction> add_profile_function;
   add_profile_function = setupFunction(
       new TestBluetoothAddProfileFunction(profile1_.get()));
-  std::string error(
-      utils::RunFunctionAndReturnError(
-          add_profile_function,
-          "[{\"uuid\": \"1234\"}]",
-          browser()));
+  std::string error(utils::RunFunctionAndReturnError(
+      add_profile_function.get(), "[{\"uuid\": \"1234\"}]", browser()));
   ASSERT_TRUE(error.empty());
 
   // Registering the profile for the same uuid again will throw an error.
   add_profile_function = setupFunction(
       new TestBluetoothAddProfileFunction(profile2_.get()));
   error = utils::RunFunctionAndReturnError(
-      add_profile_function,
-      "[{\"uuid\": \"1234\"}]",
-      browser());
+      add_profile_function.get(), "[{\"uuid\": \"1234\"}]", browser());
   ASSERT_FALSE(error.empty());
 
   add_profile_function = setupFunction(
       new TestBluetoothAddProfileFunction(profile2_.get()));
   error = utils::RunFunctionAndReturnError(
-      add_profile_function,
-      "[{\"uuid\": \"5678\"}]",
-      browser());
+      add_profile_function.get(), "[{\"uuid\": \"5678\"}]", browser());
   ASSERT_TRUE(error.empty());
 
   scoped_refptr<api::BluetoothRemoveProfileFunction> remove_profile_function;
   remove_profile_function = setupFunction(
       new api::BluetoothRemoveProfileFunction());
   error = utils::RunFunctionAndReturnError(
-      remove_profile_function,
-      "[{\"uuid\": \"1234\"}]",
-      browser());
+      remove_profile_function.get(), "[{\"uuid\": \"1234\"}]", browser());
   ASSERT_TRUE(error.empty());
 
   remove_profile_function = setupFunction(
       new api::BluetoothRemoveProfileFunction());
   error = utils::RunFunctionAndReturnError(
-      remove_profile_function,
-      "[{\"uuid\": \"5678\"}]",
-      browser());
+      remove_profile_function.get(), "[{\"uuid\": \"5678\"}]", browser());
   ASSERT_TRUE(error.empty());
 
   // Removing the same profile again will throw an error.
   remove_profile_function = setupFunction(
       new api::BluetoothRemoveProfileFunction());
   error = utils::RunFunctionAndReturnError(
-      remove_profile_function,
-      "[{\"uuid\": \"5678\"}]",
-      browser());
+      remove_profile_function.get(), "[{\"uuid\": \"5678\"}]", browser());
   ASSERT_FALSE(error.empty());
 }
 
@@ -235,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetAdapterState) {
   get_adapter_state = setupFunction(new api::BluetoothGetAdapterStateFunction);
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-        get_adapter_state, "[]", browser()));
+      get_adapter_state.get(), "[]", browser()));
   ASSERT_TRUE(result.get() != NULL);
   api::bluetooth::AdapterState state;
   ASSERT_TRUE(api::bluetooth::AdapterState::Populate(*result, &state));
@@ -257,7 +244,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetLocalOutOfBandPairingData) {
             new api::BluetoothGetLocalOutOfBandPairingDataFunction));
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-      get_oob_function, "[]", browser()));
+      get_oob_function.get(), "[]", browser()));
 
   base::DictionaryValue* dict;
   EXPECT_TRUE(result->GetAsDictionary(&dict));
@@ -280,8 +267,8 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetLocalOutOfBandPairingData) {
   get_oob_function =
       setupFunction(new api::BluetoothGetLocalOutOfBandPairingDataFunction);
 
-  std::string error(
-      utils::RunFunctionAndReturnError(get_oob_function, "[]", browser()));
+  std::string error(utils::RunFunctionAndReturnError(
+      get_oob_function.get(), "[]", browser()));
   EXPECT_FALSE(error.empty());
 }
 
@@ -299,8 +286,8 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, SetOutOfBandPairingData) {
   set_oob_function = setupFunction(
       new api::BluetoothSetOutOfBandPairingDataFunction);
   // There isn't actually a result.
-  (void)utils::RunFunctionAndReturnSingleResult(
-      set_oob_function, params, browser());
+  (void) utils::RunFunctionAndReturnSingleResult(
+      set_oob_function.get(), params, browser());
 
   // Try again with an error
   testing::Mock::VerifyAndClearExpectations(mock_adapter_);
@@ -313,8 +300,8 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, SetOutOfBandPairingData) {
 
   set_oob_function = setupFunction(
       new api::BluetoothSetOutOfBandPairingDataFunction);
-  std::string error(
-      utils::RunFunctionAndReturnError(set_oob_function, params, browser()));
+  std::string error(utils::RunFunctionAndReturnError(
+      set_oob_function.get(), params, browser()));
   EXPECT_FALSE(error.empty());
 
   // TODO(bryeung): Also test setting the data when there is support for
@@ -331,7 +318,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Discovery) {
   scoped_refptr<api::BluetoothStartDiscoveryFunction> start_function;
   start_function = setupFunction(new api::BluetoothStartDiscoveryFunction);
   std::string error(
-      utils::RunFunctionAndReturnError(start_function, "[]", browser()));
+      utils::RunFunctionAndReturnError(start_function.get(), "[]", browser()));
   ASSERT_FALSE(error.empty());
 
   // Reset for a successful start
@@ -340,7 +327,8 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Discovery) {
       .WillOnce(testing::Invoke(CallDiscoveryCallback));
 
   start_function = setupFunction(new api::BluetoothStartDiscoveryFunction);
-  (void)utils::RunFunctionAndReturnError(start_function, "[]", browser());
+  (void)
+      utils::RunFunctionAndReturnError(start_function.get(), "[]", browser());
 
   // Reset to try stopping
   testing::Mock::VerifyAndClearExpectations(mock_adapter_);
@@ -350,7 +338,8 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Discovery) {
   EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_));
   scoped_refptr<api::BluetoothStopDiscoveryFunction> stop_function;
   stop_function = setupFunction(new api::BluetoothStopDiscoveryFunction);
-  (void)utils::RunFunctionAndReturnSingleResult(stop_function, "[]", browser());
+  (void) utils::RunFunctionAndReturnSingleResult(
+      stop_function.get(), "[]", browser());
 
   // Reset to try stopping with an error
   SetUpMockAdapter();
@@ -358,7 +347,8 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Discovery) {
       .WillOnce(testing::Invoke(CallDiscoveryErrorCallback));
   EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_));
   stop_function = setupFunction(new api::BluetoothStopDiscoveryFunction);
-  error = utils::RunFunctionAndReturnError(stop_function, "[]", browser());
+  error =
+      utils::RunFunctionAndReturnError(stop_function.get(), "[]", browser());
   ASSERT_FALSE(error.empty());
   SetUpMockAdapter();
 }
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
index 17f31d7..3a4c2e6 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
@@ -37,7 +37,7 @@ ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile)
 }
 
 ExtensionBluetoothEventRouter::~ExtensionBluetoothEventRouter() {
-  if (adapter_) {
+  if (adapter_.get()) {
     adapter_->RemoveObserver(this);
     adapter_ = NULL;
   }
@@ -53,13 +53,13 @@ ExtensionBluetoothEventRouter::~ExtensionBluetoothEventRouter() {
 }
 
 bool ExtensionBluetoothEventRouter::IsBluetoothSupported() const {
-  return adapter_ ||
+  return adapter_.get() ||
          device::BluetoothAdapterFactory::IsBluetoothAdapterAvailable();
 }
 
 void ExtensionBluetoothEventRouter::GetAdapter(
     const device::BluetoothAdapterFactory::AdapterCallback& callback) {
-  if (adapter_) {
+  if (adapter_.get()) {
     callback.Run(scoped_refptr<device::BluetoothAdapter>(adapter_));
     return;
   }
@@ -191,7 +191,7 @@ void ExtensionBluetoothEventRouter::DispatchConnectionEvent(
 
 void ExtensionBluetoothEventRouter::AdapterPresentChanged(
     device::BluetoothAdapter* adapter, bool present) {
-  if (adapter != adapter_) {
+  if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->GetAddress();
     return;
   }
@@ -200,7 +200,7 @@ void ExtensionBluetoothEventRouter::AdapterPresentChanged(
 
 void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
     device::BluetoothAdapter* adapter, bool has_power) {
-  if (adapter != adapter_) {
+  if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->GetAddress();
     return;
   }
@@ -209,7 +209,7 @@ void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
 
 void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
     device::BluetoothAdapter* adapter, bool discovering) {
-  if (adapter != adapter_) {
+  if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->GetAddress();
     return;
   }
@@ -226,7 +226,7 @@ void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
 void ExtensionBluetoothEventRouter::DeviceAdded(
     device::BluetoothAdapter* adapter,
     device::BluetoothDevice* device) {
-  if (adapter != adapter_) {
+  if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->GetAddress();
     return;
   }
@@ -245,7 +245,7 @@ void ExtensionBluetoothEventRouter::DeviceAdded(
 }
 
 void ExtensionBluetoothEventRouter::InitializeAdapterIfNeeded() {
-  if (!adapter_) {
+  if (!adapter_.get()) {
     GetAdapter(base::Bind(&ExtensionBluetoothEventRouter::InitializeAdapter,
                           weak_ptr_factory_.GetWeakPtr()));
   }
@@ -253,14 +253,14 @@ void ExtensionBluetoothEventRouter::InitializeAdapterIfNeeded() {
 
 void ExtensionBluetoothEventRouter::InitializeAdapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
-  if (!adapter_) {
+  if (!adapter_.get()) {
     adapter_ = adapter;
     adapter_->AddObserver(this);
   }
 }
 
 void ExtensionBluetoothEventRouter::MaybeReleaseAdapter() {
-  if (adapter_ && num_event_listeners_ == 0) {
+  if (adapter_.get() && num_event_listeners_ == 0) {
     adapter_->RemoveObserver(this);
     adapter_ = NULL;
   }
@@ -268,7 +268,7 @@ void ExtensionBluetoothEventRouter::MaybeReleaseAdapter() {
 
 void ExtensionBluetoothEventRouter::DispatchAdapterStateEvent() {
   api::bluetooth::AdapterState state;
-  PopulateAdapterState(*adapter_, &state);
+  PopulateAdapterState(*adapter_.get(), &state);
 
   scoped_ptr<ListValue> args(new ListValue());
   args->Append(state.ToValue().release());
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
index 7638e6e..ae7cce1 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
@@ -277,7 +277,7 @@ bool BrowsingDataRemoveFunction::RunImpl() {
 
 void BrowsingDataRemoveFunction::CheckRemovingPluginDataSupported(
     scoped_refptr<PluginPrefs> plugin_prefs) {
-  if (!PluginDataRemoverHelper::IsSupported(plugin_prefs))
+  if (!PluginDataRemoverHelper::IsSupported(plugin_prefs.get()))
     removal_mask_ &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
 
   BrowserThread::PostTask(
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
index abb650e..9d8b0c5 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
@@ -245,10 +245,10 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest,
       EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(
         function.get(), args, browser())) << " for " << args;
     } else {
-      EXPECT_TRUE(
-          MatchPattern(RunFunctionAndReturnError(function, args, browser()),
-              extension_browsing_data_api_constants::kDeleteProhibitedError)) <<
-                  " for " << args;
+      EXPECT_TRUE(MatchPattern(
+          RunFunctionAndReturnError(function.get(), args, browser()),
+          extension_browsing_data_api_constants::kDeleteProhibitedError))
+          << " for " << args;
     }
   }
 
@@ -263,11 +263,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, OneAtATime) {
   BrowsingDataRemover::set_removing(true);
   scoped_refptr<RemoveBrowsingDataFunction> function =
       new RemoveBrowsingDataFunction();
-  EXPECT_TRUE(MatchPattern(
-      RunFunctionAndReturnError(function,
-                                kRemoveEverythingArguments,
-                                browser()),
-      extension_browsing_data_api_constants::kOneAtATimeError));
+  EXPECT_TRUE(
+      MatchPattern(RunFunctionAndReturnError(
+                       function.get(), kRemoveEverythingArguments, browser()),
+                   extension_browsing_data_api_constants::kOneAtATimeError));
   BrowsingDataRemover::set_removing(false);
 
   EXPECT_EQ(base::Time(), GetBeginTime());
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
index 3a52784..a4b98cb 100644
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -407,8 +407,8 @@ ExtensionDevToolsClientHost::ExtensionDevToolsClientHost(
                  content::NotificationService::AllSources());
 
   // Attach to debugger and tell it we are ready.
-  DevToolsManager::GetInstance()->
-      RegisterDevToolsClientHostFor(agent_host_, this);
+  DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
+      agent_host_.get(), this);
 
   if (infobar_delegate_) {
     infobar_delegate_->AttachClientHost(this);
@@ -537,7 +537,7 @@ void ExtensionDevToolsClientHost::DispatchOnInspectorFrontend(
     extensions::ExtensionSystem::Get(profile_)->event_router()->
         DispatchEventToExtension(extension_id_, event.Pass());
   } else {
-    DebuggerSendCommandFunction* function = pending_requests_[id];
+    DebuggerSendCommandFunction* function = pending_requests_[id].get();
     if (!function)
       return;
 
@@ -599,7 +599,7 @@ bool DebuggerFunction::InitAgentHost() {
     return false;
   }
 
-  if (!agent_host_) {
+  if (!agent_host_.get()) {
     FormatErrorMessage(keys::kNoTargetError);
     return false;
   }
@@ -610,8 +610,8 @@ bool DebuggerFunction::InitClientHost() {
   if (!InitAgentHost())
     return false;
 
-  client_host_ = AttachedClientHosts::GetInstance()->
-      Lookup(agent_host_, GetExtension()->id());
+  client_host_ = AttachedClientHosts::GetInstance()->Lookup(
+      agent_host_.get(), GetExtension()->id());
 
   if (!client_host_) {
     FormatErrorMessage(keys::kNotAttachedError);
@@ -665,7 +665,7 @@ bool DebuggerAttachFunction::RunImpl() {
   }
 
   new ExtensionDevToolsClientHost(profile(),
-                                  agent_host_,
+                                  agent_host_.get(),
                                   GetExtension()->id(),
                                   GetExtension()->name(),
                                   debuggee_,
diff --git a/chrome/browser/extensions/api/declarative/declarative_api.cc b/chrome/browser/extensions/api/declarative/declarative_api.cc
index 2429658..f0ec23e 100644
--- a/chrome/browser/extensions/api/declarative/declarative_api.cc
+++ b/chrome/browser/extensions/api/declarative/declarative_api.cc
@@ -42,7 +42,7 @@ bool RulesFunction::RunImpl() {
   rules_registry_ = rules_registry_service->GetRulesRegistry(event_name);
   // Raw access to this function is not available to extensions, therefore
   // there should never be a request for a nonexisting rules registry.
-  EXTENSION_FUNCTION_VALIDATE(rules_registry_);
+  EXTENSION_FUNCTION_VALIDATE(rules_registry_.get());
 
   if (content::BrowserThread::CurrentlyOn(rules_registry_->owner_thread())) {
     bool success = RunImplOnCorrectThread();
@@ -52,7 +52,7 @@ bool RulesFunction::RunImpl() {
         content::BrowserThread::GetMessageLoopProxyForThread(
             rules_registry_->owner_thread());
     base::PostTaskAndReplyWithResult(
-        message_loop_proxy,
+        message_loop_proxy.get(),
         FROM_HERE,
         base::Bind(&RulesFunction::RunImplOnCorrectThread, this),
         base::Bind(&RulesFunction::SendResponse, this));
diff --git a/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc b/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
index cb0f693..2e78b8a 100644
--- a/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
+++ b/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
@@ -108,7 +108,7 @@ struct FulfillableCondition {
 
   void GetURLMatcherConditionSets(
       URLMatcherConditionSet::Vector* condition_sets) const {
-    if (condition_set)
+    if (condition_set.get())
       condition_sets->push_back(condition_set);
   }
 
diff --git a/chrome/browser/extensions/api/declarative/deduping_factory.h b/chrome/browser/extensions/api/declarative/deduping_factory.h
index 4627533..b34d9a0 100644
--- a/chrome/browser/extensions/api/declarative/deduping_factory.h
+++ b/chrome/browser/extensions/api/declarative/deduping_factory.h
@@ -134,7 +134,7 @@ scoped_refptr<const BaseClassT> DedupingFactory<BaseClassT>::Instantiate(
     if (prototypes.empty()) {
       scoped_refptr<const BaseClassT> new_object =
           (*factory_method)(instance_type, value, error, bad_message);
-      if (!new_object || !error->empty() || *bad_message)
+      if (!new_object.get() || !error->empty() || *bad_message)
         return scoped_refptr<const BaseClassT>();
       prototypes.push_back(new_object);
     }
@@ -144,7 +144,7 @@ scoped_refptr<const BaseClassT> DedupingFactory<BaseClassT>::Instantiate(
   // Handle parameterized objects.
   scoped_refptr<const BaseClassT> new_object =
       (*factory_method)(instance_type, value, error, bad_message);
-  if (!new_object || !error->empty() || *bad_message)
+  if (!new_object.get() || !error->empty() || *bad_message)
     return scoped_refptr<const BaseClassT>();
 
   size_t length = 0;
diff --git a/chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc b/chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc
index 0d9cc37..0d424f8 100644
--- a/chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc
+++ b/chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc
@@ -98,15 +98,15 @@ TEST(DedupingFactoryTest, InstantiationParameterized) {
       factory.Instantiate(kTypeName, d1.get(), &error, &bad_message));
   scoped_refptr<const BaseClass> c2(
       factory.Instantiate(kTypeName, d2.get(), &error, &bad_message));
-  ASSERT_TRUE(c1);
-  ASSERT_TRUE(c2);
+  ASSERT_TRUE(c1.get());
+  ASSERT_TRUE(c2.get());
   EXPECT_EQ(1, static_cast<const Foo*>(c1.get())->parameter());
   EXPECT_EQ(2, static_cast<const Foo*>(c2.get())->parameter());
 
   // This one produces an overflow, now the cache contains [2, 3]
   scoped_refptr<const BaseClass> c3(
       factory.Instantiate(kTypeName, d3.get(), &error, &bad_message));
-  ASSERT_TRUE(c3);
+  ASSERT_TRUE(c3.get());
   EXPECT_EQ(3, static_cast<const Foo*>(c3.get())->parameter());
 
   // Reuse 2, this should give the same instance as c2.
@@ -144,8 +144,8 @@ TEST(DedupingFactoryTest, InstantiationNonParameterized) {
       factory.Instantiate(kTypeName, d1.get(), &error, &bad_message));
   scoped_refptr<const BaseClass> c2(
       factory.Instantiate(kTypeName, d2.get(), &error, &bad_message));
-  ASSERT_TRUE(c1);
-  ASSERT_TRUE(c2);
+  ASSERT_TRUE(c1.get());
+  ASSERT_TRUE(c2.get());
   EXPECT_EQ(1, static_cast<const Foo*>(c1.get())->parameter());
   EXPECT_EQ(1, static_cast<const Foo*>(c2.get())->parameter());
   EXPECT_EQ(c1, c2);
@@ -168,8 +168,8 @@ TEST(DedupingFactoryTest, TypeNames) {
   scoped_refptr<const BaseClass> c1_b(
       factory.Instantiate(kTypeName2, d1.get(), &error, &bad_message));
 
-  ASSERT_TRUE(c1_a);
-  ASSERT_TRUE(c1_b);
+  ASSERT_TRUE(c1_a.get());
+  ASSERT_TRUE(c1_b.get());
   EXPECT_NE(c1_a, c1_b);
 }
 
@@ -191,8 +191,8 @@ TEST(DedupingFactoryTest, Clear) {
   scoped_refptr<const BaseClass> c1_b(
       factory.Instantiate(kTypeName, d1.get(), &error, &bad_message));
 
-  ASSERT_TRUE(c1_a);
-  ASSERT_TRUE(c1_b);
+  ASSERT_TRUE(c1_a.get());
+  ASSERT_TRUE(c1_b.get());
   EXPECT_NE(c1_a, c1_b);
 }
 
diff --git a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
index bce9c80c..049cc6c 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
@@ -31,14 +31,14 @@ TEST(DeclarativeContentActionTest, InvalidCreation) {
   result = ContentAction::Create(*ParseJson("[]"), &error, &bad_message);
   EXPECT_TRUE(bad_message);
   EXPECT_EQ("", error);
-  EXPECT_FALSE(result);
+  EXPECT_FALSE(result.get());
 
   // Test missing instanceType element.
   error.clear();
   result = ContentAction::Create(*ParseJson("{}"), &error, &bad_message);
   EXPECT_TRUE(bad_message);
   EXPECT_EQ("", error);
-  EXPECT_FALSE(result);
+  EXPECT_FALSE(result.get());
 
   // Test wrong instanceType element.
   error.clear();
@@ -48,7 +48,7 @@ TEST(DeclarativeContentActionTest, InvalidCreation) {
       "}"),
                                  &error, &bad_message);
   EXPECT_THAT(error, HasSubstr("invalid instanceType"));
-  EXPECT_FALSE(result);
+  EXPECT_FALSE(result.get());
 }
 
 TEST(DeclarativeContentActionTest, ShowPageAction) {
@@ -63,7 +63,7 @@ TEST(DeclarativeContentActionTest, ShowPageAction) {
       &error, &bad_message);
   EXPECT_EQ("", error);
   EXPECT_FALSE(bad_message);
-  ASSERT_TRUE(result);
+  ASSERT_TRUE(result.get());
   EXPECT_EQ(ContentAction::ACTION_SHOW_PAGE_ACTION, result->GetType());
 
   const Extension* extension = env.MakeExtension(
diff --git a/chrome/browser/extensions/api/declarative_content/content_condition.cc b/chrome/browser/extensions/api/declarative_content/content_condition.cc
index 9a0a40f..5730a504 100644
--- a/chrome/browser/extensions/api/declarative_content/content_condition.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_condition.cc
@@ -126,7 +126,7 @@ scoped_ptr<ContentCondition> ContentCondition::Create(
       return scoped_ptr<ContentCondition>(NULL);
   }
 
-  if (!url_matcher_condition_set) {
+  if (!url_matcher_condition_set.get()) {
     URLMatcherConditionSet::Conditions url_matcher_conditions;
     url_matcher_conditions.insert(
         url_matcher_condition_factory->CreateHostPrefixCondition(
diff --git a/chrome/browser/extensions/api/declarative_content/content_condition.h b/chrome/browser/extensions/api/declarative_content/content_condition.h
index 162631d..0adea94 100644
--- a/chrome/browser/extensions/api/declarative_content/content_condition.h
+++ b/chrome/browser/extensions/api/declarative_content/content_condition.h
@@ -81,14 +81,14 @@ class ContentCondition {
   // If this Condition has a url filter, appends it to |condition_sets|.
   void GetURLMatcherConditionSets(
       URLMatcherConditionSet::Vector* condition_sets) const {
-    if (url_matcher_conditions_)
+    if (url_matcher_conditions_.get())
       condition_sets->push_back(url_matcher_conditions_);
   }
 
   // True if GetURLMatcherConditionSets would append anything to its
   // argument.
   bool has_url_matcher_condition_set() const {
-    return url_matcher_conditions_ != NULL;
+    return url_matcher_conditions_.get() != NULL;
   }
 
   // Returns the CSS selectors required to match by this condition.
diff --git a/chrome/browser/extensions/api/declarative_content/content_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_content/content_rules_registry_unittest.cc
index f37f1ec..6c7a7e2 100644
--- a/chrome/browser/extensions/api/declarative_content/content_rules_registry_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_rules_registry_unittest.cc
@@ -40,13 +40,13 @@ TEST_F(DeclarativeContentRulesRegistryTest, ActiveRulesDoesntGrow) {
   scoped_refptr<ContentRulesRegistry> registry(
       new ContentRulesRegistry(env.profile(), NULL /*ui_part*/));
 
-  EXPECT_EQ(0u, active_rules(*registry).size());
+  EXPECT_EQ(0u, active_rules(*registry.get()).size());
 
   content::LoadCommittedDetails load_details;
   content::FrameNavigateParams navigate_params;
   scoped_ptr<WebContents> tab = env.MakeTab();
   registry->DidNavigateMainFrame(tab.get(), load_details, navigate_params);
-  EXPECT_EQ(0u, active_rules(*registry).size());
+  EXPECT_EQ(0u, active_rules(*registry.get()).size());
 
   // Add a rule.
   linked_ptr<RulesRegistry::Rule> rule(new RulesRegistry::Rule);
@@ -73,24 +73,24 @@ TEST_F(DeclarativeContentRulesRegistryTest, ActiveRulesDoesntGrow) {
   registry->AddRulesImpl(extension->id(), rules);
 
   registry->DidNavigateMainFrame(tab.get(), load_details, navigate_params);
-  EXPECT_EQ(0u, active_rules(*registry).size());
+  EXPECT_EQ(0u, active_rules(*registry.get()).size());
 
   std::vector<std::string> css_selectors;
   css_selectors.push_back("input");
   registry->Apply(tab.get(), css_selectors);
-  EXPECT_EQ(1u, active_rules(*registry).size());
+  EXPECT_EQ(1u, active_rules(*registry.get()).size());
 
   // Closing the tab should erase its entry from active_rules_.
   tab.reset();
-  EXPECT_EQ(0u, active_rules(*registry).size());
+  EXPECT_EQ(0u, active_rules(*registry.get()).size());
 
   tab = env.MakeTab();
   registry->Apply(tab.get(), css_selectors);
-  EXPECT_EQ(1u, active_rules(*registry).size());
+  EXPECT_EQ(1u, active_rules(*registry.get()).size());
   // Navigating the tab should erase its entry from active_rules_ if
   // it no longer matches.
   registry->DidNavigateMainFrame(tab.get(), load_details, navigate_params);
-  EXPECT_EQ(0u, active_rules(*registry).size());
+  EXPECT_EQ(0u, active_rules(*registry.get()).size());
 }
 
 }  // namespace
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
index b3e23fd..8752da2 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
@@ -113,7 +113,7 @@ void WebRequestActionWithThreadsTest::SetUp() {
                                      Extension::NO_FLAGS,
                                      "ext_id_1",
                                      &error);
-  ASSERT_TRUE(extension_) << error;
+  ASSERT_TRUE(extension_.get()) << error;
   extension_all_urls_ =
       LoadManifestUnchecked("permissions",
                             "web_request_all_host_permissions.json",
@@ -121,9 +121,9 @@ void WebRequestActionWithThreadsTest::SetUp() {
                             Extension::NO_FLAGS,
                             "ext_id_2",
                             &error);
-  ASSERT_TRUE(extension_all_urls_) << error;
+  ASSERT_TRUE(extension_all_urls_.get()) << error;
   extension_info_map_ = new ExtensionInfoMap;
-  ASSERT_TRUE(extension_info_map_);
+  ASSERT_TRUE(extension_info_map_.get());
   extension_info_map_->AddExtension(
       extension_.get(), base::Time::Now(), false /*incognito_enabled*/);
   extension_info_map_->AddExtension(extension_all_urls_.get(),
@@ -140,12 +140,12 @@ bool WebRequestActionWithThreadsTest::ActionWorksOnRequest(
   std::list<LinkedPtrEventResponseDelta> deltas;
   scoped_refptr<net::HttpResponseHeaders> headers(
       new net::HttpResponseHeaders(""));
-  WebRequestData request_data(&regular_request, stage, headers);
+  WebRequestData request_data(&regular_request, stage, headers.get());
   std::set<std::string> ignored_tags;
-  WebRequestAction::ApplyInfo apply_info = {
-    extension_info_map_, request_data, false /*crosses_incognito*/, &deltas,
-    &ignored_tags
-  };
+  WebRequestAction::ApplyInfo apply_info = { extension_info_map_.get(),
+                                             request_data,
+                                             false /*crosses_incognito*/,
+                                             &deltas, &ignored_tags };
   action_set->Apply(extension_id, base::Time(), &apply_info);
   return (1u == deltas.size() || 0u < ignored_tags.size());
 }
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc
index 6432eb3..0909d16 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc
@@ -114,9 +114,9 @@ bool WebRequestCondition::IsFulfilled(
 
 void WebRequestCondition::GetURLMatcherConditionSets(
     URLMatcherConditionSet::Vector* condition_sets) const {
-  if (url_matcher_conditions_)
+  if (url_matcher_conditions_.get())
     condition_sets->push_back(url_matcher_conditions_);
-  if (first_party_url_matcher_conditions_)
+  if (first_party_url_matcher_conditions_.get())
     condition_sets->push_back(first_party_url_matcher_conditions_);
 }
 
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
index fb11630..ebcf75c 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
@@ -287,7 +287,7 @@ TEST(WebRequestConditionAttributeTest, Stages) {
                                              &single_stage_list,
                                              &error));
     EXPECT_EQ("", error);
-    ASSERT_TRUE(one_stage_attributes.back() != NULL);
+    ASSERT_TRUE(one_stage_attributes.back().get() != NULL);
   }
 
   const GURL url_empty;
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
index 9a83958..d80baf7 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
@@ -240,17 +240,16 @@ void WebRequestRulesRegistryTest::SetUp() {
                                      Extension::NO_FLAGS,
                                      kExtensionId,
                                      &error);
-  ASSERT_TRUE(extension_) << error;
-  extension2_ =
-      LoadManifestUnchecked("permissions",
-                            "web_request_all_host_permissions.json",
-                            Manifest::INVALID_LOCATION,
-                            Extension::NO_FLAGS,
-                            kExtensionId2,
-                            &error);
-  ASSERT_TRUE(extension2_) << error;
+  ASSERT_TRUE(extension_.get()) << error;
+  extension2_ = LoadManifestUnchecked("permissions",
+                                      "web_request_all_host_permissions.json",
+                                      Manifest::INVALID_LOCATION,
+                                      Extension::NO_FLAGS,
+                                      kExtensionId2,
+                                      &error);
+  ASSERT_TRUE(extension2_.get()) << error;
   extension_info_map_ = new ExtensionInfoMap;
-  ASSERT_TRUE(extension_info_map_);
+  ASSERT_TRUE(extension_info_map_.get());
   extension_info_map_->AddExtension(extension_.get(),
                                     base::Time() + base::TimeDelta::FromDays(1),
                                     false /*incognito_enabled*/);
diff --git a/chrome/browser/extensions/api/dial/dial_service.cc b/chrome/browser/extensions/api/dial/dial_service.cc
index d525a05..f59eed7 100644
--- a/chrome/browser/extensions/api/dial/dial_service.cc
+++ b/chrome/browser/extensions/api/dial/dial_service.cc
@@ -350,7 +350,7 @@ bool DialServiceImpl::ParseResponse(const std::string& response,
       new HttpResponseHeaders(raw_headers);
 
   std::string device_url_str;
-  if (!GetHeader(headers, kSsdpLocationHeader, &device_url_str) ||
+  if (!GetHeader(headers.get(), kSsdpLocationHeader, &device_url_str) ||
       device_url_str.empty()) {
     DVLOG(1) << "No LOCATION header found.";
     return false;
@@ -363,7 +363,8 @@ bool DialServiceImpl::ParseResponse(const std::string& response,
   }
 
   std::string device_id;
-  if (!GetHeader(headers, kSsdpUsnHeader, &device_id) || device_id.empty()) {
+  if (!GetHeader(headers.get(), kSsdpUsnHeader, &device_id) ||
+      device_id.empty()) {
     DVLOG(1) << "No USN header found.";
     return false;
   }
@@ -375,11 +376,11 @@ bool DialServiceImpl::ParseResponse(const std::string& response,
   // TODO(mfoltz): Parse the max-age value from the cache control header.
   // http://crbug.com/165289
   std::string cache_control;
-  GetHeader(headers, kSsdpCacheControlHeader, &cache_control);
+  GetHeader(headers.get(), kSsdpCacheControlHeader, &cache_control);
 
   std::string config_id;
   int config_id_int;
-  if (GetHeader(headers, kSsdpConfigIdHeader, &config_id) &&
+  if (GetHeader(headers.get(), kSsdpConfigIdHeader, &config_id) &&
       base::StringToInt(config_id, &config_id_int)) {
     device->set_config_id(config_id_int);
   } else {
diff --git a/chrome/browser/extensions/api/dns/dns_apitest.cc b/chrome/browser/extensions/api/dns/dns_apitest.cc
index 3671879..14c005f 100644
--- a/chrome/browser/extensions/api/dns/dns_apitest.cc
+++ b/chrome/browser/extensions/api/dns/dns_apitest.cc
@@ -61,7 +61,7 @@ IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) {
   resolve_function->set_has_callback(true);
 
   scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
-      resolve_function, "[\"127.0.0.1\"]", browser()));
+      resolve_function.get(), "[\"127.0.0.1\"]", browser()));
   ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
   DictionaryValue *value = static_cast<DictionaryValue*>(result.get());
 
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
index 5034052..1cd540e 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
@@ -809,8 +809,8 @@ class HTML5FileWriter {
     CHECK_EQ(base::PLATFORM_FILE_OK, result);
     blob_data_->AppendData(payload_);
     url_request_context_.reset(new TestURLRequestContext(fs_));
-    url_request_context_->blob_storage_controller()->AddFinishedBlob(
-        blob_url(), blob_data_);
+    url_request_context_->blob_storage_controller()
+        ->AddFinishedBlob(blob_url(), blob_data_.get());
     operation()->Write(
         url_request_context_.get(),
         fs_->CrackURL(GURL(root_ + filename_)),
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
index b26b8c1..e8b2f09 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
@@ -464,11 +464,11 @@ void ExtensionActionFunction::NotifyChange() {
   switch (extension_action_->action_type()) {
     case ActionInfo::TYPE_BROWSER:
     case ActionInfo::TYPE_PAGE:
-      if (ExtensionActionManager::Get(profile_)->
-          GetBrowserAction(*extension_)) {
+      if (ExtensionActionManager::Get(profile_)
+              ->GetBrowserAction(*extension_.get())) {
         NotifyBrowserActionChange();
-      } else if (ExtensionActionManager::Get(profile_)->
-                     GetPageAction(*extension_)) {
+      } else if (ExtensionActionManager::Get(profile_)
+                     ->GetPageAction(*extension_.get())) {
         NotifyLocationBarChange();
       }
       return;
diff --git a/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc b/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc
index ee3ab02..9eb99bc 100644
--- a/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc
@@ -319,7 +319,7 @@ IN_PROC_BROWSER_TEST_F(ExperimentalGetAuthTokenFunctionTest,
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
   scoped_refptr<ExperimentalMockGetAuthTokenFunction> func(
       new ExperimentalMockGetAuthTokenFunction());
-  func->set_extension(extension);
+  func->set_extension(extension.get());
   EXPECT_CALL(*func.get(), HasLoginToken()).WillOnce(Return(true));
   TestOAuth2MintTokenFlow* flow = new TestOAuth2MintTokenFlow(
       TestOAuth2MintTokenFlow::ISSUE_ADVICE_SUCCESS, func.get());
@@ -330,7 +330,7 @@ IN_PROC_BROWSER_TEST_F(ExperimentalGetAuthTokenFunctionTest,
   EXPECT_FALSE(func->login_ui_shown());
   EXPECT_FALSE(func->install_ui_shown());
 
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   EXPECT_EQ(
       IdentityTokenCacheValue::CACHE_STATUS_NOTFOUND,
       id_api()->GetCachedToken(extension->id(), oauth2_info.scopes).status());
@@ -357,8 +357,8 @@ IN_PROC_BROWSER_TEST_F(ExperimentalGetAuthTokenFunctionTest,
   scoped_refptr<ExperimentalMockGetAuthTokenFunction> func(
       new ExperimentalMockGetAuthTokenFunction());
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
-  func->set_extension(extension);
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  func->set_extension(extension.get());
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   EXPECT_CALL(*func.get(), HasLoginToken()).WillOnce(Return(true));
   TestOAuth2MintTokenFlow* flow = new TestOAuth2MintTokenFlow(
       TestOAuth2MintTokenFlow::MINT_TOKEN_SUCCESS, func.get());
@@ -501,8 +501,8 @@ IN_PROC_BROWSER_TEST_F(ExperimentalGetAuthTokenFunctionTest,
   scoped_refptr<ExperimentalMockGetAuthTokenFunction> func(
       new ExperimentalMockGetAuthTokenFunction());
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
-  func->set_extension(extension);
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  func->set_extension(extension.get());
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   EXPECT_CALL(*func.get(), HasLoginToken()).WillOnce(Return(false));
   func->set_login_ui_result(true);
   TestOAuth2MintTokenFlow* flow1 = new TestOAuth2MintTokenFlow(
@@ -606,7 +606,7 @@ class ExperimentalLaunchWebAuthFlowFunctionTest :
         extra_params.length() ? "," : "",
         extra_params.c_str());
 
-    RunFunctionAsync(function, args);
+    RunFunctionAsync(function.get(), args);
 
     observer.Wait();
 
@@ -644,14 +644,15 @@ IN_PROC_BROWSER_TEST_F(ExperimentalLaunchWebAuthFlowFunctionTest,
       new ExperimentalIdentityLaunchWebAuthFlowFunction());
 
   RunFunctionAsync(
-      function, "[{\"interactive\": true, \"url\": \"data:text/html,auth\"}]");
+      function.get(),
+      "[{\"interactive\": true, \"url\": \"data:text/html,auth\"}]");
 
   observer.Wait();
   Browser* web_auth_flow_browser =
       content::Source<Browser>(observer.source()).ptr();
   web_auth_flow_browser->window()->Close();
 
-  EXPECT_EQ(std::string(errors::kUserRejected), WaitForError(function));
+  EXPECT_EQ(std::string(errors::kUserRejected), WaitForError(function.get()));
 }
 
 IN_PROC_BROWSER_TEST_F(ExperimentalLaunchWebAuthFlowFunctionTest,
@@ -662,7 +663,7 @@ IN_PROC_BROWSER_TEST_F(ExperimentalLaunchWebAuthFlowFunctionTest,
   function->set_extension(empty_extension.get());
 
   std::string error = utils::RunFunctionAndReturnError(
-      function,
+      function.get(),
       "[{\"interactive\": false, \"url\": \"data:text/html,auth\"}]",
       browser());
 
@@ -678,7 +679,7 @@ IN_PROC_BROWSER_TEST_F(ExperimentalLaunchWebAuthFlowFunctionTest,
 
   function->InitFinalRedirectURLPrefixesForTest("abcdefghij");
   scoped_ptr<base::Value> value(utils::RunFunctionAndReturnSingleResult(
-      function,
+      function.get(),
       "[{\"interactive\": false,"
       "\"url\": \"https://abcdefghij.chromiumapp.org/callback#test\"}]",
       browser()));
@@ -698,7 +699,7 @@ IN_PROC_BROWSER_TEST_F(ExperimentalLaunchWebAuthFlowFunctionTest,
 
   function->InitFinalRedirectURLPrefixesForTest("abcdefghij");
   scoped_ptr<base::Value> value(utils::RunFunctionAndReturnSingleResult(
-      function,
+      function.get(),
       "[{\"interactive\": true,"
       "\"url\": \"https://abcdefghij.chromiumapp.org/callback#test\"}]",
       browser()));
@@ -718,7 +719,7 @@ IN_PROC_BROWSER_TEST_F(ExperimentalLaunchWebAuthFlowFunctionTest,
 
   function->InitFinalRedirectURLPrefixesForTest("abcdefghij");
   scoped_ptr<base::Value> value(utils::RunFunctionAndReturnSingleResult(
-      function,
+      function.get(),
       "[{\"interactive\": true,"
       "\"url\": \"data:text/html,<script>window.location.replace('"
       "https://abcdefghij.chromiumapp.org/callback#test')</script>\"}]",
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc
index f2707bc..736b806 100644
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -384,9 +384,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        NonInteractiveMintAdviceSuccess) {
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
-  func->set_extension(extension);
-  EXPECT_CALL(*func.get(), HasLoginToken())
-      .WillOnce(Return(true));
+  func->set_extension(extension.get());
+  EXPECT_CALL(*func.get(), HasLoginToken()).WillOnce(Return(true));
   TestOAuth2MintTokenFlow* flow = new TestOAuth2MintTokenFlow(
       TestOAuth2MintTokenFlow::ISSUE_ADVICE_SUCCESS, func.get());
   EXPECT_CALL(*func.get(), CreateMintTokenFlow(_)).WillOnce(Return(flow));
@@ -396,10 +395,10 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
   EXPECT_FALSE(func->login_ui_shown());
   EXPECT_FALSE(func->scope_ui_shown());
 
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
-  EXPECT_EQ(IdentityTokenCacheValue::CACHE_STATUS_ADVICE,
-            id_api()->GetCachedToken(extension->id(),
-                                     oauth2_info.scopes).status());
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
+  EXPECT_EQ(
+      IdentityTokenCacheValue::CACHE_STATUS_ADVICE,
+      id_api()->GetCachedToken(extension->id(), oauth2_info.scopes).status());
 }
 
 IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
@@ -422,10 +421,9 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        NonInteractiveSuccess) {
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
-  func->set_extension(extension);
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
-  EXPECT_CALL(*func.get(), HasLoginToken())
-      .WillOnce(Return(true));
+  func->set_extension(extension.get());
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
+  EXPECT_CALL(*func.get(), HasLoginToken()).WillOnce(Return(true));
   TestOAuth2MintTokenFlow* flow = new TestOAuth2MintTokenFlow(
       TestOAuth2MintTokenFlow::MINT_TOKEN_SUCCESS, func.get());
   EXPECT_CALL(*func.get(), CreateMintTokenFlow(_)).WillOnce(Return(flow));
@@ -542,9 +540,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        InteractiveLoginSuccessApprovalSuccess) {
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
-  func->set_extension(extension);
-  EXPECT_CALL(*func.get(), HasLoginToken())
-      .WillOnce(Return(false));
+  func->set_extension(extension.get());
+  EXPECT_CALL(*func.get(), HasLoginToken()).WillOnce(Return(false));
   func->set_login_ui_result(true);
   TestOAuth2MintTokenFlow* flow = new TestOAuth2MintTokenFlow(
       TestOAuth2MintTokenFlow::ISSUE_ADVICE_SUCCESS, func.get());
@@ -644,7 +641,7 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
        ++it) {
     scoped_refptr<MockGetAuthTokenFunction> func(
         new MockGetAuthTokenFunction());
-    func->set_extension(extension);
+    func->set_extension(extension.get());
     EXPECT_CALL(*func.get(), HasLoginToken()).WillOnce(Return(true));
     TestOAuth2MintTokenFlow* flow = new TestOAuth2MintTokenFlow(
         TestOAuth2MintTokenFlow::ISSUE_ADVICE_SUCCESS, func.get());
@@ -661,11 +658,10 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
 IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        InteractiveApprovalSuccess) {
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
-  func->set_extension(extension);
-  EXPECT_CALL(*func.get(), HasLoginToken())
-      .WillOnce(Return(true));
+  func->set_extension(extension.get());
+  EXPECT_CALL(*func.get(), HasLoginToken()).WillOnce(Return(true));
   TestOAuth2MintTokenFlow* flow = new TestOAuth2MintTokenFlow(
       TestOAuth2MintTokenFlow::ISSUE_ADVICE_SUCCESS, func.get());
   EXPECT_CALL(*func.get(), CreateMintTokenFlow(_))
@@ -687,10 +683,10 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
 IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, NoninteractiveQueue) {
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
-  func->set_extension(extension);
+  func->set_extension(extension.get());
 
   // Create a fake request to block the queue.
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   std::set<std::string> scopes(oauth2_info.scopes.begin(),
                                oauth2_info.scopes.end());
   IdentityAPI* id_api =
@@ -707,9 +703,9 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, NoninteractiveQueue) {
   // The real request will start processing, but wait in the queue behind
   // the blocker.
   EXPECT_CALL(*func.get(), HasLoginToken()).WillOnce(Return(true));
-  RunFunctionAsync(func, "[{}]");
+  RunFunctionAsync(func.get(), "[{}]");
   // Verify that we have fetched the login token at this point.
-  testing::Mock::VerifyAndClearExpectations(func);
+  testing::Mock::VerifyAndClearExpectations(func.get());
 
   // The flow will be created after the first queued request clears.
   TestOAuth2MintTokenFlow* flow = new TestOAuth2MintTokenFlow(
@@ -718,7 +714,7 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, NoninteractiveQueue) {
 
   queue->RequestComplete(type, extension->id(), scopes, &queued_request);
 
-  scoped_ptr<base::Value> value(WaitForSingleResult(func));
+  scoped_ptr<base::Value> value(WaitForSingleResult(func.get()));
   std::string access_token;
   EXPECT_TRUE(value->GetAsString(&access_token));
   EXPECT_EQ(std::string(kAccessToken), access_token);
@@ -729,10 +725,10 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, NoninteractiveQueue) {
 IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, InteractiveQueue) {
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
-  func->set_extension(extension);
+  func->set_extension(extension.get());
 
   // Create a fake request to block the queue.
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   std::set<std::string> scopes(oauth2_info.scopes.begin(),
                                oauth2_info.scopes.end());
   IdentityAPI* id_api =
@@ -752,16 +748,16 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, InteractiveQueue) {
   TestOAuth2MintTokenFlow* flow1 = new TestOAuth2MintTokenFlow(
       TestOAuth2MintTokenFlow::ISSUE_ADVICE_SUCCESS, func.get());
   EXPECT_CALL(*func.get(), CreateMintTokenFlow(_)).WillOnce(Return(flow1));
-  RunFunctionAsync(func, "[{\"interactive\": true}]");
+  RunFunctionAsync(func.get(), "[{\"interactive\": true}]");
   // Verify that we have fetched the login token and run the first flow.
-  testing::Mock::VerifyAndClearExpectations(func);
+  testing::Mock::VerifyAndClearExpectations(func.get());
   EXPECT_FALSE(func->scope_ui_shown());
 
   // The UI will be displayed and a token retrieved after the first
   // queued request clears.
   queue->RequestComplete(type, extension->id(), scopes, &queued_request);
 
-  scoped_ptr<base::Value> value(WaitForSingleResult(func));
+  scoped_ptr<base::Value> value(WaitForSingleResult(func.get()));
   std::string access_token;
   EXPECT_TRUE(value->GetAsString(&access_token));
   EXPECT_EQ(std::string(kAccessToken), access_token);
@@ -773,10 +769,10 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        InteractiveQueuedNoninteractiveFails) {
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
-  func->set_extension(extension);
+  func->set_extension(extension.get());
 
   // Create a fake request to block the interactive queue.
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   std::set<std::string> scopes(oauth2_info.scopes.begin(),
                                oauth2_info.scopes.end());
   IdentityAPI* id_api =
@@ -806,10 +802,10 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        NonInteractiveCacheHit) {
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
-  func->set_extension(extension);
+  func->set_extension(extension.get());
 
   // pre-populate the cache with a token
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   IdentityTokenCacheValue token(kAccessToken,
                                 base::TimeDelta::FromSeconds(3600));
   id_api()->SetCachedToken(extension->id(), oauth2_info.scopes, token);
@@ -830,10 +826,10 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        NonInteractiveIssueAdviceCacheHit) {
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
-  func->set_extension(extension);
+  func->set_extension(extension.get());
 
   // pre-populate the cache with advice
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   IssueAdviceInfo info;
   IdentityTokenCacheValue token(info);
   id_api()->SetCachedToken(extension->id(), oauth2_info.scopes, token);
@@ -852,10 +848,10 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        InteractiveCacheHit) {
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
-  func->set_extension(extension);
+  func->set_extension(extension.get());
 
   // Create a fake request to block the queue.
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   std::set<std::string> scopes(oauth2_info.scopes.begin(),
                                oauth2_info.scopes.end());
   IdentityMintRequestQueue* queue = id_api()->mint_queue();
@@ -872,7 +868,7 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
   TestOAuth2MintTokenFlow* flow = new TestOAuth2MintTokenFlow(
       TestOAuth2MintTokenFlow::ISSUE_ADVICE_SUCCESS, func.get());
   EXPECT_CALL(*func.get(), CreateMintTokenFlow(_)).WillOnce(Return(flow));
-  RunFunctionAsync(func, "[{\"interactive\": true}]");
+  RunFunctionAsync(func.get(), "[{\"interactive\": true}]");
 
   // Populate the cache with a token while the request is blocked.
   IdentityTokenCacheValue token(kAccessToken,
@@ -884,7 +880,7 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
 
   queue->RequestComplete(type, extension->id(), scopes, &queued_request);
 
-  scoped_ptr<base::Value> value(WaitForSingleResult(func));
+  scoped_ptr<base::Value> value(WaitForSingleResult(func.get()));
   std::string access_token;
   EXPECT_TRUE(value->GetAsString(&access_token));
   EXPECT_EQ(std::string(kAccessToken), access_token);
@@ -896,10 +892,10 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
                        LoginInvalidatesTokenCache) {
   scoped_refptr<MockGetAuthTokenFunction> func(new MockGetAuthTokenFunction());
   scoped_refptr<const Extension> extension(CreateExtension(CLIENT_ID | SCOPES));
-  func->set_extension(extension);
+  func->set_extension(extension.get());
 
   // pre-populate the cache with a token
-  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension);
+  const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension.get());
   IdentityTokenCacheValue token(kAccessToken,
                                 base::TimeDelta::FromSeconds(3600));
   id_api()->SetCachedToken(extension->id(), oauth2_info.scopes, token);
@@ -933,7 +929,9 @@ class RemoveCachedAuthTokenFunctionTest : public ExtensionBrowserTest {
         new IdentityRemoveCachedAuthTokenFunction);
     func->set_extension(utils::CreateEmptyExtension(kExtensionId));
     return utils::RunFunction(
-        func, std::string("[{\"token\": \"") + kAccessToken + "\"}]", browser(),
+        func.get(),
+        std::string("[{\"token\": \"") + kAccessToken + "\"}]",
+        browser(),
         extension_function_test_utils::NONE);
   }
 
@@ -1016,11 +1014,11 @@ IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest,
 
   std::string args = "[{\"interactive\": true, \"url\": \"" +
       auth_url.spec() + "\"}]";
-  RunFunctionAsync(function, args);
+  RunFunctionAsync(function.get(), args);
 
   popup_observer.Wait();
 
-  EXPECT_EQ(std::string(errors::kUserRejected), WaitForError(function));
+  EXPECT_EQ(std::string(errors::kUserRejected), WaitForError(function.get()));
 }
 
 IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, InteractionRequired) {
@@ -1040,8 +1038,8 @@ IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, InteractionRequired) {
 
   std::string args = "[{\"interactive\": false, \"url\": \"" +
       auth_url.spec() + "\"}]";
-  std::string error = utils::RunFunctionAndReturnError(function, args,
-                                                       browser());
+  std::string error =
+      utils::RunFunctionAndReturnError(function.get(), args, browser());
 
   EXPECT_EQ(std::string(errors::kInteractionRequired), error);
 }
@@ -1078,7 +1076,7 @@ IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, NonInteractiveSuccess) {
 
   function->InitFinalRedirectURLPrefixForTest("abcdefghij");
   scoped_ptr<base::Value> value(utils::RunFunctionAndReturnSingleResult(
-      function,
+      function.get(),
       "[{\"interactive\": false,"
       "\"url\": \"https://abcdefghij.chromiumapp.org/callback#test\"}]",
       browser()));
@@ -1099,7 +1097,7 @@ IN_PROC_BROWSER_TEST_F(
 
   function->InitFinalRedirectURLPrefixForTest("abcdefghij");
   scoped_ptr<base::Value> value(utils::RunFunctionAndReturnSingleResult(
-      function,
+      function.get(),
       "[{\"interactive\": true,"
       "\"url\": \"https://abcdefghij.chromiumapp.org/callback#test\"}]",
       browser()));
@@ -1129,8 +1127,8 @@ IN_PROC_BROWSER_TEST_F(
   function->InitFinalRedirectURLPrefixForTest("abcdefghij");
   std::string args = "[{\"interactive\": true, \"url\": \"" +
       auth_url.spec() + "\"}]";
-  scoped_ptr<base::Value> value(utils::RunFunctionAndReturnSingleResult(
-      function, args, browser()));
+  scoped_ptr<base::Value> value(
+      utils::RunFunctionAndReturnSingleResult(function.get(), args, browser()));
 
   std::string url;
   EXPECT_TRUE(value->GetAsString(&url));
diff --git a/chrome/browser/extensions/api/idle/idle_api_unittest.cc b/chrome/browser/extensions/api/idle/idle_api_unittest.cc
index e55ef07..61f385b 100644
--- a/chrome/browser/extensions/api/idle/idle_api_unittest.cc
+++ b/chrome/browser/extensions/api/idle/idle_api_unittest.cc
@@ -522,7 +522,7 @@ TEST_F(IdleTest, UnloadCleanup) {
   }
 
   // Threshold will reset after unload (and listen count == 0)
-  UnloadedExtensionInfo details(extension_,
+  UnloadedExtensionInfo details(extension_.get(),
                                 extension_misc::UNLOAD_REASON_UNINSTALL);
   idle_manager_->Observe(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
@@ -543,7 +543,7 @@ TEST_F(IdleTest, UnloadCleanup) {
 
 // Verifies that unloading an extension with no listeners or threshold works.
 TEST_F(IdleTest, UnloadOnly) {
-  UnloadedExtensionInfo details(extension_,
+  UnloadedExtensionInfo details(extension_.get(),
                                 extension_misc::UNLOAD_REASON_UNINSTALL);
   idle_manager_->Observe(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
@@ -555,7 +555,7 @@ TEST_F(IdleTest, UnloadOnly) {
 // listener removals.
 TEST_F(IdleTest, UnloadWhileListening) {
   ScopedListen listen(idle_manager_, extension_->id());
-  UnloadedExtensionInfo details(extension_,
+  UnloadedExtensionInfo details(extension_.get(),
                                 extension_misc::UNLOAD_REASON_UNINSTALL);
   idle_manager_->Observe(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc
index a1bd36e..6c15861 100644
--- a/chrome/browser/extensions/api/management/management_api.cc
+++ b/chrome/browser/extensions/api/management/management_api.cc
@@ -394,9 +394,9 @@ void ManagementGetPermissionWarningsByManifestFunction::OnParseSuccess(
     return;
   }
 
-  std::vector<std::string> warnings = CreateWarningsList(extension);
-  results_ = management::GetPermissionWarningsByManifest::Results::Create(
-      warnings);
+  std::vector<std::string> warnings = CreateWarningsList(extension.get());
+  results_ =
+      management::GetPermissionWarningsByManifest::Results::Create(warnings);
   SendResponse(true);
 
   // Matched with AddRef() in RunImpl().
diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc
index 5b6b04d..8361c89 100644
--- a/chrome/browser/extensions/api/management/management_api_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc
@@ -112,9 +112,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest,
 
   EXPECT_TRUE(MatchPattern(
       util::RunFunctionAndReturnError(
-          uninstall_function,
+          uninstall_function.get(),
           base::StringPrintf("[\"%s\", {\"showConfirmDialog\": true}]",
-              id.c_str()),
+                             id.c_str()),
           browser()),
       keys::kUninstallCanceledError));
 
@@ -126,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest,
   ManagementUninstallFunction::SetAutoConfirmForTest(true);
 
   util::RunFunctionAndReturnSingleResult(
-      uninstall_function,
+      uninstall_function.get(),
       base::StringPrintf("[\"%s\", {\"showConfirmDialog\": true}]", id.c_str()),
       browser());
 
diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.cc b/chrome/browser/extensions/api/messaging/native_message_process_host.cc
index 1f713d3..9f8c50b 100644
--- a/chrome/browser/extensions/api/messaging/native_message_process_host.cc
+++ b/chrome/browser/extensions/api/messaging/native_message_process_host.cc
@@ -215,9 +215,9 @@ void NativeMessageProcessHost::DoRead() {
   while (!closed_ && !read_eof_ && !read_pending_) {
     read_buffer_ = new net::IOBuffer(kReadBufferSize);
     int result = read_stream_->Read(
-        read_buffer_, kReadBufferSize,
-        base::Bind(&NativeMessageProcessHost::OnRead,
-                   base::Unretained(this)));
+        read_buffer_.get(),
+        kReadBufferSize,
+        base::Bind(&NativeMessageProcessHost::OnRead, base::Unretained(this)));
     HandleReadResult(result);
   }
 }
@@ -310,18 +310,20 @@ void NativeMessageProcessHost::DoWrite() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
   while (!write_pending_ && !closed_) {
-    if (!current_write_buffer_ || !current_write_buffer_->BytesRemaining()) {
+    if (!current_write_buffer_.get() ||
+        !current_write_buffer_->BytesRemaining()) {
       if (write_queue_.empty())
         return;
       current_write_buffer_ = new net::DrainableIOBuffer(
-          write_queue_.front(), write_queue_.front()->size());
+          write_queue_.front().get(), write_queue_.front()->size());
       write_queue_.pop();
     }
 
-    int result = write_stream_->Write(
-        current_write_buffer_, current_write_buffer_->BytesRemaining(),
-        base::Bind(&NativeMessageProcessHost::OnWritten,
-                   base::Unretained(this)));
+    int result =
+        write_stream_->Write(current_write_buffer_.get(),
+                             current_write_buffer_->BytesRemaining(),
+                             base::Bind(&NativeMessageProcessHost::OnWritten,
+                                        base::Unretained(this)));
     HandleWriteResult(result);
   }
 }
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc
index 597cc8a..3bacbad 100644
--- a/chrome/browser/extensions/api/notifications/notifications_api.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
@@ -58,7 +58,7 @@ class NotificationsApiDelegate : public NotificationDelegate {
         id_(id),
         scoped_id_(CreateScopedIdentifier(extension_id, id)),
         process_id_(-1) {
-    DCHECK(api_function_);
+    DCHECK(api_function_.get());
     if (api_function_->render_view_host())
       process_id_ = api_function->render_view_host()->GetProcess()->GetID();
   }
@@ -105,7 +105,7 @@ class NotificationsApiDelegate : public NotificationDelegate {
     // until ReleaseRVH is called, and api_function_ (as a
     // UIThreadExtensionFunction) will zero out its copy of render_view_host
     // when the RVH goes away.
-    if (!api_function_)
+    if (!api_function_.get())
       return NULL;
     return api_function_->render_view_host();
   }
diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
index bf145fc..01d7c9d 100644
--- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
@@ -70,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
     notification_function->set_has_callback(true);
 
     scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-        notification_function,
+        notification_function.get(),
         "[\"\", "  // Empty string: ask API to generate ID
         "{"
         "\"type\": \"basic\","
@@ -78,7 +78,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
         "\"title\": \"Attention!\","
         "\"message\": \"Check out Cirque du Soleil\""
         "}]",
-        browser(), utils::NONE));
+        browser(),
+        utils::NONE));
 
     ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
     ASSERT_TRUE(result->GetAsString(&notification_id));
@@ -95,15 +96,17 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
     notification_function->set_has_callback(true);
 
     scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-        notification_function,
-        "[\"" + notification_id + "\", "
-        "{"
-        "\"type\": \"basic\","
-        "\"iconUrl\": \"an/image/that/does/not/exist.png\","
-        "\"title\": \"Attention!\","
-        "\"message\": \"Too late! The show ended yesterday\""
-        "}]",
-        browser(), utils::NONE));
+        notification_function.get(),
+        "[\"" + notification_id +
+            "\", "
+            "{"
+            "\"type\": \"basic\","
+            "\"iconUrl\": \"an/image/that/does/not/exist.png\","
+            "\"title\": \"Attention!\","
+            "\"message\": \"Too late! The show ended yesterday\""
+            "}]",
+        browser(),
+        utils::NONE));
 
     ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
     bool copy_bool_value = false;
@@ -127,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
     notification_function->set_has_callback(true);
 
     scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-        notification_function,
+        notification_function.get(),
         "[\"xxxxxxxxxxxx\", "
         "{"
         "\"type\": \"basic\","
@@ -135,7 +138,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
         "\"title\": \"!\","
         "\"message\": \"!\""
         "}]",
-        browser(), utils::NONE));
+        browser(),
+        utils::NONE));
 
     ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
     bool copy_bool_value = false;
@@ -152,9 +156,11 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
     notification_function->set_extension(empty_extension.get());
     notification_function->set_has_callback(true);
 
-    scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-        notification_function,
-        "[\"xxxxxxxxxxx\"]", browser(), utils::NONE));
+    scoped_ptr<base::Value> result(
+        utils::RunFunctionAndReturnSingleResult(notification_function.get(),
+                                                "[\"xxxxxxxxxxx\"]",
+                                                browser(),
+                                                utils::NONE));
 
     ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
     bool copy_bool_value = false;
@@ -171,9 +177,11 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
     notification_function->set_extension(empty_extension.get());
     notification_function->set_has_callback(true);
 
-    scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-        notification_function,
-        "[\"" + notification_id + "\"]", browser(), utils::NONE));
+    scoped_ptr<base::Value> result(
+        utils::RunFunctionAndReturnSingleResult(notification_function.get(),
+                                                "[\"" + notification_id + "\"]",
+                                                browser(),
+                                                utils::NONE));
 
     ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
     bool copy_bool_value = false;
@@ -192,7 +200,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestBaseFormatNotification) {
   notification_create_function->set_has_callback(true);
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-      notification_create_function,
+      notification_create_function.get(),
       "[\"\", "
       "{"
       "\"type\": \"basic\","
@@ -213,7 +221,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestBaseFormatNotification) {
       "\"expandedMessage\": \"This is a longer expanded message.\","
       "\"imageUrl\": \"http://www.google.com/logos/2012/election12-hp.jpg\""
       "}]",
-      browser(), utils::NONE));
+      browser(),
+      utils::NONE));
 
   std::string notification_id;
   ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
@@ -231,7 +240,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestMultipleItemNotification) {
   notification_create_function->set_has_callback(true);
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-      notification_create_function,
+      notification_create_function.get(),
       "[\"\", "
       "{"
       "\"type\": \"list\","
@@ -253,7 +262,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestMultipleItemNotification) {
       "\"priority\": 1,"
       "\"eventTime\": 1361488019.9999999"
       "}]",
-      browser(), utils::NONE));
+      browser(),
+      utils::NONE));
   // TODO(dharcourt): [...], items = [{title: foo, message: bar}, ...], [...]
 
   std::string notification_id;
@@ -278,7 +288,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestGetAll) {
     notification_get_all_function->set_extension(empty_extension.get());
     notification_get_all_function->set_has_callback(true);
     scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-        notification_get_all_function, "[]", browser(), utils::NONE));
+        notification_get_all_function.get(), "[]", browser(), utils::NONE));
 
     base::DictionaryValue* return_value;
     ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
@@ -297,7 +307,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestGetAll) {
     notification_create_function->set_has_callback(true);
 
     scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-        notification_create_function,
+        notification_create_function.get(),
         base::StringPrintf("[\"identifier-%u\", "
                            "{"
                            "\"type\": \"basic\","
@@ -319,7 +329,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestGetAll) {
     notification_get_all_function->set_extension(empty_extension.get());
     notification_get_all_function->set_has_callback(true);
     scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-        notification_get_all_function, "[]", browser(), utils::NONE));
+        notification_get_all_function.get(), "[]", browser(), utils::NONE));
 
     base::DictionaryValue* return_value;
     ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc
index cbaf1d9..0b526a8 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -62,7 +62,7 @@ bool PermissionsContainsFunction::RunImpl() {
     return false;
 
   results_ = Contains::Results::Create(
-      GetExtension()->GetActivePermissions()->Contains(*permissions));
+      GetExtension()->GetActivePermissions()->Contains(*permissions.get()));
   return true;
 }
 
@@ -181,8 +181,8 @@ bool PermissionsRequestFunction::RunImpl() {
           requested_permissions_.get());
 
   // The requested permissions must be defined as optional in the manifest.
-  if (!PermissionsData::GetOptionalPermissions(GetExtension())->Contains(
-          *manifest_required_requested_permissions)) {
+  if (!PermissionsData::GetOptionalPermissions(GetExtension())
+          ->Contains(*manifest_required_requested_permissions.get())) {
     error_ = kNotInOptionalPermissionsError;
     return false;
   }
@@ -192,7 +192,7 @@ bool PermissionsRequestFunction::RunImpl() {
   scoped_refptr<const PermissionSet> granted =
       ExtensionPrefs::Get(profile_)->
           GetGrantedPermissions(GetExtension()->id());
-  if (granted && granted->Contains(*requested_permissions_)) {
+  if (granted.get() && granted->Contains(*requested_permissions_.get())) {
     PermissionsUpdater perms_updater(profile());
     perms_updater.AddPermissions(GetExtension(), requested_permissions_.get());
     results_ = Request::Results::Create(true);
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
index 28c94ac..429ee70 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
@@ -40,7 +40,7 @@ TEST(ExtensionPermissionsAPIHelpers, Pack) {
       new PermissionSet(apis, hosts, URLPatternSet());
 
   // Pack the permission set to value and verify its contents.
-  scoped_ptr<Permissions> permissions(PackPermissionSet(permission_set));
+  scoped_ptr<Permissions> permissions(PackPermissionSet(permission_set.get()));
   scoped_ptr<DictionaryValue> value(permissions->ToValue());
   ListValue* api_list = NULL;
   ListValue* origin_list = NULL;
@@ -71,7 +71,7 @@ TEST(ExtensionPermissionsAPIHelpers, Pack) {
   from_value = UnpackPermissionSet(permissions_object, true, &error);
   EXPECT_TRUE(error.empty());
 
-  EXPECT_EQ(*permission_set, *from_value);
+  EXPECT_EQ(*permission_set.get(), *from_value.get());
 }
 
 // Tests various error conditions and edge cases when unpacking values
@@ -93,7 +93,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
     EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
     permissions = UnpackPermissionSet(permissions_object, true, &error);
     EXPECT_TRUE(permissions->HasAPIPermission(APIPermission::kTab));
-    EXPECT_TRUE(permissions);
+    EXPECT_TRUE(permissions.get());
     EXPECT_TRUE(error.empty());
   }
 
@@ -104,7 +104,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
     value->Set("origins", origins->DeepCopy());
     EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
     permissions = UnpackPermissionSet(permissions_object, true, &error);
-    EXPECT_TRUE(permissions);
+    EXPECT_TRUE(permissions.get());
     EXPECT_TRUE(error.empty());
     EXPECT_TRUE(permissions->HasExplicitAccessToOrigin(GURL("http://a.com/")));
   }
@@ -152,7 +152,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
     value->Set("random", Value::CreateIntegerValue(3));
     EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
     permissions = UnpackPermissionSet(permissions_object, true, &error);
-    EXPECT_TRUE(permissions);
+    EXPECT_TRUE(permissions.get());
     EXPECT_TRUE(error.empty());
     EXPECT_TRUE(permissions->HasExplicitAccessToOrigin(GURL("http://a.com/")));
   }
@@ -166,7 +166,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
     value->Set("permissions", invalid_apis->DeepCopy());
     EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
     permissions = UnpackPermissionSet(permissions_object, true, &error);
-    EXPECT_FALSE(permissions);
+    EXPECT_FALSE(permissions.get());
     EXPECT_FALSE(error.empty());
     EXPECT_EQ(error, "'unknown_permission' is not a recognized permission.");
   }
diff --git a/chrome/browser/extensions/api/permissions/permissions_apitest.cc b/chrome/browser/extensions/api/permissions/permissions_apitest.cc
index 82bd17f..ef20085 100644
--- a/chrome/browser/extensions/api/permissions/permissions_apitest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc
@@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsGranted) {
   ExtensionPrefs* prefs =
       browser()->profile()->GetExtensionService()->extension_prefs();
   prefs->AddGrantedPermissions("kjmkgkdkpedkejedfhmfcenooemhbpbo",
-                               granted_permissions);
+                               granted_permissions.get());
 
   PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);
   host_resolver()->AddRule("*.com", "127.0.0.1");
diff --git a/chrome/browser/extensions/api/power/power_api_unittest.cc b/chrome/browser/extensions/api/power/power_api_unittest.cc
index 07870a6..9e7ca2e 100644
--- a/chrome/browser/extensions/api/power/power_api_unittest.cc
+++ b/chrome/browser/extensions/api/power/power_api_unittest.cc
@@ -157,7 +157,7 @@ class PowerApiTest : public BrowserWithTestWindowTest {
         static_cast<UIThreadExtensionFunction*>(
             new PowerReleaseKeepAwakeFunction));
     function->set_extension(extension);
-    return utils::RunFunction(function, args, browser(), utils::NONE);
+    return utils::RunFunction(function.get(), args, browser(), utils::NONE);
   }
 
   // Send a notification to PowerApiManager saying that |extension| has
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
index 13d7233..f0bf6f11 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
@@ -111,7 +111,7 @@ class PushMessagingCanaryTest : public ExtensionApiTest {
     resolver->AllowDirectLookup("*.gstatic.com");
     resolver->AllowDirectLookup("*.googleapis.com");
     mock_host_resolver_override_.reset(
-        new net::ScopedDefaultHostResolverProc(resolver));
+        new net::ScopedDefaultHostResolverProc(resolver.get()));
   }
 
   // We need to reset the DNS lookup when we finish, or the test will fail.
diff --git a/chrome/browser/extensions/api/record/record_api_test.cc b/chrome/browser/extensions/api/record/record_api_test.cc
index 6827a6e..458858f 100644
--- a/chrome/browser/extensions/api/record/record_api_test.cc
+++ b/chrome/browser/extensions/api/record/record_api_test.cc
@@ -319,10 +319,11 @@ IN_PROC_BROWSER_TEST_F(RecordApiTest, MAYBE_CheckPlayback) {
   scoped_refptr<RecordReplayURLsFunction> playback_function(
       new RecordReplayURLsFunction(
       new TestProcessStrategy(&temp_files_)));
-  scoped_ptr<base::DictionaryValue> result(utils::ToDictionary(
-      utils::RunFunctionAndReturnSingleResult(playback_function,
-      base::StringPrintf(kPlaybackArgs1, escaped_user_data_dir.c_str()),
-      browser())));
+  scoped_ptr<base::DictionaryValue> result(
+      utils::ToDictionary(utils::RunFunctionAndReturnSingleResult(
+          playback_function.get(),
+          base::StringPrintf(kPlaybackArgs1, escaped_user_data_dir.c_str()),
+          browser())));
 
   // Check that command line user-data-dir was overridden.  (That
   // it was *consistently* overridden in both capture and replay
diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc
index 2712236..bf3be55 100644
--- a/chrome/browser/extensions/api/socket/socket_apitest.cc
+++ b/chrome/browser/extensions/api/socket/socket_apitest.cc
@@ -123,9 +123,7 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPCreateGood) {
   socket_create_function->set_has_callback(true);
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-      socket_create_function,
-      "[\"udp\"]",
-      browser(), utils::NONE));
+      socket_create_function.get(), "[\"udp\"]", browser(), utils::NONE));
   ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
   DictionaryValue *value = static_cast<DictionaryValue*>(result.get());
   int socketId = -1;
@@ -142,9 +140,7 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPCreateGood) {
   socket_create_function->set_has_callback(true);
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-      socket_create_function,
-      "[\"tcp\"]",
-      browser(), utils::NONE));
+      socket_create_function.get(), "[\"tcp\"]", browser(), utils::NONE));
   ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
   DictionaryValue *value = static_cast<DictionaryValue*>(result.get());
   int socketId = -1;
@@ -161,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, GetNetworkList) {
   socket_function->set_has_callback(true);
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-      socket_function, "[]", browser(), utils::NONE));
+      socket_function.get(), "[]", browser(), utils::NONE));
   ASSERT_EQ(base::Value::TYPE_LIST, result->GetType());
 
   // If we're invoking socket tests, all we can confirm is that we have at
diff --git a/chrome/browser/extensions/api/storage/settings_frontend.cc b/chrome/browser/extensions/api/storage/settings_frontend.cc
index ac2512b..dece669 100644
--- a/chrome/browser/extensions/api/storage/settings_frontend.cc
+++ b/chrome/browser/extensions/api/storage/settings_frontend.cc
@@ -176,7 +176,7 @@ void SettingsFrontend::RunWithStorage(
   scoped_refptr<const Extension> extension =
       extensions::ExtensionSystem::Get(profile_)->extension_service()->
           GetExtensionById(extension_id, true);
-  CHECK(extension);
+  CHECK(extension.get());
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
diff --git a/chrome/browser/extensions/api/storage/storage_schema_manifest_handler_unittest.cc b/chrome/browser/extensions/api/storage/storage_schema_manifest_handler_unittest.cc
index 2134486..1d0a7bb 100644
--- a/chrome/browser/extensions/api/storage/storage_schema_manifest_handler_unittest.cc
+++ b/chrome/browser/extensions/api/storage/storage_schema_manifest_handler_unittest.cc
@@ -44,7 +44,7 @@ class StorageSchemaManifestHandlerTest : public testing::Test {
     scoped_refptr<Extension> extension = Extension::Create(
         temp_dir_.path(), Manifest::UNPACKED, manifest_,
         Extension::NO_FLAGS, "", &error);
-    if (!extension)
+    if (!extension.get())
       return NULL;
     base::FilePath schema_path = temp_dir_.path().AppendASCII("schema.json");
     if (schema.empty()) {
@@ -60,7 +60,7 @@ class StorageSchemaManifestHandlerTest : public testing::Test {
 
   testing::AssertionResult Validates(const std::string& schema) {
     scoped_refptr<Extension> extension = CreateExtension(schema);
-    if (!extension)
+    if (!extension.get())
       return testing::AssertionFailure() << "Failed to create test extension";
     std::string error;
     std::vector<InstallWarning> warnings;
@@ -78,7 +78,7 @@ class StorageSchemaManifestHandlerTest : public testing::Test {
 
 TEST_F(StorageSchemaManifestHandlerTest, Parse) {
   scoped_refptr<Extension> extension = CreateExtension("");
-  ASSERT_TRUE(extension);
+  ASSERT_TRUE(extension.get());
 
   // No storage.managed_schema entry.
   string16 error;
@@ -87,12 +87,12 @@ TEST_F(StorageSchemaManifestHandlerTest, Parse) {
   // Not a string.
   manifest_.SetInteger("storage.managed_schema", 123);
   extension = CreateExtension("");
-  EXPECT_FALSE(extension);
+  EXPECT_FALSE(extension.get());
 
   // All good now.
   manifest_.SetString("storage.managed_schema", "schema.json");
   extension = CreateExtension("");
-  ASSERT_TRUE(extension);
+  ASSERT_TRUE(extension.get());
   EXPECT_TRUE(handler_->Parse(extension.get(), &error)) << error;
 }
 
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_manifest_unittest.cc b/chrome/browser/extensions/api/streams_private/streams_private_manifest_unittest.cc
index 6f8aae5..98518f3 100644
--- a/chrome/browser/extensions/api/streams_private/streams_private_manifest_unittest.cc
+++ b/chrome/browser/extensions/api/streams_private/streams_private_manifest_unittest.cc
@@ -37,7 +37,7 @@ TEST_F(StreamsPrivateManifestTest, ValidMimeTypesHandlerMIMETypes) {
       .Build();
 
   ASSERT_TRUE(extension.get());
-  MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
+  MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension.get());
   ASSERT_TRUE(handler != NULL);
 
   EXPECT_FALSE(handler->CanHandleMIMEType("plain/html"));
@@ -58,7 +58,7 @@ TEST_F(StreamsPrivateManifestTest,
 
   ASSERT_TRUE(extension.get());
 
-  MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
+  MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension.get());
   ASSERT_TRUE(handler == NULL);
 }
 
diff --git a/chrome/browser/extensions/api/system_info/system_info_provider.h b/chrome/browser/extensions/api/system_info/system_info_provider.h
index 849075d..574e629 100644
--- a/chrome/browser/extensions/api/system_info/system_info_provider.h
+++ b/chrome/browser/extensions/api/system_info/system_info_provider.h
@@ -51,7 +51,7 @@ class SystemInfoProvider
   // For testing
   static void InitializeForTesting(
       scoped_refptr<SystemInfoProvider<T> > provider) {
-    DCHECK(provider != NULL);
+    DCHECK(provider.get() != NULL);
     single_shared_provider_.Get() = provider;
   }
 
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index fcb587b..288d2cf 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -1967,9 +1967,8 @@ ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
 ExecuteCodeInTabFunction::~ExecuteCodeInTabFunction() {}
 
 bool ExecuteCodeInTabFunction::HasPermission() {
-  if (Init() &&
-      PermissionsData::HasAPIPermissionForTab(
-          extension_, execute_tab_id_, APIPermission::kTab)) {
+  if (Init() && PermissionsData::HasAPIPermissionForTab(
+                    extension_.get(), execute_tab_id_, APIPermission::kTab)) {
     return true;
   }
   return ExtensionFunction::HasPermission();
diff --git a/chrome/browser/extensions/api/usb/usb_api.cc b/chrome/browser/extensions/api/usb/usb_api.cc
index a1da7ba..453f8940 100644
--- a/chrome/browser/extensions/api/usb/usb_api.cc
+++ b/chrome/browser/extensions/api/usb/usb_api.cc
@@ -450,9 +450,9 @@ void UsbFindDevicesFunction::AsyncWorkStart() {
 
 void UsbFindDevicesFunction::OnCompleted() {
   for (size_t i = 0; i < devices_.size(); ++i) {
-    UsbDevice* const device = devices_[i];
-    UsbDeviceResource* const resource = new UsbDeviceResource(
-        extension_->id(), device);
+    UsbDevice* const device = devices_[i].get();
+    UsbDeviceResource* const resource =
+        new UsbDeviceResource(extension_->id(), device);
 
     Device js_device;
     result_->Append(PopulateDevice(manager_->Add(resource),
@@ -483,8 +483,8 @@ void UsbListInterfacesFunction::AsyncWorkStart() {
   }
 
   config_ = new UsbConfigDescriptor();
-  resource->device()->ListInterfaces(config_, base::Bind(
-      &UsbListInterfacesFunction::OnCompleted, this));
+  resource->device()->ListInterfaces(
+      config_.get(), base::Bind(&UsbListInterfacesFunction::OnCompleted, this));
 }
 
 void UsbListInterfacesFunction::OnCompleted(bool success) {
@@ -743,13 +743,21 @@ void UsbControlTransferFunction::AsyncWorkStart() {
 
   scoped_refptr<net::IOBuffer> buffer = CreateBufferForTransfer(
       transfer, direction, size);
-  if (!buffer) {
+  if (!buffer.get()) {
     CompleteWithError(kErrorMalformedParameters);
     return;
   }
 
-  resource->device()->ControlTransfer(direction, request_type, recipient,
-      transfer.request, transfer.value, transfer.index, buffer, size, 0,
+  resource->device()->ControlTransfer(
+      direction,
+      request_type,
+      recipient,
+      transfer.request,
+      transfer.value,
+      transfer.index,
+      buffer.get(),
+      size,
+      0,
       base::Bind(&UsbControlTransferFunction::OnCompleted, this));
 }
 
@@ -788,13 +796,18 @@ void UsbBulkTransferFunction::AsyncWorkStart() {
 
   scoped_refptr<net::IOBuffer> buffer = CreateBufferForTransfer(
       transfer, direction, size);
-  if (!buffer) {
+  if (!buffer.get()) {
     CompleteWithError(kErrorMalformedParameters);
     return;
   }
 
-  resource->device()->BulkTransfer(direction, transfer.endpoint,
-      buffer, size, 0, base::Bind(&UsbBulkTransferFunction::OnCompleted, this));
+  resource->device()
+      ->BulkTransfer(direction,
+                     transfer.endpoint,
+                     buffer.get(),
+                     size,
+                     0,
+                     base::Bind(&UsbBulkTransferFunction::OnCompleted, this));
 }
 
 UsbInterruptTransferFunction::UsbInterruptTransferFunction() {}
@@ -832,13 +845,18 @@ void UsbInterruptTransferFunction::AsyncWorkStart() {
 
   scoped_refptr<net::IOBuffer> buffer = CreateBufferForTransfer(
       transfer, direction, size);
-  if (!buffer) {
+  if (!buffer.get()) {
     CompleteWithError(kErrorMalformedParameters);
     return;
   }
 
-  resource->device()->InterruptTransfer(direction, transfer.endpoint, buffer,
-      size, 0, base::Bind(&UsbInterruptTransferFunction::OnCompleted, this));
+  resource->device()->InterruptTransfer(
+      direction,
+      transfer.endpoint,
+      buffer.get(),
+      size,
+      0,
+      base::Bind(&UsbInterruptTransferFunction::OnCompleted, this));
 }
 
 UsbIsochronousTransferFunction::UsbIsochronousTransferFunction() {}
@@ -892,14 +910,20 @@ void UsbIsochronousTransferFunction::AsyncWorkStart() {
 
   scoped_refptr<net::IOBuffer> buffer = CreateBufferForTransfer(
       generic_transfer, direction, size);
-  if (!buffer) {
+  if (!buffer.get()) {
     CompleteWithError(kErrorMalformedParameters);
     return;
   }
 
-  resource->device()->IsochronousTransfer(direction, generic_transfer.endpoint,
-      buffer, size, packets, packet_length, 0, base::Bind(
-          &UsbIsochronousTransferFunction::OnCompleted, this));
+  resource->device()->IsochronousTransfer(
+      direction,
+      generic_transfer.endpoint,
+      buffer.get(),
+      size,
+      packets,
+      packet_length,
+      0,
+      base::Bind(&UsbIsochronousTransferFunction::OnCompleted, this));
 }
 
 UsbResetDeviceFunction::UsbResetDeviceFunction() {}
diff --git a/chrome/browser/extensions/api/usb/usb_apitest.cc b/chrome/browser/extensions/api/usb/usb_apitest.cc
index 55ed901..20f37d9 100644
--- a/chrome/browser/extensions/api/usb/usb_apitest.cc
+++ b/chrome/browser/extensions/api/usb/usb_apitest.cc
@@ -95,60 +95,68 @@ class UsbApiTest : public ExtensionApiTest {
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, DeviceHandling) {
-  EXPECT_CALL(*mock_device_, Close(_))
+  EXPECT_CALL(*mock_device_.get(), Close(_))
       .WillRepeatedly(InvokeUsbCallback());
-  EXPECT_CALL(*mock_device_, ResetDevice(_))
-    .WillOnce(InvokeUsbResultCallback<0>(true))
-    .WillOnce(InvokeUsbResultCallback<0>(false));
-  EXPECT_CALL(*mock_device_,
+  EXPECT_CALL(*mock_device_.get(), ResetDevice(_))
+      .WillOnce(InvokeUsbResultCallback<0>(true))
+      .WillOnce(InvokeUsbResultCallback<0>(false));
+  EXPECT_CALL(*mock_device_.get(),
               InterruptTransfer(USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
-    .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
+      .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
   ASSERT_TRUE(RunExtensionTest("usb/device_handling"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, ListInterfaces) {
-  EXPECT_CALL(*mock_device_, ListInterfaces(_, _))
-    .WillOnce(InvokeUsbResultCallback<1>(false));
-  EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
+  EXPECT_CALL(*mock_device_.get(), ListInterfaces(_, _))
+      .WillOnce(InvokeUsbResultCallback<1>(false));
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/list_interfaces"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferEvent) {
-  EXPECT_CALL(*mock_device_,
-      ControlTransfer(USB_DIRECTION_OUTBOUND, UsbDevice::STANDARD,
-          UsbDevice::DEVICE, 1, 2, 3, _, 1, _, _))
+  EXPECT_CALL(*mock_device_.get(),
+              ControlTransfer(USB_DIRECTION_OUTBOUND,
+                              UsbDevice::STANDARD,
+                              UsbDevice::DEVICE,
+                              1,
+                              2,
+                              3,
+                              _,
+                              1,
+                              _,
+                              _))
       .WillOnce(InvokeUsbTransferCallback<9>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_,
-      BulkTransfer(USB_DIRECTION_OUTBOUND, 1, _, 1, _, _))
+  EXPECT_CALL(*mock_device_.get(),
+              BulkTransfer(USB_DIRECTION_OUTBOUND, 1, _, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_,
-      InterruptTransfer(USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
+  EXPECT_CALL(*mock_device_.get(),
+              InterruptTransfer(USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_,
-      IsochronousTransfer(USB_DIRECTION_OUTBOUND, 3, _, 1, 1, 1, _, _))
+  EXPECT_CALL(*mock_device_.get(),
+              IsochronousTransfer(USB_DIRECTION_OUTBOUND, 3, _, 1, 1, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<7>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/transfer_event"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, ZeroLengthTransfer) {
-  EXPECT_CALL(*mock_device_, BulkTransfer(_, _, _, 0, _, _))
+  EXPECT_CALL(*mock_device_.get(), BulkTransfer(_, _, _, 0, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/zero_length_transfer"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferFailure) {
-  EXPECT_CALL(*mock_device_, BulkTransfer(_, _, _, _, _, _))
+  EXPECT_CALL(*mock_device_.get(), BulkTransfer(_, _, _, _, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_ERROR))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_TIMEOUT));
-  EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/transfer_failure"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) {
-  EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/invalid_length_transfer"));
 }
 
diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc
index 724ac26..ef1b2fb 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api.cc
@@ -1925,9 +1925,12 @@ void ExtensionWebRequestEventRouter::OnRulesRegistryReady(
       base::Time::Now() - blocked_request.blocking_time;
   UMA_HISTOGRAM_TIMES("Extensions.NetworkDelayRegistryLoad", block_time);
 
-  ProcessDeclarativeRules(profile, blocked_request.extension_info_map,
-                          event_name, blocked_request.request, request_stage,
-                          blocked_request.original_response_headers);
+  ProcessDeclarativeRules(profile,
+                          blocked_request.extension_info_map,
+                          event_name,
+                          blocked_request.request,
+                          request_stage,
+                          blocked_request.original_response_headers.get());
   // Reset to NULL so that nobody relies on this being set.
   blocked_request.extension_info_map = NULL;
   DecrementBlockCount(profile, std::string(), event_name, request_id, NULL);
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
index 3c7b446..902112e 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
@@ -1263,9 +1263,9 @@ void NotifyWebRequestAPIUsed(
   if (!g_browser_process->profile_manager()->IsValidProfile(profile))
     return;
 
-  if (profile->GetExtensionService()->HasUsedWebRequest(extension))
+  if (profile->GetExtensionService()->HasUsedWebRequest(extension.get()))
     return;
-  profile->GetExtensionService()->SetHasUsedWebRequest(extension, true);
+  profile->GetExtensionService()->SetHasUsedWebRequest(extension.get(), true);
 
   content::BrowserContext* browser_context = profile;
   for (content::RenderProcessHost::iterator it =
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index 4746018..f712938 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -1273,9 +1273,8 @@ TEST(ExtensionWebRequestHelpersTest, TestCalculateOnHeadersReceivedDelta) {
   // Key3 is deleted
   new_headers.push_back(ResponseHeader("Key4", "Value4"));  // Added
 
-  scoped_ptr<EventResponseDelta> delta(
-      CalculateOnHeadersReceivedDelta("extid", base::Time::Now(), cancel,
-          base_headers, &new_headers));
+  scoped_ptr<EventResponseDelta> delta(CalculateOnHeadersReceivedDelta(
+      "extid", base::Time::Now(), cancel, base_headers.get(), &new_headers));
   ASSERT_TRUE(delta.get());
   EXPECT_TRUE(delta->cancel);
   EXPECT_EQ(2u, delta->added_response_headers.size());
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
index 01777f9..5820af4 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@ -52,7 +52,7 @@ void ExtensionWebRequestHelpersTestWithThreadsTest::SetUp() {
                                                     Extension::NO_FLAGS,
                                                     "ext_id_1",
                                                     &error);
-  ASSERT_TRUE(permissionless_extension_) << error;
+  ASSERT_TRUE(permissionless_extension_.get()) << error;
   com_extension_ =
       LoadManifestUnchecked("permissions",
                             "web_request_com_host_permissions.json",
@@ -60,7 +60,7 @@ void ExtensionWebRequestHelpersTestWithThreadsTest::SetUp() {
                             Extension::NO_FLAGS,
                             "ext_id_2",
                             &error);
-  ASSERT_TRUE(com_extension_) << error;
+  ASSERT_TRUE(com_extension_.get()) << error;
   extension_info_map_ = new ExtensionInfoMap;
   extension_info_map_->AddExtension(permissionless_extension_.get(),
                                     base::Time::Now(),
@@ -149,25 +149,25 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest,
       GURL("http://example.com"), NULL, &context, NULL);
 
   EXPECT_TRUE(WebRequestPermissions::CanExtensionAccessURL(
-      extension_info_map_,
+      extension_info_map_.get(),
       permissionless_extension_->id(),
       request.url(),
       false /*crosses_incognito*/,
       WebRequestPermissions::DO_NOT_CHECK_HOST));
   EXPECT_FALSE(WebRequestPermissions::CanExtensionAccessURL(
-      extension_info_map_,
+      extension_info_map_.get(),
       permissionless_extension_->id(),
       request.url(),
       false /*crosses_incognito*/,
       WebRequestPermissions::REQUIRE_HOST_PERMISSION));
   EXPECT_TRUE(WebRequestPermissions::CanExtensionAccessURL(
-      extension_info_map_,
+      extension_info_map_.get(),
       com_extension_->id(),
       request.url(),
       false /*crosses_incognito*/,
       WebRequestPermissions::REQUIRE_HOST_PERMISSION));
   EXPECT_FALSE(WebRequestPermissions::CanExtensionAccessURL(
-      extension_info_map_,
+      extension_info_map_.get(),
       com_extension_->id(),
       request.url(),
       false /*crosses_incognito*/,
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
index c00e796..dc299f2 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -416,8 +416,9 @@ void BeginInstallWithManifestFunction::OnWebstoreParseSuccess(
       std::string(),
       &error);
 
-  if (!dummy_extension_) {
-    OnWebstoreParseFailure(id_, WebstoreInstallHelper::Delegate::MANIFEST_ERROR,
+  if (!dummy_extension_.get()) {
+    OnWebstoreParseFailure(id_,
+                           WebstoreInstallHelper::Delegate::MANIFEST_ERROR,
                            kInvalidManifestError);
     return;
   }
@@ -490,7 +491,7 @@ void BeginInstallWithManifestFunction::SigninCompletedOrNotNeeded() {
   install_prompt_.reset(new ExtensionInstallPrompt(web_contents));
   install_prompt_->ConfirmWebstoreInstall(
       this,
-      dummy_extension_,
+      dummy_extension_.get(),
       &icon_,
       ExtensionInstallPrompt::GetDefaultShowDialogCallback());
   // Control flow finishes up in InstallUIProceed or InstallUIAbort.
@@ -515,7 +516,7 @@ void BeginInstallWithManifestFunction::InstallUIProceed() {
   // for all extension installs, so we only need to record the web store
   // specific histogram here.
   ExtensionService::RecordPermissionMessagesHistogram(
-      dummy_extension_, "Extensions.Permissions_WebStoreInstall");
+      dummy_extension_.get(), "Extensions.Permissions_WebStoreInstall");
 
   // Matches the AddRef in RunImpl().
   Release();
@@ -533,14 +534,14 @@ void BeginInstallWithManifestFunction::InstallUIAbort(bool user_initiated) {
   std::string histogram_name = user_initiated ?
       "Extensions.Permissions_WebStoreInstallCancel" :
       "Extensions.Permissions_WebStoreInstallAbort";
-  ExtensionService::RecordPermissionMessagesHistogram(
-      dummy_extension_, histogram_name.c_str());
+  ExtensionService::RecordPermissionMessagesHistogram(dummy_extension_.get(),
+                                                      histogram_name.c_str());
 
   histogram_name = user_initiated ?
       "Extensions.Permissions_InstallCancel" :
       "Extensions.Permissions_InstallAbort";
-  ExtensionService::RecordPermissionMessagesHistogram(
-      dummy_extension_, histogram_name.c_str());
+  ExtensionService::RecordPermissionMessagesHistogram(dummy_extension_.get(),
+                                                      histogram_name.c_str());
 
   // Matches the AddRef in RunImpl().
   Release();
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 2ab4206..42151e1 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -300,7 +300,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) {
       extensions::Manifest::UNPACKED,
       Extension::FROM_BOOKMARK,
       &error));
-  service->OnExtensionInstalled(extension,
+  service->OnExtensionInstalled(extension.get(),
                                 syncer::StringOrdinal::CreateInitialOrdinal(),
                                 false /* no requirement errors */,
                                 false /* don't wait for idle */);
diff --git a/chrome/browser/extensions/blacklist.cc b/chrome/browser/extensions/blacklist.cc
index 0fccd61..e6bea2a 100644
--- a/chrome/browser/extensions/blacklist.cc
+++ b/chrome/browser/extensions/blacklist.cc
@@ -142,11 +142,11 @@ Blacklist::ScopedDatabaseManagerForTest::~ScopedDatabaseManagerForTest() {
 Blacklist::Blacklist(ExtensionPrefs* prefs) : prefs_(prefs) {
   scoped_refptr<SafeBrowsingDatabaseManager> database_manager =
       g_database_manager.Get().get();
-  if (database_manager) {
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE,
-                   content::Source<SafeBrowsingDatabaseManager>(
-                        database_manager));
+  if (database_manager.get()) {
+    registrar_.Add(
+        this,
+        chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE,
+        content::Source<SafeBrowsingDatabaseManager>(database_manager.get()));
   }
 
   // TODO(kalman): Delete anything from the pref blacklist that is in the
diff --git a/chrome/browser/extensions/blacklist_unittest.cc b/chrome/browser/extensions/blacklist_unittest.cc
index dc8f58a..953f9a1 100644
--- a/chrome/browser/extensions/blacklist_unittest.cc
+++ b/chrome/browser/extensions/blacklist_unittest.cc
@@ -57,10 +57,10 @@ TEST_F(BlacklistTest, SetFromUpdater) {
   prefs_.prefs()->SetExtensionBlacklisted(extension_c->id(), true);
   prefs_.prefs()->SetExtensionBlacklisted(extension_d->id(), true);
 
-  EXPECT_FALSE(IsBlacklisted(extension_a));
-  EXPECT_FALSE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsBlacklisted(extension_c));
-  EXPECT_TRUE(IsBlacklisted(extension_d));
+  EXPECT_FALSE(IsBlacklisted(extension_a.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_c.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_d.get()));
 
   // Mix up the blacklist.
   {
@@ -69,10 +69,10 @@ TEST_F(BlacklistTest, SetFromUpdater) {
     blacklist.push_back(extension_c->id());
     blacklist_.SetFromUpdater(blacklist, "1");
   }
-  EXPECT_FALSE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsBlacklisted(extension_c));
-  EXPECT_FALSE(IsBlacklisted(extension_d));
+  EXPECT_FALSE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_c.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_d.get()));
 
   // No-op, just in case.
   {
@@ -81,10 +81,10 @@ TEST_F(BlacklistTest, SetFromUpdater) {
     blacklist.push_back(extension_c->id());
     blacklist_.SetFromUpdater(blacklist, "2");
   }
-  EXPECT_FALSE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsBlacklisted(extension_c));
-  EXPECT_FALSE(IsBlacklisted(extension_d));
+  EXPECT_FALSE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_c.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_d.get()));
 
   // Strictly increase the blacklist.
   {
@@ -95,10 +95,10 @@ TEST_F(BlacklistTest, SetFromUpdater) {
     blacklist.push_back(extension_d->id());
     blacklist_.SetFromUpdater(blacklist, "3");
   }
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsBlacklisted(extension_c));
-  EXPECT_TRUE(IsBlacklisted(extension_d));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_c.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_d.get()));
 
   // Strictly decrease the blacklist.
   {
@@ -107,20 +107,20 @@ TEST_F(BlacklistTest, SetFromUpdater) {
     blacklist.push_back(extension_b->id());
     blacklist_.SetFromUpdater(blacklist, "4");
   }
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_FALSE(IsBlacklisted(extension_c));
-  EXPECT_FALSE(IsBlacklisted(extension_d));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_c.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_d.get()));
 
   // Clear the blacklist.
   {
     std::vector<std::string> blacklist;
     blacklist_.SetFromUpdater(blacklist, "5");
   }
-  EXPECT_FALSE(IsBlacklisted(extension_a));
-  EXPECT_FALSE(IsBlacklisted(extension_b));
-  EXPECT_FALSE(IsBlacklisted(extension_c));
-  EXPECT_FALSE(IsBlacklisted(extension_d));
+  EXPECT_FALSE(IsBlacklisted(extension_a.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_b.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_c.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_d.get()));
 }
 
 void Assign(std::set<std::string> *to, const std::set<std::string>& from) {
@@ -171,21 +171,21 @@ TEST_F(BlacklistTest, PrefsVsSafeBrowsing) {
   }
 
   // The manager is still disabled at this point, so c won't be blacklisted.
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_FALSE(IsBlacklisted(extension_c));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_c.get()));
 
   // Now it should be.
   safe_browsing_database_manager_->set_enabled(true);
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsBlacklisted(extension_c));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_c.get()));
 
   // Corner case: nothing in safebrowsing (but still enabled).
   safe_browsing_database_manager_->set_unsafe_ids(std::set<std::string>());
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_FALSE(IsBlacklisted(extension_c));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_FALSE(IsBlacklisted(extension_c.get()));
 
   // Corner case: nothing in prefs.
   prefs_.prefs()->SetExtensionBlacklisted(extension_a->id(), false);
@@ -196,9 +196,9 @@ TEST_F(BlacklistTest, PrefsVsSafeBrowsing) {
     bc.insert(extension_c->id());
     safe_browsing_database_manager_->set_unsafe_ids(bc);
   }
-  EXPECT_FALSE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsBlacklisted(extension_c));
+  EXPECT_FALSE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_c.get()));
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc b/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc
index 6fef348..b3088d0 100644
--- a/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc
+++ b/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc
@@ -73,14 +73,14 @@ TEST_F(BrowserPermissionsPolicyDelegateTest, CanExecuteScriptOnPage) {
 
   // The same call should succeed with a normal process, but fail with a signin
   // process.
-  EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(extension,
+  EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(extension.get(),
                                                       kSigninUrl,
                                                       kSigninUrl,
                                                       -1,
                                                       NULL,
                                                       normal_process.GetID(),
                                                       &error)) << error;
-  EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(extension,
+  EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(extension.get(),
                                                        kSigninUrl,
                                                        kSigninUrl,
                                                        -1,
diff --git a/chrome/browser/extensions/bundle_installer.cc b/chrome/browser/extensions/bundle_installer.cc
index c5db010..db7057a 100644
--- a/chrome/browser/extensions/bundle_installer.cc
+++ b/chrome/browser/extensions/bundle_installer.cc
@@ -261,8 +261,8 @@ void BundleInstaller::ShowPrompt() {
   scoped_refptr<PermissionSet> permissions;
   for (size_t i = 0; i < dummy_extensions_.size(); ++i) {
     permissions = PermissionSet::CreateUnion(
-        permissions,
-        PermissionsData::GetRequiredPermissions(dummy_extensions_[i]));
+        permissions.get(),
+        PermissionsData::GetRequiredPermissions(dummy_extensions_[i].get()));
   }
 
   if (g_auto_approve_for_test == PROCEED) {
@@ -280,7 +280,7 @@ void BundleInstaller::ShowPrompt() {
     if (browser)
       web_contents = browser->tab_strip_model()->GetActiveWebContents();
     install_ui_.reset(new ExtensionInstallPrompt(web_contents));
-    install_ui_->ConfirmBundleInstall(this, permissions);
+    install_ui_->ConfirmBundleInstall(this, permissions.get());
   }
 }
 
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index b7e6a0f..7194f45 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -186,13 +186,13 @@ void ComponentLoader::Load(const ComponentExtensionInfo& info) {
       *info.manifest,
       flags,
       &error));
-  if (!extension) {
+  if (!extension.get()) {
     LOG(ERROR) << error;
     return;
   }
 
   CHECK_EQ(info.extension_id, extension->id()) << extension->name();
-  extension_service_->AddComponentExtension(extension);
+  extension_service_->AddComponentExtension(extension.get());
 }
 
 void ComponentLoader::RemoveAll() {
diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc
index de4a2b5..6f3b451 100644
--- a/chrome/browser/extensions/convert_user_script.cc
+++ b/chrome/browser/extensions/convert_user_script.cc
@@ -180,7 +180,7 @@ scoped_refptr<Extension> ConvertUserScriptToExtension(
       Extension::NO_FLAGS,
       &utf8_error);
   *error = UTF8ToUTF16(utf8_error);
-  if (!extension) {
+  if (!extension.get()) {
     NOTREACHED() << "Could not init extension " << *error;
     return NULL;
   }
diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc
index 506b3cb..1e1fa3a 100644
--- a/chrome/browser/extensions/convert_user_script_unittest.cc
+++ b/chrome/browser/extensions/convert_user_script_unittest.cc
@@ -61,9 +61,9 @@ TEST_F(ExtensionFromUserScript, Basic) {
             extension->public_key());
   EXPECT_EQ(Manifest::TYPE_USER_SCRIPT, extension->GetType());
 
-  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
   const UserScript& script =
-      ContentScriptsInfo::GetContentScripts(extension)[0];
+      ContentScriptsInfo::GetContentScripts(extension.get())[0];
   EXPECT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
   ASSERT_EQ(2u, script.globs().size());
   EXPECT_EQ("http://www.google.com/*", script.globs().at(0));
@@ -114,9 +114,9 @@ TEST_F(ExtensionFromUserScript, NoMetadata) {
             extension->public_key());
   EXPECT_EQ(Manifest::TYPE_USER_SCRIPT, extension->GetType());
 
-  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
   const UserScript& script =
-      ContentScriptsInfo::GetContentScripts(extension)[0];
+      ContentScriptsInfo::GetContentScripts(extension.get())[0];
   ASSERT_EQ(1u, script.globs().size());
   EXPECT_EQ("*", script.globs()[0]);
   EXPECT_EQ(0u, script.exclude_globs().size());
@@ -181,9 +181,9 @@ TEST_F(ExtensionFromUserScript, RunAtDocumentStart) {
   EXPECT_EQ(Manifest::TYPE_USER_SCRIPT, extension->GetType());
 
   // Validate run location.
-  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
   const UserScript& script =
-      ContentScriptsInfo::GetContentScripts(extension)[0];
+      ContentScriptsInfo::GetContentScripts(extension.get())[0];
   EXPECT_EQ(UserScript::DOCUMENT_START, script.run_location());
 }
 
@@ -216,9 +216,9 @@ TEST_F(ExtensionFromUserScript, RunAtDocumentEnd) {
   EXPECT_EQ(Manifest::TYPE_USER_SCRIPT, extension->GetType());
 
   // Validate run location.
-  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
   const UserScript& script =
-      ContentScriptsInfo::GetContentScripts(extension)[0];
+      ContentScriptsInfo::GetContentScripts(extension.get())[0];
   EXPECT_EQ(UserScript::DOCUMENT_END, script.run_location());
 }
 
@@ -252,9 +252,9 @@ TEST_F(ExtensionFromUserScript, RunAtDocumentIdle) {
   EXPECT_EQ(Manifest::TYPE_USER_SCRIPT, extension->GetType());
 
   // Validate run location.
-  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
   const UserScript& script =
-      ContentScriptsInfo::GetContentScripts(extension)[0];
+      ContentScriptsInfo::GetContentScripts(extension.get())[0];
   EXPECT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
 }
 
diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc
index bc8e335..2406512 100644
--- a/chrome/browser/extensions/convert_web_app.cc
+++ b/chrome/browser/extensions/convert_web_app.cc
@@ -190,7 +190,7 @@ scoped_refptr<Extension> ConvertWebAppToExtension(
       *root,
       extension_flags,
       &error);
-  if (!extension) {
+  if (!extension.get()) {
     LOG(ERROR) << error;
     return NULL;
   }
diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc
index c2e56dc..dba15f8 100644
--- a/chrome/browser/extensions/convert_web_app_unittest.cc
+++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -138,13 +138,16 @@ TEST(ExtensionFromWebApp, Basic) {
   EXPECT_EQ("http://aaronboodman.com/gearpad/*",
             extension->web_extent().patterns().begin()->GetAsString());
 
-  EXPECT_EQ(web_app.icons.size(), IconsInfo::GetIcons(extension).map().size());
+  EXPECT_EQ(web_app.icons.size(),
+            IconsInfo::GetIcons(extension.get()).map().size());
   for (size_t i = 0; i < web_app.icons.size(); ++i) {
     EXPECT_EQ(base::StringPrintf("icons/%i.png", web_app.icons[i].width),
-              IconsInfo::GetIcons(extension).Get(
+              IconsInfo::GetIcons(extension.get()).Get(
                   web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY));
-    ExtensionResource resource = IconsInfo::GetIconResource(
-        extension, web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY);
+    ExtensionResource resource =
+        IconsInfo::GetIconResource(extension.get(),
+                                   web_app.icons[i].width,
+                                   ExtensionIconSet::MATCH_EXACTLY);
     ASSERT_TRUE(!resource.empty());
     EXPECT_TRUE(file_util::PathExists(resource.GetFilePath()));
   }
@@ -178,7 +181,7 @@ TEST(ExtensionFromWebApp, Minimal) {
   EXPECT_EQ(UTF16ToUTF8(web_app.title), extension->name());
   EXPECT_EQ("", extension->description());
   EXPECT_EQ(web_app.app_url, extension->GetFullLaunchURL());
-  EXPECT_EQ(0u, IconsInfo::GetIcons(extension).map().size());
+  EXPECT_EQ(0u, IconsInfo::GetIcons(extension.get()).map().size());
   EXPECT_EQ(0u, extension->GetActivePermissions()->apis().size());
   ASSERT_EQ(1u, extension->web_extent().patterns().size());
   EXPECT_EQ("*://aaronboodman.com/*",
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index a776821..aa6e3ea 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -143,14 +143,13 @@ void CrxInstaller::InstallCrx(const base::FilePath& source_file) {
   source_file_ = source_file;
 
   scoped_refptr<SandboxedUnpacker> unpacker(
-      new SandboxedUnpacker(
-          source_file,
-          content::ResourceDispatcherHost::Get() != NULL,
-          install_source_,
-          creation_flags_,
-          install_directory_,
-          installer_task_runner_,
-          this));
+      new SandboxedUnpacker(source_file,
+                            content::ResourceDispatcherHost::Get() != NULL,
+                            install_source_,
+                            creation_flags_,
+                            install_directory_,
+                            installer_task_runner_.get(),
+                            this));
 
   if (!installer_task_runner_->PostTask(
           FROM_HERE,
@@ -175,12 +174,12 @@ void CrxInstaller::ConvertUserScriptOnFileThread() {
   string16 error;
   scoped_refptr<Extension> extension = ConvertUserScriptToExtension(
       source_file_, download_url_, install_directory_, &error);
-  if (!extension) {
+  if (!extension.get()) {
     ReportFailureFromFileThread(CrxInstallerError(error));
     return;
   }
 
-  OnUnpackSuccess(extension->path(), extension->path(), NULL, extension);
+  OnUnpackSuccess(extension->path(), extension->path(), NULL, extension.get());
 }
 
 void CrxInstaller::InstallWebApp(const WebApplicationInfo& web_app) {
@@ -199,7 +198,7 @@ void CrxInstaller::ConvertWebAppOnFileThread(
   string16 error;
   scoped_refptr<Extension> extension(
       ConvertWebAppToExtension(web_app, base::Time::Now(), install_directory));
-  if (!extension) {
+  if (!extension.get()) {
     // Validation should have stopped any potential errors before getting here.
     NOTREACHED() << "Could not convert web app to extension.";
     return;
@@ -207,7 +206,7 @@ void CrxInstaller::ConvertWebAppOnFileThread(
 
   // TODO(aa): conversion data gets lost here :(
 
-  OnUnpackSuccess(extension->path(), extension->path(), NULL, extension);
+  OnUnpackSuccess(extension->path(), extension->path(), NULL, extension.get());
 }
 
 CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) {
diff --git a/chrome/browser/extensions/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc
index e8172f7..495c419 100644
--- a/chrome/browser/extensions/event_router_forwarder_unittest.cc
+++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc
@@ -128,10 +128,10 @@ TEST_F(EventRouterForwarderTest, BroadcastRendererUI) {
   scoped_refptr<MockEventRouterForwarder> event_router(
       new MockEventRouterForwarder);
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, "", kEventName, profile1_, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, "", kEventName, profile2_, url));
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, "", kEventName, profile1_, url));
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile2_, "", kEventName, profile2_, url));
   BroadcastEventToRenderers(event_router.get(), kEventName, url);
 }
 
@@ -141,12 +141,12 @@ TEST_F(EventRouterForwarderTest, BroadcastRendererUIIncognito) {
   using ::testing::_;
   GURL url;
   Profile* incognito = CreateIncognitoProfile(profile1_);
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, "", kEventName, profile1_, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(incognito, _, _, _, _)).Times(0);
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, "", kEventName, profile2_, url));
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, "", kEventName, profile1_, url));
+  EXPECT_CALL(*event_router.get(), CallEventRouter(incognito, _, _, _, _))
+      .Times(0);
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile2_, "", kEventName, profile2_, url));
   BroadcastEventToRenderers(event_router.get(), kEventName, url);
 }
 
@@ -157,10 +157,10 @@ TEST_F(EventRouterForwarderTest, BroadcastRendererIO) {
   scoped_refptr<MockEventRouterForwarder> event_router(
       new MockEventRouterForwarder);
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, "", kEventName, profile1_, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, "", kEventName, profile2_, url));
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, "", kEventName, profile1_, url));
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile2_, "", kEventName, profile2_, url));
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(
           &BroadcastEventToRenderers, base::Unretained(event_router.get()),
@@ -180,10 +180,10 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIRestricted) {
       new MockEventRouterForwarder);
   using ::testing::_;
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, "", kEventName, profile1_, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, _, _, _, _)).Times(0);
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, "", kEventName, profile1_, url));
+  EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+      .Times(0);
   DispatchEventToRenderers(event_router.get(), kEventName, profile1_, true,
                            url);
 }
@@ -194,12 +194,12 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIRestrictedIncognito1) {
   Profile* incognito = CreateIncognitoProfile(profile1_);
   using ::testing::_;
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, "", kEventName, profile1_, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(incognito, _, _, _, _)).Times(0);
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, _, _, _, _)).Times(0);
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, "", kEventName, profile1_, url));
+  EXPECT_CALL(*event_router.get(), CallEventRouter(incognito, _, _, _, _))
+      .Times(0);
+  EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+      .Times(0);
   DispatchEventToRenderers(event_router.get(), kEventName, profile1_, true,
                            url);
 }
@@ -210,12 +210,12 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIRestrictedIncognito2) {
   Profile* incognito = CreateIncognitoProfile(profile1_);
   using ::testing::_;
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, _, _, _, _)).Times(0);
-  EXPECT_CALL(*event_router,
-      CallEventRouter(incognito, "", kEventName, incognito, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, _, _, _, _)).Times(0);
+  EXPECT_CALL(*event_router.get(), CallEventRouter(profile1_, _, _, _, _))
+      .Times(0);
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(incognito, "", kEventName, incognito, url));
+  EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+      .Times(0);
   DispatchEventToRenderers(event_router.get(), kEventName, incognito, true,
                            url);
 }
@@ -225,10 +225,10 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIUnrestricted) {
       new MockEventRouterForwarder);
   using ::testing::_;
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, "", kEventName, NULL, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, _, _, _, _)).Times(0);
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, "", kEventName, NULL, url));
+  EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+      .Times(0);
   DispatchEventToRenderers(event_router.get(), kEventName, profile1_, false,
                            url);
 }
@@ -239,12 +239,12 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIUnrestrictedIncognito) {
   Profile* incognito = CreateIncognitoProfile(profile1_);
   using ::testing::_;
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, "", kEventName, NULL, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(incognito, _, _, _, _)).Times(0);
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, _, _, _, _)).Times(0);
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, "", kEventName, NULL, url));
+  EXPECT_CALL(*event_router.get(), CallEventRouter(incognito, _, _, _, _))
+      .Times(0);
+  EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+      .Times(0);
   DispatchEventToRenderers(event_router.get(), kEventName, profile1_, false,
                            url);
 }
@@ -253,10 +253,10 @@ TEST_F(EventRouterForwarderTest, BroadcastExtensionUI) {
   scoped_refptr<MockEventRouterForwarder> event_router(
       new MockEventRouterForwarder);
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, kExt, kEventName, profile1_, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, kExt, kEventName, profile2_, url));
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, kExt, kEventName, profile1_, url));
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile2_, kExt, kEventName, profile2_, url));
   BroadcastEventToExtension(event_router.get(), kExt, kEventName, url);
 }
 
@@ -265,10 +265,10 @@ TEST_F(EventRouterForwarderTest, UnicastExtensionUIRestricted) {
       new MockEventRouterForwarder);
   using ::testing::_;
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, kExt, kEventName, profile1_, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, _, _, _, _)).Times(0);
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, kExt, kEventName, profile1_, url));
+  EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+      .Times(0);
   DispatchEventToExtension(event_router.get(), kExt, kEventName, profile1_,
                            true, url);
 }
@@ -278,10 +278,10 @@ TEST_F(EventRouterForwarderTest, UnicastExtensionUIUnrestricted) {
       new MockEventRouterForwarder);
   using ::testing::_;
   GURL url;
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile1_, kExt, kEventName, NULL, url));
-  EXPECT_CALL(*event_router,
-      CallEventRouter(profile2_, _, _, _, _)).Times(0);
+  EXPECT_CALL(*event_router.get(),
+              CallEventRouter(profile1_, kExt, kEventName, NULL, url));
+  EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+      .Times(0);
   DispatchEventToExtension(event_router.get(), kExt, kEventName, profile1_,
                            false, url);
 }
diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
index 0e42893..5e9d952 100644
--- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
+++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
@@ -125,9 +125,9 @@ class ExtensionActionIconFactoryTest
     scoped_refptr<Extension> extension =
         Extension::Create(test_file, location, *valid_value,
                           Extension::NO_FLAGS, &error);
-    EXPECT_TRUE(extension) << error;
-    if (extension)
-      extension_service_->AddExtension(extension);
+    EXPECT_TRUE(extension.get()) << error;
+    if (extension.get())
+      extension_service_->AddExtension(extension.get());
     return extension;
   }
 
@@ -190,7 +190,7 @@ TEST_F(ExtensionActionIconFactoryTest, NoIcons) {
   scoped_refptr<Extension> extension(CreateExtension(
       "browser_action/no_icon", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
-  ExtensionAction* browser_action = GetBrowserAction(*extension);
+  ExtensionAction* browser_action = GetBrowserAction(*extension.get());
   ASSERT_TRUE(browser_action);
   ASSERT_FALSE(browser_action->default_icon());
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
@@ -198,7 +198,7 @@ TEST_F(ExtensionActionIconFactoryTest, NoIcons) {
   gfx::ImageSkia favicon = GetFavicon();
 
   ExtensionActionIconFactory icon_factory(
-      profile(), extension,browser_action, this);
+      profile(), extension.get(), browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
@@ -216,7 +216,7 @@ TEST_F(ExtensionActionIconFactoryTest, AfterSetIcon) {
   scoped_refptr<Extension> extension(CreateExtension(
       "browser_action/no_icon", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
-  ExtensionAction* browser_action = GetBrowserAction(*extension);
+  ExtensionAction* browser_action = GetBrowserAction(*extension.get());
   ASSERT_TRUE(browser_action);
   ASSERT_FALSE(browser_action->default_icon());
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
@@ -229,7 +229,7 @@ TEST_F(ExtensionActionIconFactoryTest, AfterSetIcon) {
   ASSERT_FALSE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
 
   ExtensionActionIconFactory icon_factory(
-      profile(), extension, browser_action, this);
+      profile(), extension.get(), browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
@@ -254,7 +254,7 @@ TEST_F(ExtensionActionIconFactoryTest, DefaultIcon) {
   scoped_refptr<Extension> extension(CreateExtension(
       "browser_action/no_icon", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
-  ExtensionAction* browser_action = GetBrowserAction(*extension);
+  ExtensionAction* browser_action = GetBrowserAction(*extension.get());
   ASSERT_TRUE(browser_action);
   ASSERT_FALSE(browser_action->default_icon());
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
@@ -270,7 +270,7 @@ TEST_F(ExtensionActionIconFactoryTest, DefaultIcon) {
   ASSERT_TRUE(browser_action->default_icon());
 
   ExtensionActionIconFactory icon_factory(
-      profile(), extension, browser_action, this);
+      profile(), extension.get(), browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
diff --git a/chrome/browser/extensions/extension_blacklist_browsertest.cc b/chrome/browser/extensions/extension_blacklist_browsertest.cc
index dcdfb17..5172a67 100644
--- a/chrome/browser/extensions/extension_blacklist_browsertest.cc
+++ b/chrome/browser/extensions/extension_blacklist_browsertest.cc
@@ -260,8 +260,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
       chrome::NOTIFICATION_EXTENSION_INSTALLED,
       chrome::NOTIFICATION_EXTENSION_LOADED));
 
-  ASSERT_TRUE(extension_a);
-  ASSERT_TRUE(extension_b);
+  ASSERT_TRUE(extension_a.get());
+  ASSERT_TRUE(extension_b.get());
   ASSERT_EQ(info_a_.id(), extension_a->id());
   ASSERT_EQ(info_b_.id(), extension_b->id());
   ASSERT_EQ(info_c_.id(), extension_c->id());
@@ -278,17 +278,17 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
   vector_abc.push_back(info_b_.id());
   vector_abc.push_back(info_c_.id());
 
-  EXPECT_TRUE(IsSafe(extension_a));
-  EXPECT_TRUE(IsSafe(extension_b));
-  EXPECT_TRUE(IsSafe(extension_c));
+  EXPECT_TRUE(IsSafe(extension_a.get()));
+  EXPECT_TRUE(IsSafe(extension_b.get()));
+  EXPECT_TRUE(IsSafe(extension_c.get()));
 
   // Blacklist a and b.
   blacklist()->SetFromUpdater(vector_ab, "1");
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsSafe(extension_c));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsSafe(extension_c.get()));
   EXPECT_TRUE(notifications.CheckNotifications(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       chrome::NOTIFICATION_EXTENSION_UNLOADED));
@@ -297,28 +297,28 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
   blacklist()->SetFromUpdater(vector_b, "2");
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_TRUE(IsSafe(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsSafe(extension_c));
-  EXPECT_TRUE(notifications.CheckNotifications(
-      chrome::NOTIFICATION_EXTENSION_LOADED));
+  EXPECT_TRUE(IsSafe(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsSafe(extension_c.get()));
+  EXPECT_TRUE(
+      notifications.CheckNotifications(chrome::NOTIFICATION_EXTENSION_LOADED));
 
   // Blacklist a then switch with c.
   blacklist()->SetFromUpdater(vector_ab, "3");
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsSafe(extension_c));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsSafe(extension_c.get()));
   EXPECT_TRUE(notifications.CheckNotifications(
       chrome::NOTIFICATION_EXTENSION_UNLOADED));
 
   blacklist()->SetFromUpdater(vector_bc, "4");
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_TRUE(IsSafe(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsBlacklisted(extension_c));
+  EXPECT_TRUE(IsSafe(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_c.get()));
   EXPECT_TRUE(notifications.CheckNotifications(
       chrome::NOTIFICATION_EXTENSION_LOADED,
       chrome::NOTIFICATION_EXTENSION_UNLOADED));
@@ -327,9 +327,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
   blacklist()->SetFromUpdater(vector_abc, "5");
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsBlacklisted(extension_c));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_c.get()));
   EXPECT_TRUE(notifications.CheckNotifications(
       chrome::NOTIFICATION_EXTENSION_UNLOADED));
 
@@ -337,21 +337,21 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, PRE_Blacklist) {
   blacklist()->SetFromUpdater(empty_vector, "6");
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_TRUE(IsSafe(extension_a));
-  EXPECT_TRUE(IsSafe(extension_b));
-  EXPECT_TRUE(IsSafe(extension_c));
-  EXPECT_TRUE(notifications.CheckNotifications(
-      chrome::NOTIFICATION_EXTENSION_LOADED,
-      chrome::NOTIFICATION_EXTENSION_LOADED,
-      chrome::NOTIFICATION_EXTENSION_LOADED));
+  EXPECT_TRUE(IsSafe(extension_a.get()));
+  EXPECT_TRUE(IsSafe(extension_b.get()));
+  EXPECT_TRUE(IsSafe(extension_c.get()));
+  EXPECT_TRUE(
+      notifications.CheckNotifications(chrome::NOTIFICATION_EXTENSION_LOADED,
+                                       chrome::NOTIFICATION_EXTENSION_LOADED,
+                                       chrome::NOTIFICATION_EXTENSION_LOADED));
 
   // Add a and b back again for the next test.
   blacklist()->SetFromUpdater(vector_ab, "7");
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsSafe(extension_c));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsSafe(extension_c.get()));
   EXPECT_TRUE(notifications.CheckNotifications(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       chrome::NOTIFICATION_EXTENSION_UNLOADED));
@@ -365,19 +365,19 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, Blacklist) {
 
   scoped_refptr<const Extension> extension_a =
       extension_service()->blacklisted_extensions()->GetByID(info_a_.id());
-  ASSERT_TRUE(extension_a);
+  ASSERT_TRUE(extension_a.get());
 
   scoped_refptr<const Extension> extension_b =
       extension_service()->blacklisted_extensions()->GetByID(info_b_.id());
-  ASSERT_TRUE(extension_b);
+  ASSERT_TRUE(extension_b.get());
 
   scoped_refptr<const Extension> extension_c =
       extension_service()->extensions()->GetByID(info_c_.id());
-  ASSERT_TRUE(extension_c);
+  ASSERT_TRUE(extension_c.get());
 
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsBlacklisted(extension_b));
-  EXPECT_TRUE(IsSafe(extension_c));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_b.get()));
+  EXPECT_TRUE(IsSafe(extension_c.get()));
 
   // Make sure that we can still blacklist c and unblacklist b.
   std::vector<std::string> vector_ac(1, extension_a->id());
@@ -385,12 +385,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBlacklistBrowserTest, Blacklist) {
   blacklist()->SetFromUpdater(vector_ac, "8");
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_TRUE(IsBlacklisted(extension_a));
-  EXPECT_TRUE(IsSafe(extension_b));
-  EXPECT_TRUE(IsBlacklisted(extension_c));
+  EXPECT_TRUE(IsBlacklisted(extension_a.get()));
+  EXPECT_TRUE(IsSafe(extension_b.get()));
+  EXPECT_TRUE(IsBlacklisted(extension_c.get()));
   EXPECT_TRUE(notifications.CheckNotifications(
-        chrome::NOTIFICATION_EXTENSION_LOADED,
-        chrome::NOTIFICATION_EXTENSION_UNLOADED));
+      chrome::NOTIFICATION_EXTENSION_LOADED,
+      chrome::NOTIFICATION_EXTENSION_UNLOADED));
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
index 3098f6d..9aa6929 100644
--- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc
+++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -35,8 +35,8 @@ TEST_F(ExtensionContextMenuModelTest, PolicyDisablesItems) {
                    .Set("page_action", DictionaryBuilder()
                         .Set("default_title", "Hello")))
       .Build();
-  ASSERT_TRUE(extension);
-  service_->AddExtension(extension);
+  ASSERT_TRUE(extension.get());
+  service_->AddExtension(extension.get());
 
   // Create a Browser for the ExtensionContextMenuModel to use.
   Browser::CreateParams params(profile_.get(),
@@ -46,7 +46,7 @@ TEST_F(ExtensionContextMenuModelTest, PolicyDisablesItems) {
   Browser browser(params);
 
   scoped_refptr<ExtensionContextMenuModel> menu(
-      new ExtensionContextMenuModel(extension, &browser, NULL));
+      new ExtensionContextMenuModel(extension.get(), &browser, NULL));
 
   extensions::ExtensionSystem* system =
       extensions::ExtensionSystem::Get(profile_.get());
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 1f6a8fa..a7b3524 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -258,7 +258,7 @@ void ExtensionFunctionDispatcher::DispatchOnIOThread(
                               profile, callback));
   scoped_ptr<ListValue> args(params.arguments.DeepCopy());
 
-  if (!function) {
+  if (!function.get()) {
     LogFailure(extension,
                params.name,
                args.Pass(),
@@ -278,7 +278,7 @@ void ExtensionFunctionDispatcher::DispatchOnIOThread(
   function->set_include_incognito(
       extension_info_map->IsIncognitoEnabled(extension->id()));
 
-  if (!CheckPermissions(function, extension, params, callback)) {
+  if (!CheckPermissions(function.get(), extension, params, callback)) {
     LogFailure(extension,
                params.name,
                args.Pass(),
@@ -289,7 +289,7 @@ void ExtensionFunctionDispatcher::DispatchOnIOThread(
 
   ExtensionsQuotaService* quota = extension_info_map->GetQuotaService();
   std::string violation_error = quota->Assess(extension->id(),
-                                              function,
+                                              function.get(),
                                               &params.arguments,
                                               base::TimeTicks::Now());
   if (violation_error.empty()) {
@@ -363,7 +363,7 @@ void ExtensionFunctionDispatcher::DispatchWithCallback(
                               profile(), callback));
   scoped_ptr<ListValue> args(params.arguments.DeepCopy());
 
-  if (!function) {
+  if (!function.get()) {
     LogFailure(extension,
                params.name,
                args.Pass(),
@@ -383,7 +383,7 @@ void ExtensionFunctionDispatcher::DispatchWithCallback(
   function_ui->set_profile(profile_);
   function->set_include_incognito(service->CanCrossIncognito(extension));
 
-  if (!CheckPermissions(function, extension, params, callback)) {
+  if (!CheckPermissions(function.get(), extension, params, callback)) {
     LogFailure(extension,
                params.name,
                args.Pass(),
@@ -394,7 +394,7 @@ void ExtensionFunctionDispatcher::DispatchWithCallback(
 
   ExtensionsQuotaService* quota = service->quota_service();
   std::string violation_error = quota->Assess(extension->id(),
-                                              function,
+                                              function.get(),
                                               &params.arguments,
                                               base::TimeTicks::Now());
   if (violation_error.empty()) {
diff --git a/chrome/browser/extensions/extension_icon_image_unittest.cc b/chrome/browser/extensions/extension_icon_image_unittest.cc
index f6bee7f..13706bd 100644
--- a/chrome/browser/extensions/extension_icon_image_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_image_unittest.cc
@@ -219,21 +219,21 @@ TEST_F(ExtensionIconImageTest, Basic) {
 
   // Load images we expect to find as representations in icon_image, so we
   // can later use them to validate icon_image.
-  SkBitmap bitmap_16 =
-      GetTestBitmap(extension, "16.png", 16);
+  SkBitmap bitmap_16 = GetTestBitmap(extension.get(), "16.png", 16);
   ASSERT_FALSE(bitmap_16.empty());
 
   // There is no image of size 32 defined in the extension manifest, so we
   // should expect manifest image of size 48 resized to size 32.
   SkBitmap bitmap_48_resized_to_32 =
-      GetTestBitmap(extension, "48.png", 32);
+      GetTestBitmap(extension.get(), "48.png", 32);
   ASSERT_FALSE(bitmap_48_resized_to_32.empty());
 
   IconImage image(profile.get(),
-                  extension,
-                  extensions::IconsInfo::GetIcons(extension),
+                  extension.get(),
+                  extensions::IconsInfo::GetIcons(extension.get()),
                   16,
-                  default_icon, this);
+                  default_icon,
+                  this);
 
   // No representations in |image_| yet.
   gfx::ImageSkia::ImageSkiaReps image_reps = image.image_skia().image_reps();
@@ -290,15 +290,15 @@ TEST_F(ExtensionIconImageTest, FallbackToSmallerWhenNoBigger) {
 
   // Load images we expect to find as representations in icon_image, so we
   // can later use them to validate icon_image.
-  SkBitmap bitmap_48 =
-      GetTestBitmap(extension, "48.png", 48);
+  SkBitmap bitmap_48 = GetTestBitmap(extension.get(), "48.png", 48);
   ASSERT_FALSE(bitmap_48.empty());
 
   IconImage image(profile.get(),
-                  extension,
-                  extensions::IconsInfo::GetIcons(extension),
+                  extension.get(),
+                  extensions::IconsInfo::GetIcons(extension.get()),
                   32,
-                  default_icon, this);
+                  default_icon,
+                  this);
 
   gfx::ImageSkiaRep representation =
       image.image_skia().GetRepresentation(ui::SCALE_FACTOR_200P);
@@ -330,15 +330,15 @@ TEST_F(ExtensionIconImageTest, FallbackToSmaller) {
 
   // Load images we expect to find as representations in icon_image, so we
   // can later use them to validate icon_image.
-  SkBitmap bitmap_16 =
-      GetTestBitmap(extension, "16.png", 16);
+  SkBitmap bitmap_16 = GetTestBitmap(extension.get(), "16.png", 16);
   ASSERT_FALSE(bitmap_16.empty());
 
   IconImage image(profile.get(),
-                  extension,
-                  extensions::IconsInfo::GetIcons(extension),
+                  extension.get(),
+                  extensions::IconsInfo::GetIcons(extension.get()),
                   17,
-                  default_icon, this);
+                  default_icon,
+                  this);
 
   gfx::ImageSkiaRep representation =
       image.image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
@@ -368,8 +368,12 @@ TEST_F(ExtensionIconImageTest, NoResources) {
   gfx::ImageSkia default_icon = GetDefaultIcon();
 
   const int kRequestedSize = 24;
-  IconImage image(profile.get(), extension, empty_icon_set, kRequestedSize,
-                  default_icon, this);
+  IconImage image(profile.get(),
+                  extension.get(),
+                  empty_icon_set,
+                  kRequestedSize,
+                  default_icon,
+                  this);
 
   gfx::ImageSkiaRep representation =
       image.image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
@@ -406,8 +410,12 @@ TEST_F(ExtensionIconImageTest, InvalidResource) {
 
   gfx::ImageSkia default_icon = GetDefaultIcon();
 
-  IconImage image(profile.get(), extension, invalid_icon_set, kInvalidIconSize,
-                  default_icon, this);
+  IconImage image(profile.get(),
+                  extension.get(),
+                  invalid_icon_set,
+                  kInvalidIconSize,
+                  default_icon,
+                  this);
 
   gfx::ImageSkiaRep representation =
       image.image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
@@ -443,8 +451,12 @@ TEST_F(ExtensionIconImageTest, LazyDefaultIcon) {
   ExtensionIconSet empty_icon_set;
 
   const int kRequestedSize = 128;
-  IconImage image(profile.get(), extension, empty_icon_set, kRequestedSize,
-                  lazy_default_icon, this);
+  IconImage image(profile.get(),
+                  extension.get(),
+                  empty_icon_set,
+                  kRequestedSize,
+                  lazy_default_icon,
+                  this);
 
   ASSERT_FALSE(lazy_default_icon.HasRepresentation(ui::SCALE_FACTOR_100P));
 
@@ -479,8 +491,12 @@ TEST_F(ExtensionIconImageTest, LazyDefaultIcon_AsyncIconImage) {
   ExtensionIconSet invalid_icon_set;
   invalid_icon_set.Add(kInvalidIconSize, "invalid.png");
 
-  IconImage image(profile.get(), extension, invalid_icon_set, kInvalidIconSize,
-                  lazy_default_icon, this);
+  IconImage image(profile.get(),
+                  extension.get(),
+                  invalid_icon_set,
+                  kInvalidIconSize,
+                  lazy_default_icon,
+                  this);
 
   ASSERT_FALSE(lazy_default_icon.HasRepresentation(ui::SCALE_FACTOR_100P));
 
@@ -516,16 +532,16 @@ TEST_F(ExtensionIconImageTest, IconImageDestruction) {
 
   // Load images we expect to find as representations in icon_image, so we
   // can later use them to validate icon_image.
-  SkBitmap bitmap_16 =
-      GetTestBitmap(extension, "16.png", 16);
+  SkBitmap bitmap_16 = GetTestBitmap(extension.get(), "16.png", 16);
   ASSERT_FALSE(bitmap_16.empty());
 
   scoped_ptr<IconImage> image(
       new IconImage(profile.get(),
-                    extension,
-                    extensions::IconsInfo::GetIcons(extension),
+                    extension.get(),
+                    extensions::IconsInfo::GetIcons(extension.get()),
                     16,
-                    default_icon, this));
+                    default_icon,
+                    this));
 
   // Load an image representation.
   gfx::ImageSkiaRep representation =
diff --git a/chrome/browser/extensions/extension_info_map_unittest.cc b/chrome/browser/extensions/extension_info_map_unittest.cc
index 9be88c0..3fbefc4 100644
--- a/chrome/browser/extensions/extension_info_map_unittest.cc
+++ b/chrome/browser/extensions/extension_info_map_unittest.cc
@@ -54,7 +54,7 @@ static scoped_refptr<Extension> CreateExtension(const std::string& name) {
   scoped_refptr<Extension> extension = Extension::Create(
       path.AppendASCII(name), Manifest::INVALID_LOCATION, manifest,
       Extension::NO_FLAGS, &error);
-  EXPECT_TRUE(extension) << error;
+  EXPECT_TRUE(extension.get()) << error;
 
   return extension;
 }
@@ -77,7 +77,7 @@ static scoped_refptr<Extension> LoadManifest(const std::string& dir,
       path, Manifest::INVALID_LOCATION,
       *static_cast<DictionaryValue*>(result.get()),
       Extension::NO_FLAGS, &error);
-  EXPECT_TRUE(extension) << error;
+  EXPECT_TRUE(extension.get()) << error;
 
   return extension;
 }
@@ -95,12 +95,12 @@ TEST_F(ExtensionInfoMapTest, RefCounting) {
   EXPECT_TRUE(extension3->HasOneRef());
 
   // Add a ref to each extension and give it to the info map.
-  info_map->AddExtension(extension1, base::Time(), false);
-  info_map->AddExtension(extension2, base::Time(), false);
-  info_map->AddExtension(extension3, base::Time(), false);
+  info_map->AddExtension(extension1.get(), base::Time(), false);
+  info_map->AddExtension(extension2.get(), base::Time(), false);
+  info_map->AddExtension(extension3.get(), base::Time(), false);
 
   // Release extension1, and the info map should have the only ref.
-  const Extension* weak_extension1 = extension1;
+  const Extension* weak_extension1 = extension1.get();
   extension1 = NULL;
   EXPECT_TRUE(weak_extension1->HasOneRef());
 
@@ -121,8 +121,8 @@ TEST_F(ExtensionInfoMapTest, Properties) {
   scoped_refptr<Extension> extension1(CreateExtension("extension1"));
   scoped_refptr<Extension> extension2(CreateExtension("extension2"));
 
-  info_map->AddExtension(extension1, base::Time(), false);
-  info_map->AddExtension(extension2, base::Time(), false);
+  info_map->AddExtension(extension1.get(), base::Time(), false);
+  info_map->AddExtension(extension2.get(), base::Time(), false);
 
   EXPECT_EQ(2u, info_map->extensions().size());
   EXPECT_EQ(extension1.get(), info_map->extensions().GetByID(extension1->id()));
@@ -144,8 +144,8 @@ TEST_F(ExtensionInfoMapTest, CheckPermissions) {
   ASSERT_TRUE(app->is_app());
   ASSERT_TRUE(app->web_extent().MatchesURL(app_url));
 
-  info_map->AddExtension(app, base::Time(), false);
-  info_map->AddExtension(extension, base::Time(), false);
+  info_map->AddExtension(app.get(), base::Time(), false);
+  info_map->AddExtension(extension.get(), base::Time(), false);
 
   // The app should have the notifications permission, either from a
   // chrome-extension URL or from its web extent.
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index b78f4d3..33a5bec 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -678,7 +678,7 @@ void ExtensionInstallPrompt::OnMintTokenFailure(
 }
 
 void ExtensionInstallPrompt::ShowConfirmation() {
-  if (permissions_ &&
+  if (permissions_.get() &&
       (!extension_ ||
        !extensions::PermissionsData::ShouldSkipPermissionWarnings(
            extension_))) {
diff --git a/chrome/browser/extensions/extension_installer.cc b/chrome/browser/extensions/extension_installer.cc
index 4990906..5e3d9b2 100644
--- a/chrome/browser/extensions/extension_installer.cc
+++ b/chrome/browser/extensions/extension_installer.cc
@@ -29,9 +29,8 @@ void ExtensionInstaller::CheckRequirements(
 
 string16 ExtensionInstaller::CheckManagementPolicy() {
   string16 error;
-  bool allowed =
-      ExtensionSystem::Get(profile_)->management_policy()->UserMayLoad(
-          extension_, &error);
+  bool allowed = ExtensionSystem::Get(profile_)->management_policy()
+      ->UserMayLoad(extension_.get(), &error);
   DCHECK(allowed || !error.empty());
   return error;
 }
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 990bb5e..e1298ed 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -65,7 +65,7 @@ void ExtensionPrefsTest::RegisterPreferences(
     user_prefs::PrefRegistrySyncable* registry) {}
 
 void ExtensionPrefsTest::SetUp() {
-  RegisterPreferences(prefs_.pref_registry());
+  RegisterPreferences(prefs_.pref_registry().get());
   Initialize();
 }
 
@@ -74,7 +74,7 @@ void ExtensionPrefsTest::TearDown() {
 
   // Reset ExtensionPrefs, and re-verify.
   prefs_.ResetPrefRegistry();
-  RegisterPreferences(prefs_.pref_registry());
+  RegisterPreferences(prefs_.pref_registry().get());
   prefs_.RecreateExtensionPrefs();
   Verify();
   prefs_.pref_service()->CommitPendingWrite();
@@ -354,13 +354,13 @@ class ExtensionPrefsActivePermissions : public ExtensionPrefsTest {
     EXPECT_EQ(active_perms_->apis(), active->apis());
     EXPECT_EQ(active_perms_->explicit_hosts(), active->explicit_hosts());
     EXPECT_EQ(active_perms_->scriptable_hosts(), active->scriptable_hosts());
-    EXPECT_EQ(*active_perms_, *active);
+    EXPECT_EQ(*active_perms_.get(), *active.get());
   }
 
   virtual void Verify() OVERRIDE {
     scoped_refptr<PermissionSet> permissions(
         prefs()->GetActivePermissions(extension_id_));
-    EXPECT_EQ(*active_perms_, *permissions);
+    EXPECT_EQ(*active_perms_.get(), *permissions.get());
   }
 
  private:
@@ -465,7 +465,7 @@ class ExtensionPrefsDelayedInstallInfo : public ExtensionPrefsTest {
     std::string errors;
     scoped_refptr<Extension> extension = Extension::Create(
         path, Manifest::INTERNAL, manifest, Extension::NO_FLAGS, id, &errors);
-    ASSERT_TRUE(extension) << errors;
+    ASSERT_TRUE(extension.get()) << errors;
     ASSERT_EQ(id, extension->id());
     prefs()->SetDelayedInstallInfo(extension.get(), Extension::ENABLED,
                                    syncer::StringOrdinal());
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index 3ecbc36..e84e305 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -176,7 +176,7 @@ class GeneratedBackgroundPageJob : public net::URLRequestSimpleJob {
 
     *data = "<!DOCTYPE html>\n<body>\n";
     const std::vector<std::string>& background_scripts =
-        extensions::BackgroundInfo::GetBackgroundScripts(extension_);
+        extensions::BackgroundInfo::GetBackgroundScripts(extension_.get());
     for (size_t i = 0; i < background_scripts.size(); ++i) {
       *data += "<script src=\"";
       *data += background_scripts[i];
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index c9075a3..9f70a06 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -89,7 +89,7 @@ class ExtensionProtocolTest : public testing::Test {
         resource_context_.GetRequestContext();
     job_factory_.SetProtocolHandler(
         kExtensionScheme,
-        CreateExtensionProtocolHandler(incognito, extension_info_map_));
+        CreateExtensionProtocolHandler(incognito, extension_info_map_.get()));
     request_context->set_job_factory(&job_factory_);
   }
 
@@ -144,7 +144,7 @@ TEST_F(ExtensionProtocolTest, IncognitoRequest) {
     scoped_refptr<Extension> extension =
         CreateTestExtension(cases[i].name, cases[i].incognito_split_mode);
     extension_info_map_->AddExtension(
-        extension, base::Time::Now(), cases[i].incognito_enabled);
+        extension.get(), base::Time::Now(), cases[i].incognito_enabled);
 
     // First test a main frame request.
     {
@@ -192,8 +192,7 @@ TEST_F(ExtensionProtocolTest, ComponentResourceRequest) {
   SetProtocolHandler(false);
 
   scoped_refptr<Extension> extension = CreateWebStoreExtension();
-  extension_info_map_->AddExtension(
-      extension, base::Time::Now(), false);
+  extension_info_map_->AddExtension(extension.get(), base::Time::Now(), false);
 
   // First test it with the extension enabled.
   {
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index e72d20d..0288d5d 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -666,7 +666,7 @@ bool ExtensionService::UpdateExtension(const std::string& id,
   installer->InstallCrx(extension_path);
 
   if (out_crx_installer)
-    *out_crx_installer = installer;
+    *out_crx_installer = installer.get();
 
   return true;
 }
@@ -744,7 +744,7 @@ bool ExtensionService::UninstallExtension(
   scoped_refptr<const Extension> extension(GetInstalledExtension(extension_id));
 
   // Callers should not send us nonexistent extensions.
-  CHECK(extension);
+  CHECK(extension.get());
 
   // Policy change which triggers an uninstall will always set
   // |external_uninstall| to true so this is the only way to uninstall
@@ -755,28 +755,29 @@ bool ExtensionService::UninstallExtension(
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_UNINSTALL_NOT_ALLOWED,
         content::Source<Profile>(profile_),
-        content::Details<const Extension>(extension));
+        content::Details<const Extension>(extension.get()));
     return false;
   }
 
   // Extract the data we need for sync now, but don't actually sync until we've
   // completed the uninstallation.
   syncer::SyncChange sync_change;
-  if (app_sync_bundle_.HandlesApp(*extension)) {
-    sync_change = app_sync_bundle_.CreateSyncChangeToDelete(extension);
-  } else if (extension_sync_bundle_.HandlesExtension(*extension)) {
-    sync_change = extension_sync_bundle_.CreateSyncChangeToDelete(extension);
+  if (app_sync_bundle_.HandlesApp(*extension.get())) {
+    sync_change = app_sync_bundle_.CreateSyncChangeToDelete(extension.get());
+  } else if (extension_sync_bundle_.HandlesExtension(*extension.get())) {
+    sync_change =
+        extension_sync_bundle_.CreateSyncChangeToDelete(extension.get());
   }
 
-  if (IsUnacknowledgedExternalExtension(extension)) {
+  if (IsUnacknowledgedExternalExtension(extension.get())) {
     UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalExtensionEvent",
                               EXTERNAL_EXTENSION_UNINSTALLED,
                               EXTERNAL_EXTENSION_BUCKET_BOUNDARY);
   }
   UMA_HISTOGRAM_ENUMERATION("Extensions.UninstallType",
                             extension->GetType(), 100);
-  RecordPermissionMessagesHistogram(
-      extension, "Extensions.Permissions_Uninstall");
+  RecordPermissionMessagesHistogram(extension.get(),
+                                    "Extensions.Permissions_Uninstall");
 
   // Unload before doing more cleanup to ensure that nothing is hanging on to
   // any of these resources.
@@ -799,7 +800,7 @@ bool ExtensionService::UninstallExtension(
   GURL launch_web_url_origin(extension->launch_web_url());
   launch_web_url_origin = launch_web_url_origin.GetOrigin();
   bool is_storage_isolated =
-      extensions::AppIsolationInfo::HasIsolatedStorage(extension);
+      extensions::AppIsolationInfo::HasIsolatedStorage(extension.get());
 
   if (is_storage_isolated) {
     BrowserContext::AsyncObliterateStoragePartition(
@@ -824,7 +825,7 @@ bool ExtensionService::UninstallExtension(
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       content::Source<Profile>(profile_),
-      content::Details<const Extension>(extension));
+      content::Details<const Extension>(extension.get()));
 
   if (app_sync_bundle_.HasExtensionId(extension_id) &&
       sync_change.sync_data().GetDataType() == syncer::APPS) {
@@ -1136,8 +1137,8 @@ bool ExtensionService::is_ready() {
 }
 
 base::SequencedTaskRunner* ExtensionService::GetFileTaskRunner() {
-  if (file_task_runner_)
-    return file_task_runner_;
+  if (file_task_runner_.get())
+    return file_task_runner_.get();
 
   // We should be able to interrupt any part of extension install process during
   // shutdown. SKIP_ON_SHUTDOWN ensures that not started extension install tasks
@@ -1148,7 +1149,7 @@ base::SequencedTaskRunner* ExtensionService::GetFileTaskRunner() {
       GetSequencedTaskRunnerWithShutdownBehavior(
         BrowserThread::GetBlockingPool()->GetNamedSequenceToken(token),
         base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
-  return file_task_runner_;
+  return file_task_runner_.get();
 }
 
 extensions::ExtensionUpdater* ExtensionService::updater() {
@@ -1801,7 +1802,7 @@ void ExtensionService::UnloadExtension(
 
   // This method can be called via PostTask, so the extension may have been
   // unloaded by the time this runs.
-  if (!extension) {
+  if (!extension.get()) {
     // In case the extension may have crashed/uninstalled. Allow the profile to
     // clean up its RequestContexts.
     system_->UnregisterExtensionWithRequestContexts(extension_id, reason);
@@ -1824,7 +1825,7 @@ void ExtensionService::UnloadExtension(
   extension_runtime_data_.erase(extension_id);
 
   if (disabled_extensions_.Contains(extension->id())) {
-    UnloadedExtensionInfo details(extension, reason);
+    UnloadedExtensionInfo details(extension.get(), reason);
     details.already_disabled = true;
     disabled_extensions_.Remove(extension->id());
     content::NotificationService::current()->Notify(
@@ -2045,7 +2046,7 @@ void ExtensionService::UpdateActivePermissions(const Extension* extension) {
   scoped_refptr<PermissionSet> active_permissions =
       extension_prefs()->GetActivePermissions(extension->id());
 
-  if (active_permissions) {
+  if (active_permissions.get()) {
     // We restrict the active permissions to be within the bounds defined in the
     // extension's manifest.
     //  a) active permissions must be a subset of optional + default permissions
@@ -2066,7 +2067,7 @@ void ExtensionService::UpdateActivePermissions(const Extension* extension) {
         adjusted_active.get());
 
     extensions::PermissionsUpdater perms_updater(profile());
-    perms_updater.UpdateActivePermissions(extension, adjusted_active);
+    perms_updater.UpdateActivePermissions(extension, adjusted_active.get());
   }
 }
 
@@ -2316,13 +2317,13 @@ void ExtensionService::FinishDelayedInstallation(
     const std::string& extension_id) {
   scoped_refptr<const Extension> extension(
       GetPendingExtensionUpdate(extension_id));
-  CHECK(extension);
+  CHECK(extension.get());
   delayed_updates_for_idle_.Remove(extension_id);
 
   if (!extension_prefs_->FinishDelayedInstallInfo(extension_id))
     NOTREACHED();
 
-  FinishInstallation(extension);
+  FinishInstallation(extension.get());
 }
 
 void ExtensionService::FinishInstallation(const Extension* extension) {
@@ -2857,20 +2858,21 @@ void ExtensionService::ManageBlacklist(
        it != no_longer_blacklisted.end(); ++it) {
     scoped_refptr<const Extension> extension =
         blacklisted_extensions_.GetByID(*it);
-    DCHECK(extension);
-    if (!extension)
+    DCHECK(extension.get());
+    if (!extension.get())
       continue;
     blacklisted_extensions_.Remove(*it);
-    AddExtension(extension);
+    AddExtension(extension.get());
     UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.UnblacklistInstalled",
-                              extension->location(), Manifest::NUM_LOCATIONS);
+                              extension->location(),
+                              Manifest::NUM_LOCATIONS);
   }
 
   for (std::set<std::string>::iterator it = not_yet_blacklisted.begin();
        it != not_yet_blacklisted.end(); ++it) {
     scoped_refptr<const Extension> extension = GetInstalledExtension(*it);
-    DCHECK(extension);
-    if (!extension)
+    DCHECK(extension.get());
+    if (!extension.get())
       continue;
     blacklisted_extensions_.Insert(extension);
     UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST);
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index e947a5f..534a50798 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -458,8 +458,8 @@ void ExtensionServiceTestBase::InitializeExtensionService(
       params.pref_file, loop_.message_loop_proxy());
   scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
       new user_prefs::PrefRegistrySyncable);
-  scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry));
-  chrome::RegisterUserPrefs(registry);
+  scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry.get()));
+  chrome::RegisterUserPrefs(registry.get());
   profile_builder.SetPrefService(prefs.Pass());
   profile_builder.SetPath(params.profile_path);
   profile_ = profile_builder.Build();
@@ -803,9 +803,9 @@ class ExtensionServiceTest
         EXPECT_EQ(1u, loaded_.size()) << path.value();
         EXPECT_EQ(expected_extensions_count_, service_->extensions()->size()) <<
             path.value();
-        extension = loaded_[0];
-        EXPECT_TRUE(service_->GetExtensionById(extension->id(), false)) <<
-            path.value();
+        extension = loaded_[0].get();
+        EXPECT_TRUE(service_->GetExtensionById(extension->id(), false))
+            << path.value();
       }
 
       for (std::vector<string16>::iterator err = errors.begin();
@@ -1215,7 +1215,7 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
   AddPattern(&expected_patterns, "file:///*");
   AddPattern(&expected_patterns, "http://*.google.com/*");
   AddPattern(&expected_patterns, "https://*.google.com/*");
-  const Extension* extension = loaded_[0];
+  const Extension* extension = loaded_[0].get();
   const extensions::UserScriptList& scripts =
       extensions::ContentScriptsInfo::GetContentScripts(extension);
   ASSERT_EQ(2u, scripts.size());
@@ -1255,17 +1255,18 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
   EXPECT_EQ(std::string("My extension 2"), loaded_[1]->name());
   EXPECT_EQ(std::string(), loaded_[1]->description());
   EXPECT_EQ(loaded_[1]->GetResourceURL("background.html"),
-            extensions::BackgroundInfo::GetBackgroundURL(loaded_[1]));
-  EXPECT_EQ(
-      0u, extensions::ContentScriptsInfo::GetContentScripts(loaded_[1]).size());
+            extensions::BackgroundInfo::GetBackgroundURL(loaded_[1].get()));
+  EXPECT_EQ(0u,
+            extensions::ContentScriptsInfo::GetContentScripts(loaded_[1].get())
+                .size());
 
   // We don't parse the plugins section on Chrome OS.
 #if defined(OS_CHROMEOS)
   EXPECT_TRUE(!extensions::PluginInfo::HasPlugins(loaded_[1]));
 #else
-  ASSERT_TRUE(extensions::PluginInfo::HasPlugins(loaded_[1]));
+  ASSERT_TRUE(extensions::PluginInfo::HasPlugins(loaded_[1].get()));
   const std::vector<extensions::PluginInfo>* plugins =
-      extensions::PluginInfo::GetPlugins(loaded_[1]);
+      extensions::PluginInfo::GetPlugins(loaded_[1].get());
   ASSERT_TRUE(plugins);
   ASSERT_EQ(2u, plugins->size());
   EXPECT_EQ(loaded_[1]->path().AppendASCII("content_plugin.dll").value(),
@@ -1282,9 +1283,9 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
   EXPECT_EQ(std::string(good2), loaded_[index]->id());
   EXPECT_EQ(std::string("My extension 3"), loaded_[index]->name());
   EXPECT_EQ(std::string(), loaded_[index]->description());
-  EXPECT_EQ(
-      0u,
-      extensions::ContentScriptsInfo::GetContentScripts(loaded_[index]).size());
+  EXPECT_EQ(0u,
+            extensions::ContentScriptsInfo::GetContentScripts(
+                loaded_[index].get()).size());
   EXPECT_EQ(Manifest::INTERNAL, loaded_[index]->location());
 };
 
@@ -4207,7 +4208,8 @@ void ExtensionServiceTest::TestExternalProvider(
   // Uninstall the extension and reload. Nothing should happen because the
   // preference should prevent us from reinstalling.
   std::string id = loaded_[0]->id();
-  bool no_uninstall = management_policy_->MustRemainEnabled(loaded_[0], NULL);
+  bool no_uninstall =
+      management_policy_->MustRemainEnabled(loaded_[0].get(), NULL);
   service_->UninstallExtension(id, false, NULL);
   loop_.RunUntilIdle();
 
@@ -4239,7 +4241,7 @@ void ExtensionServiceTest::TestExternalProvider(
   ValidateIntegerPref(good_crx, "state", Extension::ENABLED);
   ValidateIntegerPref(good_crx, "location", location);
 
-  if (management_policy_->MustRemainEnabled(loaded_[0], NULL)) {
+  if (management_policy_->MustRemainEnabled(loaded_[0].get(), NULL)) {
     EXPECT_EQ(2, provider->visit_count());
   } else {
     // Now test an externally triggered uninstall (deleting the registry key or
diff --git a/chrome/browser/extensions/extension_sorting_unittest.cc b/chrome/browser/extensions/extension_sorting_unittest.cc
index 8b4aa41..f8dd6f3 100644
--- a/chrome/browser/extensions/extension_sorting_unittest.cc
+++ b/chrome/browser/extensions/extension_sorting_unittest.cc
@@ -807,7 +807,7 @@ class ExtensionSortingDefaultOrdinalsBase : public ExtensionSortingTest {
     scoped_refptr<Extension> app = Extension::Create(
         prefs_.temp_dir().AppendASCII(name), Manifest::EXTERNAL_PREF,
         simple_dict, Extension::NO_FLAGS, &errors);
-    EXPECT_TRUE(app) << errors;
+    EXPECT_TRUE(app.get()) << errors;
     EXPECT_TRUE(Extension::IdIsValid(app->id()));
     return app;
   }
diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
index 774582a..127dcdf 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -46,7 +46,7 @@ bool ExtensionSpecialStoragePolicy::IsStorageUnlimited(const GURL& origin) {
 }
 
 bool ExtensionSpecialStoragePolicy::IsStorageSessionOnly(const GURL& origin) {
-  if (cookie_settings_ == NULL)
+  if (cookie_settings_.get() == NULL)
     return false;
   return cookie_settings_->IsCookieSessionOnly(origin);
 }
@@ -56,7 +56,7 @@ bool ExtensionSpecialStoragePolicy::CanQueryDiskSize(const GURL& origin) {
 }
 
 bool ExtensionSpecialStoragePolicy::HasSessionOnlyOrigins() {
-  if (cookie_settings_ == NULL)
+  if (cookie_settings_.get() == NULL)
     return false;
   if (cookie_settings_->GetDefaultCookieSetting(NULL) ==
       CONTENT_SETTING_SESSION_ONLY)
diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
index 942732c..8e7ae0c 100644
--- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
@@ -196,7 +196,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, EmptyPolicy) {
 
 TEST_F(ExtensionSpecialStoragePolicyTest, AppWithProtectedStorage) {
   scoped_refptr<Extension> extension(CreateProtectedApp());
-  policy_->GrantRightsForExtension(extension);
+  policy_->GrantRightsForExtension(extension.get());
   ExtensionSet protecting_extensions;
   protecting_extensions.Insert(extension);
   ExtensionSet empty_set;
@@ -209,7 +209,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, AppWithProtectedStorage) {
   ExpectProtectedBy(protecting_extensions, GURL("https://bar.wildcards/"));
   ExpectProtectedBy(empty_set, GURL("http://not_listed/"));
 
-  policy_->RevokeRightsForExtension(extension);
+  policy_->RevokeRightsForExtension(extension.get());
   ExpectProtectedBy(empty_set, GURL("http://explicit/"));
   ExpectProtectedBy(empty_set, GURL("http://foo.wildcards/"));
   ExpectProtectedBy(empty_set, GURL("https://bar.wildcards/"));
@@ -217,7 +217,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, AppWithProtectedStorage) {
 
 TEST_F(ExtensionSpecialStoragePolicyTest, AppWithUnlimitedStorage) {
   scoped_refptr<Extension> extension(CreateUnlimitedApp());
-  policy_->GrantRightsForExtension(extension);
+  policy_->GrantRightsForExtension(extension.get());
   ExtensionSet protecting_extensions;
   protecting_extensions.Insert(extension);
   ExtensionSet empty_set;
@@ -235,7 +235,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, AppWithUnlimitedStorage) {
   EXPECT_TRUE(policy_->IsStorageUnlimited(GURL("https://bar.wildcards/")));
   EXPECT_FALSE(policy_->IsStorageUnlimited(GURL("http://not_listed/")));
 
-  policy_->RevokeRightsForExtension(extension);
+  policy_->RevokeRightsForExtension(extension.get());
   ExpectProtectedBy(empty_set, GURL("http://explicit/"));
   ExpectProtectedBy(empty_set, GURL("https://foo.wildcards/"));
   ExpectProtectedBy(empty_set, GURL("https://foo.wildcards/"));
@@ -251,9 +251,9 @@ TEST_F(ExtensionSpecialStoragePolicyTest, CanQueryDiskSize) {
   scoped_refptr<Extension> regular_app(CreateRegularApp());
   scoped_refptr<Extension> protected_app(CreateProtectedApp());
   scoped_refptr<Extension> unlimited_app(CreateUnlimitedApp());
-  policy_->GrantRightsForExtension(regular_app);
-  policy_->GrantRightsForExtension(protected_app);
-  policy_->GrantRightsForExtension(unlimited_app);
+  policy_->GrantRightsForExtension(regular_app.get());
+  policy_->GrantRightsForExtension(protected_app.get());
+  policy_->GrantRightsForExtension(unlimited_app.get());
 
   EXPECT_FALSE(policy_->CanQueryDiskSize(kHttpUrl));
   EXPECT_FALSE(policy_->CanQueryDiskSize(kExtensionUrl));
@@ -266,7 +266,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, HasIsolatedStorage) {
   const GURL kHttpUrl("http://foo");
   const GURL kExtensionUrl("chrome-extension://bar");
   scoped_refptr<Extension> app(CreateRegularApp());
-  policy_->GrantRightsForExtension(app);
+  policy_->GrantRightsForExtension(app.get());
 
   EXPECT_FALSE(policy_->HasIsolatedStorage(kHttpUrl));
   EXPECT_FALSE(policy_->HasIsolatedStorage(kExtensionUrl));
@@ -276,8 +276,8 @@ TEST_F(ExtensionSpecialStoragePolicyTest, HasIsolatedStorage) {
 TEST_F(ExtensionSpecialStoragePolicyTest, OverlappingApps) {
   scoped_refptr<Extension> protected_app(CreateProtectedApp());
   scoped_refptr<Extension> unlimited_app(CreateUnlimitedApp());
-  policy_->GrantRightsForExtension(protected_app);
-  policy_->GrantRightsForExtension(unlimited_app);
+  policy_->GrantRightsForExtension(protected_app.get());
+  policy_->GrantRightsForExtension(unlimited_app.get());
   ExtensionSet protecting_extensions;
   ExtensionSet empty_set;
   protecting_extensions.Insert(protected_app);
@@ -295,7 +295,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, OverlappingApps) {
   EXPECT_TRUE(policy_->IsStorageUnlimited(GURL("https://bar.wildcards/")));
   EXPECT_FALSE(policy_->IsStorageUnlimited(GURL("http://not_listed/")));
 
-  policy_->RevokeRightsForExtension(unlimited_app);
+  policy_->RevokeRightsForExtension(unlimited_app.get());
   protecting_extensions.Remove(unlimited_app->id());
   EXPECT_FALSE(policy_->IsStorageUnlimited(GURL("http://explicit/")));
   EXPECT_FALSE(policy_->IsStorageUnlimited(GURL("https://foo.wildcards/")));
@@ -304,7 +304,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, OverlappingApps) {
   ExpectProtectedBy(protecting_extensions, GURL("http://foo.wildcards/"));
   ExpectProtectedBy(protecting_extensions, GURL("https://bar.wildcards/"));
 
-  policy_->RevokeRightsForExtension(protected_app);
+  policy_->RevokeRightsForExtension(protected_app.get());
   ExpectProtectedBy(empty_set, GURL("http://explicit/"));
   ExpectProtectedBy(empty_set, GURL("http://foo.wildcards/"));
   ExpectProtectedBy(empty_set, GURL("https://bar.wildcards/"));
@@ -369,14 +369,14 @@ TEST_F(ExtensionSpecialStoragePolicyTest, NotificationTest) {
   for (size_t i = 0; i < arraysize(apps); ++i) {
     SCOPED_TRACE(testing::Message() << "i: " << i);
     observer.ExpectGrant(apps[i]->id(), change_flags[i]);
-    policy_->GrantRightsForExtension(apps[i]);
+    policy_->GrantRightsForExtension(apps[i].get());
     message_loop.RunUntilIdle();
     EXPECT_TRUE(observer.IsCompleted());
   }
 
   for (size_t i = 0; i < arraysize(apps); ++i) {
     SCOPED_TRACE(testing::Message() << "i: " << i);
-    policy_->GrantRightsForExtension(apps[i]);
+    policy_->GrantRightsForExtension(apps[i].get());
     message_loop.RunUntilIdle();
     EXPECT_TRUE(observer.IsCompleted());
   }
@@ -384,14 +384,14 @@ TEST_F(ExtensionSpecialStoragePolicyTest, NotificationTest) {
   for (size_t i = 0; i < arraysize(apps); ++i) {
     SCOPED_TRACE(testing::Message() << "i: " << i);
     observer.ExpectRevoke(apps[i]->id(), change_flags[i]);
-    policy_->RevokeRightsForExtension(apps[i]);
+    policy_->RevokeRightsForExtension(apps[i].get());
     message_loop.RunUntilIdle();
     EXPECT_TRUE(observer.IsCompleted());
   }
 
   for (size_t i = 0; i < arraysize(apps); ++i) {
     SCOPED_TRACE(testing::Message() << "i: " << i);
-    policy_->RevokeRightsForExtension(apps[i]);
+    policy_->RevokeRightsForExtension(apps[i].get());
     message_loop.RunUntilIdle();
     EXPECT_TRUE(observer.IsCompleted());
   }
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index c2684d8..ed32eb4 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -251,7 +251,7 @@ UserScriptMaster* ExtensionSystemImpl::Shared::user_script_master() {
 }
 
 ExtensionInfoMap* ExtensionSystemImpl::Shared::info_map() {
-  if (!extension_info_map_)
+  if (!extension_info_map_.get())
     extension_info_map_ = new ExtensionInfoMap();
   return extension_info_map_.get();
 }
diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
index 955e2fc..a387e05 100644
--- a/chrome/browser/extensions/extension_toolbar_model.cc
+++ b/chrome/browser/extensions/extension_toolbar_model.cc
@@ -352,8 +352,8 @@ void ExtensionToolbarModel::Populate(
 
   // Erase current icons.
   for (size_t i = 0; i < toolbar_items_.size(); i++) {
-    FOR_EACH_OBSERVER(Observer, observers_,
-                      BrowserActionRemoved(toolbar_items_[i]));
+    FOR_EACH_OBSERVER(
+        Observer, observers_, BrowserActionRemoved(toolbar_items_[i].get()));
   }
   toolbar_items_.clear();
 
@@ -367,7 +367,7 @@ void ExtensionToolbarModel::Populate(
     // syncing NPAPI-containing extensions, so if one of those is not actually
     // synced, we'll get a NULL in the list.  This sort of case can also happen
     // if some error prevents an extension from loading.
-    if (*iter != NULL)
+    if (iter->get() != NULL)
       toolbar_items_.push_back(*iter);
   }
   toolbar_items_.insert(toolbar_items_.end(), unsorted.begin(),
@@ -375,8 +375,8 @@ void ExtensionToolbarModel::Populate(
 
   // Inform observers.
   for (size_t i = 0; i < toolbar_items_.size(); i++) {
-    FOR_EACH_OBSERVER(Observer, observers_,
-                      BrowserActionAdded(toolbar_items_[i], i));
+    FOR_EACH_OBSERVER(
+        Observer, observers_, BrowserActionAdded(toolbar_items_[i].get(), i));
   }
 }
 
diff --git a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
index 4daed93..a340476 100644
--- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
@@ -58,7 +58,7 @@ class ExtensionToolbarModelTest : public ExtensionBrowserTest,
     for (extensions::ExtensionList::const_iterator i = toolbar_items.begin();
          i < toolbar_items.end(); ++i) {
       if (index-- == 0)
-        return *i;
+        return i->get();
     }
     return NULL;
   }
diff --git a/chrome/browser/extensions/extensions_quota_service_unittest.cc b/chrome/browser/extensions/extensions_quota_service_unittest.cc
index 7a113bd..a830ecf 100644
--- a/chrome/browser/extensions/extensions_quota_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_quota_service_unittest.cc
@@ -218,55 +218,85 @@ TEST_F(QuotaLimitHeuristicTest, Sustained) {
 TEST_F(ExtensionsQuotaServiceTest, NoHeuristic) {
   scoped_refptr<MockFunction> f(new MockFunction("foo"));
   ListValue args;
-  EXPECT_EQ("", service_->Assess(extension_a_, f, &args, kStartTime));
+  EXPECT_EQ("", service_->Assess(extension_a_, f.get(), &args, kStartTime));
 }
 
 TEST_F(ExtensionsQuotaServiceTest, FrozenHeuristic) {
   scoped_refptr<MockFunction> f(new FrozenMockFunction("foo"));
   ListValue args;
   args.Append(new base::FundamentalValue(1));
-  EXPECT_NE("", service_->Assess(extension_a_, f, &args, kStartTime));
+  EXPECT_NE("", service_->Assess(extension_a_, f.get(), &args, kStartTime));
 }
 
 TEST_F(ExtensionsQuotaServiceTest, SingleHeuristic) {
   scoped_refptr<MockFunction> f(new TimedLimitMockFunction("foo"));
   ListValue args;
   args.Append(new base::FundamentalValue(1));
-  EXPECT_EQ("", service_->Assess(extension_a_, f, &args, kStartTime));
-  EXPECT_EQ("", service_->Assess(extension_a_, f, &args,
-                                 kStartTime + TimeDelta::FromSeconds(10)));
-  EXPECT_NE("", service_->Assess(extension_a_, f, &args,
-              kStartTime + TimeDelta::FromSeconds(15)));
+  EXPECT_EQ("", service_->Assess(extension_a_, f.get(), &args, kStartTime));
+  EXPECT_EQ("",
+            service_->Assess(extension_a_,
+                             f.get(),
+                             &args,
+                             kStartTime + TimeDelta::FromSeconds(10)));
+  EXPECT_NE("",
+            service_->Assess(extension_a_,
+                             f.get(),
+                             &args,
+                             kStartTime + TimeDelta::FromSeconds(15)));
 
   ListValue args2;
   args2.Append(new base::FundamentalValue(1));
   args2.Append(new base::FundamentalValue(2));
-  EXPECT_EQ("", service_->Assess(extension_b_, f, &args2, kStartTime));
-  EXPECT_EQ("", service_->Assess(extension_b_, f, &args2,
-                                 kStartTime + TimeDelta::FromSeconds(10)));
+  EXPECT_EQ("", service_->Assess(extension_b_, f.get(), &args2, kStartTime));
+  EXPECT_EQ("",
+            service_->Assess(extension_b_,
+                             f.get(),
+                             &args2,
+                             kStartTime + TimeDelta::FromSeconds(10)));
 
   TimeDelta peace = TimeDelta::FromMinutes(30);
-  EXPECT_EQ("", service_->Assess(extension_b_, f, &args, kStartTime + peace));
-  EXPECT_EQ("", service_->Assess(
-        extension_b_, f, &args,
-        kStartTime + peace + TimeDelta::FromSeconds(10)));
-  EXPECT_NE("", service_->Assess(extension_b_, f, &args2,
-               kStartTime + peace + TimeDelta::FromSeconds(15)));
+  EXPECT_EQ("",
+            service_->Assess(extension_b_, f.get(), &args, kStartTime + peace));
+  EXPECT_EQ("",
+            service_->Assess(extension_b_,
+                             f.get(),
+                             &args,
+                             kStartTime + peace + TimeDelta::FromSeconds(10)));
+  EXPECT_NE("",
+            service_->Assess(extension_b_,
+                             f.get(),
+                             &args2,
+                             kStartTime + peace + TimeDelta::FromSeconds(15)));
 
   // Test that items are independent.
   ListValue args3;
   args3.Append(new base::FundamentalValue(3));
-  EXPECT_EQ("", service_->Assess(extension_c_, f, &args, kStartTime));
-  EXPECT_EQ("", service_->Assess(extension_c_, f, &args3,
-                                 kStartTime + TimeDelta::FromSeconds(10)));
-  EXPECT_EQ("", service_->Assess(extension_c_, f, &args,
-                                 kStartTime + TimeDelta::FromSeconds(15)));
-  EXPECT_EQ("", service_->Assess(extension_c_, f, &args3,
-                                 kStartTime + TimeDelta::FromSeconds(20)));
-  EXPECT_NE("", service_->Assess(extension_c_, f, &args,
-                                 kStartTime + TimeDelta::FromSeconds(25)));
-  EXPECT_NE("", service_->Assess(extension_c_, f, &args3,
-                                 kStartTime + TimeDelta::FromSeconds(30)));
+  EXPECT_EQ("", service_->Assess(extension_c_, f.get(), &args, kStartTime));
+  EXPECT_EQ("",
+            service_->Assess(extension_c_,
+                             f.get(),
+                             &args3,
+                             kStartTime + TimeDelta::FromSeconds(10)));
+  EXPECT_EQ("",
+            service_->Assess(extension_c_,
+                             f.get(),
+                             &args,
+                             kStartTime + TimeDelta::FromSeconds(15)));
+  EXPECT_EQ("",
+            service_->Assess(extension_c_,
+                             f.get(),
+                             &args3,
+                             kStartTime + TimeDelta::FromSeconds(20)));
+  EXPECT_NE("",
+            service_->Assess(extension_c_,
+                             f.get(),
+                             &args,
+                             kStartTime + TimeDelta::FromSeconds(25)));
+  EXPECT_NE("",
+            service_->Assess(extension_c_,
+                             f.get(),
+                             &args3,
+                             kStartTime + TimeDelta::FromSeconds(30)));
 }
 
 TEST_F(ExtensionsQuotaServiceTest, ChainedHeuristics) {
@@ -278,30 +308,48 @@ TEST_F(ExtensionsQuotaServiceTest, ChainedHeuristics) {
   // One event per minute for 20 minutes comes in under the sustained limit,
   // but is equal to the timed limit.
   for (int i = 0; i < 20; i++) {
-    EXPECT_EQ("", service_->Assess(
-          extension_a_, f, &args,
-          kStartTime + TimeDelta::FromSeconds(10 + i * 60)));
+    EXPECT_EQ(
+        "",
+        service_->Assess(extension_a_,
+                         f.get(),
+                         &args,
+                         kStartTime + TimeDelta::FromSeconds(10 + i * 60)));
   }
 
   // This will bring us to 21 events in an hour, which is a violation.
-  EXPECT_NE("", service_->Assess(extension_a_, f, &args,
-                                 kStartTime + TimeDelta::FromMinutes(30)));
+  EXPECT_NE("",
+            service_->Assess(extension_a_,
+                             f.get(),
+                             &args,
+                             kStartTime + TimeDelta::FromMinutes(30)));
 
   // Now, check that we can still hit the lower limit.
   for (int i = 0; i < 5; i++) {
-    EXPECT_EQ("", service_->Assess(
-          extension_b_, f, &args,
-          kStartTime + TimeDelta::FromSeconds(10 + i * 60)));
-    EXPECT_EQ("", service_->Assess(
-          extension_b_, f, &args,
-          kStartTime + TimeDelta::FromSeconds(15 + i * 60)));
-    EXPECT_EQ("", service_->Assess(
-          extension_b_, f, &args,
-          kStartTime + TimeDelta::FromSeconds(20 + i * 60)));
+    EXPECT_EQ(
+        "",
+        service_->Assess(extension_b_,
+                         f.get(),
+                         &args,
+                         kStartTime + TimeDelta::FromSeconds(10 + i * 60)));
+    EXPECT_EQ(
+        "",
+        service_->Assess(extension_b_,
+                         f.get(),
+                         &args,
+                         kStartTime + TimeDelta::FromSeconds(15 + i * 60)));
+    EXPECT_EQ(
+        "",
+        service_->Assess(extension_b_,
+                         f.get(),
+                         &args,
+                         kStartTime + TimeDelta::FromSeconds(20 + i * 60)));
   }
 
-  EXPECT_NE("", service_->Assess(extension_b_, f, &args,
-               kStartTime + TimeDelta::FromMinutes(6)));
+  EXPECT_NE("",
+            service_->Assess(extension_b_,
+                             f.get(),
+                             &args,
+                             kStartTime + TimeDelta::FromMinutes(6)));
 }
 
 TEST_F(ExtensionsQuotaServiceTest, MultipleFunctionsDontInterfere) {
@@ -313,16 +361,28 @@ TEST_F(ExtensionsQuotaServiceTest, MultipleFunctionsDontInterfere) {
   args_f.Append(new base::FundamentalValue(1));
   args_g.Append(new base::FundamentalValue(2));
 
-  EXPECT_EQ("", service_->Assess(extension_a_, f, &args_f, kStartTime));
-  EXPECT_EQ("", service_->Assess(extension_a_, g, &args_g, kStartTime));
-  EXPECT_EQ("", service_->Assess(extension_a_, f, &args_f,
-                                 kStartTime + TimeDelta::FromSeconds(10)));
-  EXPECT_EQ("", service_->Assess(extension_a_, g, &args_g,
-                                 kStartTime + TimeDelta::FromSeconds(10)));
-  EXPECT_NE("", service_->Assess(extension_a_, f, &args_f,
-                                 kStartTime + TimeDelta::FromSeconds(15)));
-  EXPECT_NE("", service_->Assess(extension_a_, g, &args_g,
-                                 kStartTime + TimeDelta::FromSeconds(15)));
+  EXPECT_EQ("", service_->Assess(extension_a_, f.get(), &args_f, kStartTime));
+  EXPECT_EQ("", service_->Assess(extension_a_, g.get(), &args_g, kStartTime));
+  EXPECT_EQ("",
+            service_->Assess(extension_a_,
+                             f.get(),
+                             &args_f,
+                             kStartTime + TimeDelta::FromSeconds(10)));
+  EXPECT_EQ("",
+            service_->Assess(extension_a_,
+                             g.get(),
+                             &args_g,
+                             kStartTime + TimeDelta::FromSeconds(10)));
+  EXPECT_NE("",
+            service_->Assess(extension_a_,
+                             f.get(),
+                             &args_f,
+                             kStartTime + TimeDelta::FromSeconds(15)));
+  EXPECT_NE("",
+            service_->Assess(extension_a_,
+                             g.get(),
+                             &args_g,
+                             kStartTime + TimeDelta::FromSeconds(15)));
 }
 
 TEST_F(ExtensionsQuotaServiceTest, ViolatorsWillBeViolators) {
@@ -330,16 +390,26 @@ TEST_F(ExtensionsQuotaServiceTest, ViolatorsWillBeViolators) {
   scoped_refptr<MockFunction> g(new TimedLimitMockFunction("bar"));
   ListValue arg;
   arg.Append(new base::FundamentalValue(1));
-  EXPECT_EQ("", service_->Assess(extension_a_, f, &arg, kStartTime));
-  EXPECT_EQ("", service_->Assess(extension_a_, f, &arg,
-                                 kStartTime + TimeDelta::FromSeconds(10)));
-  EXPECT_NE("", service_->Assess(extension_a_, f, &arg,
-                                 kStartTime + TimeDelta::FromSeconds(15)));
+  EXPECT_EQ("", service_->Assess(extension_a_, f.get(), &arg, kStartTime));
+  EXPECT_EQ("",
+            service_->Assess(extension_a_,
+                             f.get(),
+                             &arg,
+                             kStartTime + TimeDelta::FromSeconds(10)));
+  EXPECT_NE("",
+            service_->Assess(extension_a_,
+                             f.get(),
+                             &arg,
+                             kStartTime + TimeDelta::FromSeconds(15)));
 
   // We don't allow this extension to use quota limited functions even if they
   // wait a while.
-  EXPECT_NE("", service_->Assess(extension_a_, f, &arg,
-                                 kStartTime + TimeDelta::FromDays(1)));
-  EXPECT_NE("", service_->Assess(extension_a_, g, &arg,
-                                 kStartTime + TimeDelta::FromDays(1)));
+  EXPECT_NE(
+      "",
+      service_->Assess(
+          extension_a_, f.get(), &arg, kStartTime + TimeDelta::FromDays(1)));
+  EXPECT_NE(
+      "",
+      service_->Assess(
+          extension_a_, g.get(), &arg, kStartTime + TimeDelta::FromDays(1)));
 }
diff --git a/chrome/browser/extensions/image_loader_unittest.cc b/chrome/browser/extensions/image_loader_unittest.cc
index 04cf2c9..b3213bb 100644
--- a/chrome/browser/extensions/image_loader_unittest.cc
+++ b/chrome/browser/extensions/image_loader_unittest.cc
@@ -118,7 +118,7 @@ TEST_F(ImageLoaderTest, LoadImage) {
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource = extensions::IconsInfo::GetIconResource(
-      extension,
+      extension.get(),
       extension_misc::EXTENSION_ICON_SMALLISH,
       ExtensionIconSet::MATCH_EXACTLY);
   gfx::Size max_size(extension_misc::EXTENSION_ICON_SMALLISH,
@@ -151,7 +151,7 @@ TEST_F(ImageLoaderTest, DeleteExtensionWhileWaitingForCache) {
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource = extensions::IconsInfo::GetIconResource(
-      extension,
+      extension.get(),
       extension_misc::EXTENSION_ICON_SMALLISH,
       ExtensionIconSet::MATCH_EXACTLY);
   gfx::Size max_size(extension_misc::EXTENSION_ICON_SMALLISH,
@@ -202,7 +202,7 @@ TEST_F(ImageLoaderTest, MultipleImages) {
                  extension_misc::EXTENSION_ICON_BITTY};
   for (size_t i = 0; i < arraysize(sizes); ++i) {
     ExtensionResource resource = extensions::IconsInfo::GetIconResource(
-        extension, sizes[i], ExtensionIconSet::MATCH_EXACTLY);
+        extension.get(), sizes[i], ExtensionIconSet::MATCH_EXACTLY);
     info_list.push_back(ImageLoader::ImageRepresentation(
         resource,
         ImageLoader::ImageRepresentation::RESIZE_WHEN_LARGER,
@@ -245,7 +245,7 @@ TEST_F(ImageLoaderTest, IsComponentExtensionResource) {
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource resource = extensions::IconsInfo::GetIconResource(
-      extension,
+      extension.get(),
       extension_misc::EXTENSION_ICON_BITTY,
       ExtensionIconSet::MATCH_EXACTLY);
 
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc
index 2a6d97b..155a177b 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -107,8 +107,7 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) {
   // Once installed, non-unpacked extensions cannot change their IDs (e.g., by
   // updating the 'key' field in their manifest).
   // TODO(jstritar): migrate preferences when unpacked extensions change IDs.
-  if (extension &&
-      !Manifest::IsUnpackedLocation(extension->location()) &&
+  if (extension.get() && !Manifest::IsUnpackedLocation(extension->location()) &&
       info.extension_id != extension->id()) {
     error = errors::kCannotChangeExtensionID;
     extension = NULL;
@@ -119,24 +118,23 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) {
   // Chrome was not running.
   const ManagementPolicy* policy = extensions::ExtensionSystem::Get(
       extension_service_->profile())->management_policy();
-  if (extension &&
-      !policy->UserMayLoad(extension, NULL)) {
+  if (extension.get() && !policy->UserMayLoad(extension.get(), NULL)) {
     // The error message from UserMayInstall() often contains the extension ID
     // and is therefore not well suited to this UI.
     error = errors::kDisabledByPolicy;
     extension = NULL;
   }
 
-  if (!extension) {
-    extension_service_->
-        ReportExtensionLoadError(info.extension_path, error, false);
+  if (!extension.get()) {
+    extension_service_->ReportExtensionLoadError(
+        info.extension_path, error, false);
     return;
   }
 
   if (write_to_prefs)
-    extension_prefs_->UpdateManifest(extension);
+    extension_prefs_->UpdateManifest(extension.get());
 
-  extension_service_->AddExtension(extension);
+  extension_service_->AddExtension(extension.get());
 }
 
 void InstalledLoader::LoadAllExtensions() {
@@ -206,9 +204,9 @@ void InstalledLoader::LoadAllExtensions() {
               GetCreationFlags(info),
               &error));
 
-      if (!extension) {
-        extension_service_->
-            ReportExtensionLoadError(info->extension_path, error, false);
+      if (!extension.get()) {
+        extension_service_->ReportExtensionLoadError(
+            info->extension_path, error, false);
         continue;
       }
 
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index 66430f2..99393ed 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -79,7 +79,7 @@ class MenuManagerTest : public testing::Test {
   Extension* AddExtension(std::string name) {
     scoped_refptr<Extension> extension = prefs_.AddExtension(name);
     extensions_.push_back(extension);
-    return extension;
+    return extension.get();
   }
 
  protected:
diff --git a/chrome/browser/extensions/page_action_controller_unittest.cc b/chrome/browser/extensions/page_action_controller_unittest.cc
index 5268a9a..f77ef6e 100644
--- a/chrome/browser/extensions/page_action_controller_unittest.cc
+++ b/chrome/browser/extensions/page_action_controller_unittest.cc
@@ -82,12 +82,12 @@ TEST_F(PageActionControllerTest, NavigationClearsState) {
                    .Set("page_action", DictionaryBuilder()
                         .Set("default_title", "Hello")))
       .Build();
-  extension_service_->AddExtension(extension);
+  extension_service_->AddExtension(extension.get());
 
   NavigateAndCommit(GURL("http://www.google.com"));
 
-  ExtensionAction& page_action = *ExtensionActionManager::Get(profile())->
-      GetPageAction(*extension);
+  ExtensionAction& page_action =
+      *ExtensionActionManager::Get(profile())->GetPageAction(*extension.get());
   page_action.SetTitle(tab_id(), "Goodbye");
   page_action.SetPopupUrl(
       tab_id(), extension->GetResourceURL("popup.html"));
diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc
index 5f441f5..02c1208 100644
--- a/chrome/browser/extensions/permissions_updater.cc
+++ b/chrome/browser/extensions/permissions_updater.cc
@@ -44,9 +44,9 @@ void PermissionsUpdater::AddPermissions(
   scoped_refptr<const PermissionSet> existing(
       extension->GetActivePermissions());
   scoped_refptr<PermissionSet> total(
-      PermissionSet::CreateUnion(existing, permissions));
+      PermissionSet::CreateUnion(existing.get(), permissions));
   scoped_refptr<PermissionSet> added(
-      PermissionSet::CreateDifference(total.get(), existing));
+      PermissionSet::CreateDifference(total.get(), existing.get()));
 
   UpdateActivePermissions(extension, total.get());
 
@@ -61,9 +61,9 @@ void PermissionsUpdater::RemovePermissions(
   scoped_refptr<const PermissionSet> existing(
       extension->GetActivePermissions());
   scoped_refptr<PermissionSet> total(
-      PermissionSet::CreateDifference(existing, permissions));
+      PermissionSet::CreateDifference(existing.get(), permissions));
   scoped_refptr<PermissionSet> removed(
-      PermissionSet::CreateDifference(existing, total.get()));
+      PermissionSet::CreateDifference(existing.get(), total.get()));
 
   // We update the active permissions, and not the granted permissions, because
   // the extension, not the user, removed the permissions. This allows the
diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc
index 14a52e8..b138886 100644
--- a/chrome/browser/extensions/permissions_updater_unittest.cc
+++ b/chrome/browser/extensions/permissions_updater_unittest.cc
@@ -55,11 +55,9 @@ class PermissionsUpdaterListener : public content::NotificationObserver {
   }
 
   bool received_notification() const { return received_notification_; }
-  const Extension* extension() const { return extension_; }
-  const PermissionSet* permissions() const { return permissions_; }
-  UpdatedExtensionPermissionsInfo::Reason reason() const {
-    return reason_;
-  }
+  const Extension* extension() const { return extension_.get(); }
+  const PermissionSet* permissions() const { return permissions_.get(); }
+  UpdatedExtensionPermissionsInfo::Reason reason() const { return reason_; }
 
  private:
   virtual void Observe(int type,
@@ -129,7 +127,7 @@ TEST_F(PermissionsUpdaterTest, AddAndRemovePermissions) {
   // Make sure it loaded properly.
   scoped_refptr<const PermissionSet> permissions =
       extension->GetActivePermissions();
-  ASSERT_EQ(*default_permissions, *extension->GetActivePermissions());
+  ASSERT_EQ(*default_permissions.get(), *extension->GetActivePermissions());
 
   // Add a few permissions.
   APIPermissionSet apis;
@@ -151,12 +149,12 @@ TEST_F(PermissionsUpdaterTest, AddAndRemovePermissions) {
   ASSERT_TRUE(listener.received_notification());
   ASSERT_EQ(extension, listener.extension());
   ASSERT_EQ(UpdatedExtensionPermissionsInfo::ADDED, listener.reason());
-  ASSERT_EQ(*delta, *listener.permissions());
+  ASSERT_EQ(*delta.get(), *listener.permissions());
 
   // Make sure the extension's active permissions reflect the change.
   scoped_refptr<PermissionSet> active_permissions =
-      PermissionSet::CreateUnion(default_permissions, delta);
-  ASSERT_EQ(*active_permissions, *extension->GetActivePermissions());
+      PermissionSet::CreateUnion(default_permissions.get(), delta.get());
+  ASSERT_EQ(*active_permissions.get(), *extension->GetActivePermissions());
 
   // Verify that the new granted and active permissions were also stored
   // in the extension preferences. In this case, the granted permissions should
@@ -167,10 +165,10 @@ TEST_F(PermissionsUpdaterTest, AddAndRemovePermissions) {
 
   scoped_refptr<PermissionSet> from_prefs =
       prefs->GetActivePermissions(extension->id());
-  ASSERT_EQ(*active_permissions, *from_prefs);
+  ASSERT_EQ(*active_permissions.get(), *from_prefs.get());
 
   from_prefs = prefs->GetGrantedPermissions(extension->id());
-  ASSERT_EQ(*active_permissions, *from_prefs);
+  ASSERT_EQ(*active_permissions.get(), *from_prefs.get());
 
   // In the second part of the test, we'll remove the permissions that we
   // just added except for 'notification'.
@@ -178,27 +176,27 @@ TEST_F(PermissionsUpdaterTest, AddAndRemovePermissions) {
   delta = new PermissionSet(apis, hosts, URLPatternSet());
 
   listener.Reset();
-  updater.RemovePermissions(extension, delta);
+  updater.RemovePermissions(extension.get(), delta.get());
   listener.Wait();
 
   // Verify that the notification was correct.
   ASSERT_TRUE(listener.received_notification());
   ASSERT_EQ(extension, listener.extension());
   ASSERT_EQ(UpdatedExtensionPermissionsInfo::REMOVED, listener.reason());
-  ASSERT_EQ(*delta, *listener.permissions());
+  ASSERT_EQ(*delta.get(), *listener.permissions());
 
   // Make sure the extension's active permissions reflect the change.
   active_permissions =
-      PermissionSet::CreateDifference(active_permissions, delta);
-  ASSERT_EQ(*active_permissions, *extension->GetActivePermissions());
+      PermissionSet::CreateDifference(active_permissions.get(), delta.get());
+  ASSERT_EQ(*active_permissions.get(), *extension->GetActivePermissions());
 
   // Verify that the extension prefs hold the new active permissions and the
   // same granted permissions.
   from_prefs = prefs->GetActivePermissions(extension->id());
-  ASSERT_EQ(*active_permissions, *from_prefs);
+  ASSERT_EQ(*active_permissions.get(), *from_prefs.get());
 
   from_prefs = prefs->GetGrantedPermissions(extension->id());
-  ASSERT_EQ(*granted_permissions, *from_prefs);
+  ASSERT_EQ(*granted_permissions.get(), *from_prefs.get());
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/requirements_checker.cc b/chrome/browser/extensions/requirements_checker.cc
index f6f7b3f..5c2f557 100644
--- a/chrome/browser/extensions/requirements_checker.cc
+++ b/chrome/browser/extensions/requirements_checker.cc
@@ -35,7 +35,7 @@ void RequirementsChecker::Check(scoped_refptr<const Extension> extension,
 
   callback_ = callback;
   const RequirementsInfo& requirements =
-      RequirementsInfo::GetRequirements(extension);
+      RequirementsInfo::GetRequirements(extension.get());
 
   if (requirements.npapi) {
 #if defined(OS_CHROMEOS)
@@ -75,9 +75,9 @@ void RequirementsChecker::Check(scoped_refptr<const Extension> extension,
   }
   // Running the GPU checkers down here removes any race condition that arises
   // from the use of pending_requirement_checks_.
-  if (webgl_checker_)
+  if (webgl_checker_.get())
     webgl_checker_->CheckGPUFeatureAvailability();
-  if (css3d_checker_)
+  if (css3d_checker_.get())
     css3d_checker_->CheckGPUFeatureAvailability();
 }
 
diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc
index b0a4ee7..d32455d 100644
--- a/chrome/browser/extensions/sandboxed_unpacker.cc
+++ b/chrome/browser/extensions/sandboxed_unpacker.cc
@@ -328,8 +328,8 @@ void SandboxedUnpacker::OnProcessCrashed(int exit_code) {
 
 void SandboxedUnpacker::StartProcessOnIOThread(
     const base::FilePath& temp_crx_path) {
-  UtilityProcessHost* host = UtilityProcessHost::Create(
-      this, unpacker_io_task_runner_);
+  UtilityProcessHost* host =
+      UtilityProcessHost::Create(this, unpacker_io_task_runner_.get());
   // Grant the subprocess access to the entire subdir the extension file is
   // in, so that it can unpack to that dir.
   host->SetExposedDir(temp_crx_path.DirName());
@@ -375,11 +375,9 @@ void SandboxedUnpacker::OnUnpackExtensionSucceeded(
       Extension::REQUIRE_KEY | creation_flags_,
       &utf8_error);
 
-
-  if (!extension_) {
-    ReportFailure(
-        INVALID_MANIFEST,
-        ASCIIToUTF16("Manifest is invalid: " + utf8_error));
+  if (!extension_.get()) {
+    ReportFailure(INVALID_MANIFEST,
+                  ASCIIToUTF16("Manifest is invalid: " + utf8_error));
     return;
   }
 
@@ -582,10 +580,8 @@ void SandboxedUnpacker::ReportSuccess(
       crx_path_, base::TimeTicks::Now() - unpack_start_time_);
 
   // Client takes ownership of temporary directory and extension.
-  client_->OnUnpackSuccess(temp_dir_.Take(),
-                           extension_root_,
-                           &original_manifest,
-                           extension_);
+  client_->OnUnpackSuccess(
+      temp_dir_.Take(), extension_root_, &original_manifest, extension_.get());
   extension_ = NULL;
 }
 
@@ -642,7 +638,7 @@ bool SandboxedUnpacker::RewriteImageFiles() {
   // out our own versions of the parsed images, and we want to make sure the
   // originals are gone for good.
   std::set<base::FilePath> image_paths =
-      extension_file_util::GetBrowserImagePaths(extension_);
+      extension_file_util::GetBrowserImagePaths(extension_.get());
   if (image_paths.size() != images.size()) {
     // Decoded images don't match what's in the manifest.
     ReportFailure(
diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc
index ee17b94..14ada07 100644
--- a/chrome/browser/extensions/script_badge_controller_unittest.cc
+++ b/chrome/browser/extensions/script_badge_controller_unittest.cc
@@ -85,7 +85,7 @@ class ScriptBadgeControllerTest : public ChromeRenderViewHostTestHarness {
             .Set("page_action", DictionaryBuilder()
                 .Set("default_title", "Hello")))
         .Build();
-    extension_service_->AddExtension(extension);
+    extension_service_->AddExtension(extension.get());
     return extension;
   }
 
@@ -152,7 +152,7 @@ TEST_F(ScriptBadgeControllerTest, ExecutionMakesBadgeVisible) {
       web_contents()->GetController().GetActiveEntry()->GetPageID(),
       GURL(std::string()));
   EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
-              testing::ElementsAre(GetScriptBadge(*extension)));
+              testing::ElementsAre(GetScriptBadge(*extension.get())));
   EXPECT_THAT(location_bar_updated.events, testing::Gt(0));
 };
 
@@ -182,7 +182,7 @@ TEST_F(ScriptBadgeControllerTest, FragmentNavigation) {
         GURL(std::string()));
 
     EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
-                testing::ElementsAre(GetScriptBadge(*extension)));
+                testing::ElementsAre(GetScriptBadge(*extension.get())));
     EXPECT_EQ(1, location_bar_updated.events);
   }
 
@@ -198,7 +198,7 @@ TEST_F(ScriptBadgeControllerTest, FragmentNavigation) {
     NavigateAndCommit(GURL("http://www.google.com#hash"));
 
     EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
-              testing::ElementsAre(GetScriptBadge(*extension)));
+                testing::ElementsAre(GetScriptBadge(*extension.get())));
     EXPECT_EQ(0, location_bar_updated.events);
   }
 
@@ -230,7 +230,7 @@ TEST_F(ScriptBadgeControllerTest, GetAttentionMakesBadgeVisible) {
                    .Set("permissions", ListBuilder()
                         .Append("tabs")))
       .Build();
-  extension_service_->AddExtension(extension);
+  extension_service_->AddExtension(extension.get());
 
   // Establish a page id.
   NavigateAndCommit(GURL("http://www.google.com"));
@@ -251,7 +251,7 @@ TEST_F(ScriptBadgeControllerTest, GetAttentionMakesBadgeVisible) {
   script_badge_controller_->GetAttentionFor(extension->id());
 
   EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
-              testing::ElementsAre(GetScriptBadge(*extension)));
+              testing::ElementsAre(GetScriptBadge(*extension.get())));
   EXPECT_THAT(initial_badge_display.events, testing::Gt(0));
 
   CountingNotificationObserver subsequent_get_attention_call;
@@ -264,7 +264,7 @@ TEST_F(ScriptBadgeControllerTest, GetAttentionMakesBadgeVisible) {
   script_badge_controller_->GetAttentionFor(extension->id());
 
   EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
-              testing::ElementsAre(GetScriptBadge(*extension)));
+              testing::ElementsAre(GetScriptBadge(*extension.get())));
   EXPECT_EQ(0, subsequent_get_attention_call.events);
 };
 
diff --git a/chrome/browser/extensions/script_bubble_controller_unittest.cc b/chrome/browser/extensions/script_bubble_controller_unittest.cc
index 36fe5b9..f76b65c 100644
--- a/chrome/browser/extensions/script_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/script_bubble_controller_unittest.cc
@@ -119,9 +119,9 @@ TEST_F(ScriptBubbleControllerTest, Basics) {
                         .Append("activeTab")))
       .Build();
 
-  extension_service_->AddExtension(extension1);
-  extension_service_->AddExtension(extension2);
-  extension_service_->AddExtension(extension3);
+  extension_service_->AddExtension(extension1.get());
+  extension_service_->AddExtension(extension2.get());
+  extension_service_->AddExtension(extension3.get());
 
   EXPECT_EQ(0u, script_bubble_controller_->extensions_running_scripts().size());
 
diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc
index 80c2837..0ec0f8b 100644
--- a/chrome/browser/extensions/startup_helper.cc
+++ b/chrome/browser/extensions/startup_helper.cc
@@ -143,7 +143,7 @@ class ValidateCrxHelper : public SandboxedUnpackerClient {
                               Manifest::INTERNAL,
                               0, /* no special creation flags */
                               temp_dir_,
-                              file_thread_proxy,
+                              file_thread_proxy.get(),
                               this));
     unpacker->Start();
   }
@@ -337,7 +337,7 @@ std::string StartupHelper::WebStoreIdFromLimitedInstallCmdLine(
 }
 
 StartupHelper::~StartupHelper() {
-  if (pack_job_)
+  if (pack_job_.get())
     pack_job_->ClearClient();
 }
 
diff --git a/chrome/browser/extensions/test_extension_environment.cc b/chrome/browser/extensions/test_extension_environment.cc
index 4ff5e93..8cc3bc3 100644
--- a/chrome/browser/extensions/test_extension_environment.cc
+++ b/chrome/browser/extensions/test_extension_environment.cc
@@ -73,7 +73,7 @@ const Extension* TestExtensionEnvironment::MakeExtension(
 
   scoped_refptr<Extension> result =
       ExtensionBuilder().SetManifest(manifest.Pass()).Build();
-  GetExtensionService()->AddExtension(result);
+  GetExtensionService()->AddExtension(result.get());
   return result.get();
 }
 
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index 07e4b5a..64699ec 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -84,7 +84,7 @@ TestExtensionPrefs::pref_registry() {
 
 void TestExtensionPrefs::ResetPrefRegistry() {
   pref_registry_ = new user_prefs::PrefRegistrySyncable;
-  ExtensionPrefs::RegisterUserPrefs(pref_registry_);
+  ExtensionPrefs::RegisterUserPrefs(pref_registry_.get());
 }
 
 void TestExtensionPrefs::RecreateExtensionPrefs() {
@@ -106,10 +106,10 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
 
   extension_pref_value_map_.reset(new ExtensionPrefValueMap);
   PrefServiceMockBuilder builder;
-  builder.WithUserFilePrefs(preferences_file_, task_runner_);
+  builder.WithUserFilePrefs(preferences_file_, task_runner_.get());
   builder.WithExtensionPrefs(
       new ExtensionPrefStore(extension_pref_value_map_.get(), false));
-  pref_service_.reset(builder.CreateSyncable(pref_registry_));
+  pref_service_.reset(builder.CreateSyncable(pref_registry_.get()));
 
   prefs_.reset(ExtensionPrefs::Create(
       pref_service_.get(),
@@ -156,12 +156,13 @@ scoped_refptr<Extension> TestExtensionPrefs::AddExtensionWithManifestAndFlags(
   std::string errors;
   scoped_refptr<Extension> extension = Extension::Create(
       path, location, manifest, extra_flags, &errors);
-  EXPECT_TRUE(extension) << errors;
-  if (!extension)
+  EXPECT_TRUE(extension.get()) << errors;
+  if (!extension.get())
     return NULL;
 
   EXPECT_TRUE(Extension::IdIsValid(extension->id()));
-  prefs_->OnExtensionInstalled(extension, Extension::ENABLED,
+  prefs_->OnExtensionInstalled(extension.get(),
+                               Extension::ENABLED,
                                syncer::StringOrdinal::CreateInitialOrdinal());
   return extension;
 }
diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc
index 0d73ed6..6faa7f1 100644
--- a/chrome/browser/extensions/unpacked_installer.cc
+++ b/chrome/browser/extensions/unpacked_installer.cc
@@ -67,7 +67,7 @@ SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() {
 void SimpleExtensionLoadPrompt::ShowPrompt() {
   install_ui_->ConfirmInstall(
       this,
-      extension_,
+      extension_.get(),
       ExtensionInstallPrompt::GetDefaultShowDialogCallback());
 }
 
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index edd4281..b00f2e9 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -251,7 +251,7 @@ class MockService : public TestExtensionService {
         manifest.SetString(extension_manifest_keys::kUpdateURL, *update_url);
       scoped_refptr<Extension> e =
           prefs_->AddExtensionWithManifest(manifest, location);
-      ASSERT_TRUE(e != NULL);
+      ASSERT_TRUE(e.get() != NULL);
       list->push_back(e);
     }
   }
@@ -689,7 +689,7 @@ class ExtensionUpdaterTest : public testing::Test {
     const std::string& id = extensions[0]->id();
     EXPECT_CALL(delegate, GetPingDataForExtension(id, _));
 
-    downloader.AddExtension(*extensions[0], 0);
+    downloader.AddExtension(*extensions[0].get(), 0);
     downloader.StartAllPending();
     net::TestURLFetcher* fetcher =
         factory.GetFetcherByID(ExtensionDownloader::kManifestFetcherId);
@@ -1447,7 +1447,7 @@ class ExtensionUpdaterTest : public testing::Test {
         new ExtensionDownloader(&updater, service.request_context()));
 
     ManifestFetchData fetch_data(update_url, 0);
-    const Extension* extension = tmp[0];
+    const Extension* extension = tmp[0].get();
     fetch_data.AddExtension(extension->id(),
                             extension->VersionString(),
                             &kNeverPingedData,
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index 9be695f..5de1010 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -325,7 +325,7 @@ UserScriptMaster::UserScriptMaster(Profile* profile)
 }
 
 UserScriptMaster::~UserScriptMaster() {
-  if (script_reloader_)
+  if (script_reloader_.get())
     script_reloader_->DisownMaster();
 }
 
@@ -417,7 +417,7 @@ void UserScriptMaster::Observe(int type,
   }
 
   if (should_start_load) {
-    if (script_reloader_) {
+    if (script_reloader_.get()) {
       pending_load_ = true;
     } else {
       StartLoad();
@@ -426,7 +426,7 @@ void UserScriptMaster::Observe(int type,
 }
 
 void UserScriptMaster::StartLoad() {
-  if (!script_reloader_)
+  if (!script_reloader_.get())
     script_reloader_ = new ScriptReloader(this);
 
   script_reloader_->StartLoad(user_scripts_, extensions_info_);
diff --git a/chrome/browser/extensions/web_view_browsertest.cc b/chrome/browser/extensions/web_view_browsertest.cc
index 7601c8d..ace1bcd 100644
--- a/chrome/browser/extensions/web_view_browsertest.cc
+++ b/chrome/browser/extensions/web_view_browsertest.cc
@@ -42,7 +42,7 @@ class MockWebContentsDelegate : public content::WebContentsDelegate {
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) OVERRIDE {
     requested_ = true;
-    if (message_loop_runner_)
+    if (message_loop_runner_.get())
       message_loop_runner_->Quit();
   }
 
@@ -103,7 +103,7 @@ class MockDownloadWebContentsDelegate : public content::WebContentsDelegate {
 
     if (waiting_for_decision_) {
       EXPECT_EQ(expect_allow_, allow);
-      if (message_loop_runner_)
+      if (message_loop_runner_.get())
         message_loop_runner_->Quit();
       return;
     }
diff --git a/chrome/browser/extensions/web_view_interactive_browsertest.cc b/chrome/browser/extensions/web_view_interactive_browsertest.cc
index 315d923..3f93b96 100644
--- a/chrome/browser/extensions/web_view_interactive_browsertest.cc
+++ b/chrome/browser/extensions/web_view_interactive_browsertest.cc
@@ -181,7 +181,7 @@ class WebViewInteractiveTest
    private:
     void CreatedCallback(content::RenderWidgetHost* rwh) {
       last_render_widget_host_ = rwh;
-      if (message_loop_)
+      if (message_loop_.get())
         message_loop_->Quit();
       else
         created_ = true;
diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc
index 591cefe..8508281 100644
--- a/chrome/browser/extensions/webstore_standalone_installer.cc
+++ b/chrome/browser/extensions/webstore_standalone_installer.cc
@@ -261,16 +261,14 @@ WebstoreStandaloneInstaller::CreateInstallUI() {
           localized_name_,
           localized_description_,
           &error);
-  if (!localized_extension_for_display_) {
+  if (!localized_extension_for_display_.get()) {
     CompleteInstall(kInvalidManifestError);
     return;
   }
 
   install_ui_.reset(new ExtensionInstallPrompt(GetWebContents()));
-  install_ui_->ConfirmStandaloneInstall(this,
-                                        localized_extension_for_display_,
-                                        &icon_,
-                                        *install_prompt_);
+  install_ui_->ConfirmStandaloneInstall(
+      this, localized_extension_for_display_.get(), &icon_, *install_prompt_);
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
index d55ac8b..0f916fb 100644
--- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
+++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
@@ -219,7 +219,7 @@ IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerTest, InstallFromHostedApp) {
                   .Set("web_url", kInstallUrl.spec())))
           .Set("manifest_version", 2))
       .Build();
-  ASSERT_TRUE(hosted_app);
+  ASSERT_TRUE(hosted_app.get());
 
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(browser()->profile())->
author	rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2013-06-02 21:15:09 +0000
committer	rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2013-06-02 21:15:09 +0000
commit	dc24976fc87171d50b49f37bbaaa23ae53e51f4b (patch)
tree	8d7c684afa0d65e22efc3384197ef5b50d867160
parent	fc72bb18b111ff63e57135d97de6d59291f3b7b8 (diff)
download	chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.zip chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.gz chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.bz2