Un-refcount AutofillWebData and TokenWebData

chrome/browser/sync/test/integration/autofill_helper.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 "chrome/browser/sync/test/integration/autofill_helper.h"
 
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
@@ skipping 16 matching lines @@
 using autofill::AutofillKey;
 using autofill::AutofillProfile;
 using autofill::AutofillTable;
 using autofill::AutofillType;
 using autofill::AutofillWebDataService;
 using autofill::AutofillWebDataServiceObserverOnDBThread;
 using autofill::CreditCard;
 using autofill::FormFieldData;
 using autofill::PersonalDataManager;
 using autofill::PersonalDataManagerObserver;
+using base::Bind;
+using base::Unretained;
 using base::WaitableEvent;
 using content::BrowserThread;
 using sync_datatype_helper::test;
 using testing::_;
 
 namespace {
 
 ACTION_P(SignalEvent, event) {
   event->Signal();
 }
@@ skipping 26 matching lines @@
   done_event.Wait();
 }
 
 void RemoveKeyDontBlockForSync(int profile, const AutofillKey& key) {
   WaitableEvent done_event(false, false);
 
   MockWebDataServiceObserver mock_observer;
   EXPECT_CALL(mock_observer, AutofillEntriesChanged(_))
       .WillOnce(SignalEvent(&done_event));
 
-  scoped_refptr<AutofillWebDataService> wds =
+  AutofillWebDataService* wds =
       autofill_helper::GetWebDataService(profile);
 
   void(AutofillWebDataService::*add_observer_func)(
       AutofillWebDataServiceObserverOnDBThread*) =
       &AutofillWebDataService::AddObserver;
-  RunOnDBThreadAndBlock(Bind(add_observer_func, wds, &mock_observer));
+  RunOnDBThreadAndBlock(Bind(add_observer_func,
+                             Unretained(wds),
+                             &mock_observer));
 
   wds->RemoveFormValueForElementName(key.name(), key.value());
   done_event.Wait();
 
   void(AutofillWebDataService::*remove_observer_func)(
       AutofillWebDataServiceObserverOnDBThread*) =
       &AutofillWebDataService::RemoveObserver;
-  RunOnDBThreadAndBlock(Bind(remove_observer_func, wds, &mock_observer));
+  RunOnDBThreadAndBlock(Bind(remove_observer_func,
+                             Unretained(wds),
+                             &mock_observer));
 }
 
 void GetAllAutofillEntriesOnDBThread(AutofillWebDataService* wds,
                                      std::vector<AutofillEntry>* entries) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   AutofillTable::FromWebDatabase(
       wds->GetDatabase())->GetAllAutofillEntries(entries);
 }
 
 std::vector<AutofillEntry> GetAllAutofillEntries(AutofillWebDataService* wds) {
@@ skipping 48 matching lines @@
       break;
     case PROFILE_NULL:
       autofill::test::SetProfileInfoWithGuid(&profile,
           "FE461507-7E13-4198-8E66-74C7DB6D8322",
           "", "", "", "", "", "", "", "", "", "", "", "");
       break;
   }
   return profile;
 }
 
-scoped_refptr<AutofillWebDataService> GetWebDataService(int index) {
+AutofillWebDataService* GetWebDataService(int index) {
   return AutofillWebDataService::FromBrowserContext(test()->GetProfile(index));
 }
 
 PersonalDataManager* GetPersonalDataManager(int index) {
   return autofill::PersonalDataManagerFactory::GetForProfile(
       test()->GetProfile(index));
 }
 
 void AddKeys(int profile, const std::set<AutofillKey>& keys) {
   std::vector<FormFieldData> form_fields;
   for (std::set<AutofillKey>::const_iterator i = keys.begin();
        i != keys.end();
        ++i) {
     FormFieldData field;
     field.name = i->name();
     field.value = i->value();
     form_fields.push_back(field);
   }
 
   WaitableEvent done_event(false, false);
   MockWebDataServiceObserver mock_observer;
   EXPECT_CALL(mock_observer, AutofillEntriesChanged(_))
       .WillOnce(SignalEvent(&done_event));
 
-  scoped_refptr<AutofillWebDataService> wds = GetWebDataService(profile);
+  AutofillWebDataService* wds = GetWebDataService(profile);
 
   void(AutofillWebDataService::*add_observer_func)(
       AutofillWebDataServiceObserverOnDBThread*) =
       &AutofillWebDataService::AddObserver;
-  RunOnDBThreadAndBlock(Bind(add_observer_func, wds, &mock_observer));
+  RunOnDBThreadAndBlock(Bind(add_observer_func,
+                             Unretained(wds),
+                             &mock_observer));
 
   wds->AddFormFields(form_fields);
   done_event.Wait();
   BlockForPendingDBThreadTasks();
 
   void(AutofillWebDataService::*remove_observer_func)(
       AutofillWebDataServiceObserverOnDBThread*) =
       &AutofillWebDataService::RemoveObserver;
-  RunOnDBThreadAndBlock(Bind(remove_observer_func, wds, &mock_observer));
+  RunOnDBThreadAndBlock(Bind(remove_observer_func,
+                             Unretained(wds),
+                             &mock_observer));
 }
 
 void RemoveKey(int profile, const AutofillKey& key) {
   RemoveKeyDontBlockForSync(profile, key);
   BlockForPendingDBThreadTasks();
 }
 
 void RemoveKeys(int profile) {
   std::set<AutofillEntry> keys = GetAllKeys(profile);
   for (std::set<AutofillEntry>::const_iterator it = keys.begin();
        it != keys.end(); ++it) {
     RemoveKeyDontBlockForSync(profile, it->key());
   }
   BlockForPendingDBThreadTasks();
 }
 
 std::set<AutofillEntry> GetAllKeys(int profile) {
-  scoped_refptr<AutofillWebDataService> wds = GetWebDataService(profile);
-  std::vector<AutofillEntry> all_entries = GetAllAutofillEntries(wds.get());
+  AutofillWebDataService* wds = GetWebDataService(profile);
+  std::vector<AutofillEntry> all_entries = GetAllAutofillEntries(wds);
   std::set<AutofillEntry> all_keys;
   for (std::vector<AutofillEntry>::const_iterator it = all_entries.begin();
        it != all_entries.end(); ++it) {
     all_keys.insert(*it);
   }
   return all_keys;
 }
 
 bool KeysMatch(int profile_a, int profile_b) {
   return GetAllKeys(profile_a) == GetAllKeys(profile_b);
@@ skipping 115 matching lines @@
     if (!ProfilesMatch(0, i)) {
       LOG(ERROR) << "Profile " << i << "does not contain the same autofill "
                                        "profiles as profile 0.";
       return false;
     }
   }
   return true;
 }
 
 }  // namespace autofill_helper