Un-refcount AutofillWebData and TokenWebData

components/autofill/browser/personal_data_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 128 matching lines @@
       app_locale_(app_locale),
       metric_logger_(new AutofillMetrics),
       has_logged_profile_count_(false) {}
 
 void PersonalDataManager::Init(BrowserContext* browser_context) {
   browser_context_ = browser_context;
 
   if (!browser_context_->IsOffTheRecord())
     metric_logger_->LogIsAutofillEnabledAtStartup(IsAutofillEnabled());
 
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
 
   // WebDataService may not be available in tests.
-  if (!autofill_data.get())
+  if (!autofill_data)
     return;
 
   LoadProfiles();
   LoadCreditCards();
 
   autofill_data->AddObserver(this);
 }
 
 PersonalDataManager::~PersonalDataManager() {
   CancelPendingQuery(&pending_profiles_query_);
   CancelPendingQuery(&pending_creditcards_query_);
 
   if (!browser_context_)
     return;
 
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (autofill_data.get())
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (autofill_data)
     autofill_data->RemoveObserver(this);
 }
 
 void PersonalDataManager::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle h,
     const WDTypedResult* result) {
   DCHECK(pending_profiles_query_ || pending_creditcards_query_);
 
   if (!result) {
     // Error from the web database.
@@ skipping 186 matching lines @@
   if (browser_context_->IsOffTheRecord())
     return;
 
   if (profile.IsEmpty(app_locale_))
     return;
 
   // Don't add an existing profile.
   if (FindByGUID<AutofillProfile>(web_profiles_, profile.guid()))
     return;
 
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (!autofill_data.get())
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (!autofill_data)
     return;
 
   // Don't add a duplicate.
   if (FindByContents(web_profiles_, profile))
     return;
 
   // Add the new profile to the web database.
   autofill_data->AddAutofillProfile(profile);
 
   // Refresh our local cache and send notifications to observers.
@@ skipping 10 matching lines @@
 
   // Don't overwrite the origin for a profile that is already stored.
   if (existing_profile->Compare(profile) == 0)
     return;
 
   if (profile.IsEmpty(app_locale_)) {
     RemoveByGUID(profile.guid());
     return;
   }
 
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (!autofill_data.get())
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (!autofill_data)
     return;
 
   // Make the update.
   autofill_data->UpdateAutofillProfile(profile);
 
   // Refresh our local cache and send notifications to observers.
   Refresh();
 }
 
 AutofillProfile* PersonalDataManager::GetProfileByGUID(
@@ skipping 10 matching lines @@
 void PersonalDataManager::AddCreditCard(const CreditCard& credit_card) {
   if (browser_context_->IsOffTheRecord())
     return;
 
   if (credit_card.IsEmpty(app_locale_))
     return;
 
   if (FindByGUID<CreditCard>(credit_cards_, credit_card.guid()))
     return;
 
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (!autofill_data.get())
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (!autofill_data)
     return;
 
   // Don't add a duplicate.
   if (FindByContents(credit_cards_, credit_card))
     return;
 
   // Add the new credit card to the web database.
   autofill_data->AddCreditCard(credit_card);
 
   // Refresh our local cache and send notifications to observers.
@@ skipping 10 matching lines @@
 
   // Don't overwrite the origin for a credit card that is already stored.
   if (existing_credit_card->Compare(credit_card) == 0)
     return;
 
   if (credit_card.IsEmpty(app_locale_)) {
     RemoveByGUID(credit_card.guid());
     return;
   }
 
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (!autofill_data.get())
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (!autofill_data)
     return;
 
   // Make the update.
   autofill_data->UpdateCreditCard(credit_card);
 
   // Refresh our local cache and send notifications to observers.
   Refresh();
 }
 
 void PersonalDataManager::RemoveByGUID(const std::string& guid) {
   if (browser_context_->IsOffTheRecord())
     return;
 
   bool is_credit_card = FindByGUID<CreditCard>(credit_cards_, guid);
   bool is_profile = !is_credit_card &&
       FindByGUID<AutofillProfile>(web_profiles_, guid);
   if (!is_credit_card && !is_profile)
     return;
 
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (!autofill_data.get())
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (!autofill_data)
     return;
 
   if (is_credit_card)
     autofill_data->RemoveCreditCard(guid);
   else
     autofill_data->RemoveAutofillProfile(guid);
 
   // Refresh our local cache and send notifications to observers.
   Refresh();
 }
@@ skipping 265 matching lines @@
 
   // Ensure that profile labels are up to date.  Currently, sync relies on
   // labels to identify a profile.
   // TODO(dhollowa): We need to deprecate labels and update the way sync
   // identifies profiles.
   std::vector<AutofillProfile*> profile_pointers(profiles->size());
   std::transform(profiles->begin(), profiles->end(), profile_pointers.begin(),
       address_of<AutofillProfile>);
   AutofillProfile::AdjustInferredLabels(&profile_pointers);
 
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (!autofill_data.get())
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (!autofill_data)
     return;
 
   // Any profiles that are not in the new profile list should be removed from
   // the web database.
   for (std::vector<AutofillProfile*>::const_iterator iter =
            web_profiles_.begin();
        iter != web_profiles_.end(); ++iter) {
     if (!FindByGUID<AutofillProfile>(*profiles, (*iter)->guid()))
       autofill_data->RemoveAutofillProfile((*iter)->guid());
   }
@@ skipping 31 matching lines @@
 
   // Remove empty credit cards from input.
   for (std::vector<CreditCard>::iterator it = credit_cards->begin();
        it != credit_cards->end();) {
     if (it->IsEmpty(app_locale_))
       credit_cards->erase(it);
     else
       it++;
   }
 
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (!autofill_data.get())
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (!autofill_data)
     return;
 
   // Any credit cards that are not in the new credit card list should be
   // removed.
   for (std::vector<CreditCard*>::const_iterator iter = credit_cards_.begin();
        iter != credit_cards_.end(); ++iter) {
     if (!FindByGUID<CreditCard>(*credit_cards, (*iter)->guid()))
       autofill_data->RemoveCreditCard((*iter)->guid());
   }
 
@@ skipping 17 matching lines @@
   for (std::vector<CreditCard>::iterator iter = credit_cards->begin();
        iter != credit_cards->end(); ++iter) {
     credit_cards_.push_back(new CreditCard(*iter));
   }
 
   // Refresh our local cache and send notifications to observers.
   Refresh();
 }
 
 void PersonalDataManager::LoadProfiles() {
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (!autofill_data.get()) {
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (!autofill_data) {
     NOTREACHED();
     return;
   }
 
   CancelPendingQuery(&pending_profiles_query_);
 
   pending_profiles_query_ = autofill_data->GetAutofillProfiles(this);
 }
 
 // Win and Linux implementations do nothing. Mac and Android implementations
 // fill in the contents of |auxiliary_profiles_|.
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 void PersonalDataManager::LoadAuxiliaryProfiles() {
 }
 #endif
 
 void PersonalDataManager::LoadCreditCards() {
-  scoped_refptr<AutofillWebDataService> autofill_data(
-      AutofillWebDataService::FromBrowserContext(browser_context_));
-  if (!autofill_data.get()) {
+  AutofillWebDataService* autofill_data =
+      AutofillWebDataService::FromBrowserContext(browser_context_);
+  if (!autofill_data) {
     NOTREACHED();
     return;
   }
 
   CancelPendingQuery(&pending_creditcards_query_);
 
   pending_creditcards_query_ = autofill_data->GetCreditCards(this);
 }
 
 void PersonalDataManager::ReceiveLoadedProfiles(WebDataServiceBase::Handle h,
@@ skipping 28 matching lines @@
   std::vector<CreditCard*> credit_cards = r->GetValue();
   for (std::vector<CreditCard*>::iterator iter = credit_cards.begin();
        iter != credit_cards.end(); ++iter) {
     credit_cards_.push_back(*iter);
   }
 }
 
 void PersonalDataManager::CancelPendingQuery(
     WebDataServiceBase::Handle* handle) {
   if (*handle) {
-    scoped_refptr<AutofillWebDataService> autofill_data(
-        AutofillWebDataService::FromBrowserContext(browser_context_));
-    if (!autofill_data.get()) {
+    AutofillWebDataService* autofill_data =
+        AutofillWebDataService::FromBrowserContext(browser_context_);
+    if (!autofill_data) {
       NOTREACHED();
       return;
     }
     autofill_data->CancelRequest(*handle);
   }
   *handle = 0;
 }
 
 void PersonalDataManager::SaveImportedProfile(
     const AutofillProfile& imported_profile) {
@@ skipping 57 matching lines @@
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 void PersonalDataManager::set_browser_context(
     content::BrowserContext* context) {
   browser_context_ = context;
 }
 
 }  // namespace autofill