AutoFill: Make PersonalDataManager RefCountedThreadSafe.

chrome/browser/autofill/personal_data_manager_unittest.cc

 // Copyright (c) 2010 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 "base/basictypes.h"
 #include "base/message_loop.h"
+#include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autofill/autofill_common_unittest.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer_mock.h"
 #include "chrome/common/notification_registrar.h"
@@ skipping 37 matching lines @@
   virtual void TearDown() {
     if (profile_.get())
       profile_.reset(NULL);
 
     db_thread_.Stop();
     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask);
     MessageLoop::current()->Run();
   }
 
   void ResetPersonalDataManager() {
-    personal_data_.reset(new PersonalDataManager());
+    personal_data_ = new PersonalDataManager();
     personal_data_->Init(profile_.get());
     personal_data_->SetObserver(&personal_data_observer_);
 
     // Disable auxiliary profiles for unit testing.  These reach out to system
     // services on the Mac.
     profile_->GetPrefs()->SetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled, false);
   }
 
   AutoFillProfile* MakeProfile() {
     AutoLock lock(personal_data_->unique_ids_lock_);
     return new AutoFillProfile(string16(),
         personal_data_->CreateNextUniqueID(
         &personal_data_->unique_profile_ids_));
   }
 
   MessageLoopForUI message_loop_;
   ChromeThread ui_thread_;
   ChromeThread db_thread_;
   scoped_ptr<TestingProfile> profile_;
-  scoped_ptr<PersonalDataManager> personal_data_;
+  scoped_refptr<PersonalDataManager> personal_data_;
   NotificationRegistrar registrar_;
   NotificationObserverMock observer_;
   PersonalDataLoadedObserverMock personal_data_observer_;
 };
 
 // TODO(jhawkins): Test SetProfiles w/out a WebDataService in the profile.
 TEST_F(PersonalDataManagerTest, SetProfiles) {
   AutoFillProfile profile0(string16(), 0);
   autofill_unittest::SetProfileInfo(&profile0,
       "Billing", "Marion", "Mitchell", "Morrison",
@@ skipping 534 matching lines @@
 
   const std::vector<CreditCard*>& results = personal_data_->credit_cards();
   ASSERT_EQ(6U, results.size());
   EXPECT_EQ(ASCIIToUTF16("Home"), results[0]->Label());
   EXPECT_EQ(ASCIIToUTF16("Home2"), results[1]->Label());
   EXPECT_EQ(ASCIIToUTF16("Home3"), results[2]->Label());
   EXPECT_EQ(ASCIIToUTF16("NotHome"), results[3]->Label());
   EXPECT_EQ(ASCIIToUTF16("Work"), results[4]->Label());
   EXPECT_EQ(ASCIIToUTF16("Work2"), results[5]->Label());
 }