AutoFill: Make PersonalDataManager RefCountedThreadSafe.

chrome/browser/autofill/personal_data_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_PERSONAL_DATA_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_PERSONAL_DATA_MANAGER_H_
 
 #include <set>
 #include <vector>
 
+#include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/webdata/web_data_service.h"
 
 class AutoFillManager;
 class FormStructure;
 class Profile;
 
 // Handles loading and saving AutoFill profile information to the web database.
 // This class also stores the profiles loaded from the database for use during
 // AutoFill.
-class PersonalDataManager : public WebDataServiceConsumer,
-                            public AutoFillDialogObserver {
+class PersonalDataManager
+    : public WebDataServiceConsumer,
+      public AutoFillDialogObserver,
+      public base::RefCountedThreadSafe<PersonalDataManager> {
  public:
   // An interface the PersonalDataManager uses to notify its clients (observers)
   // when it has finished loading personal data from the web database.  Register
   // the observer via PersonalDataManager::SetObserver.
   class Observer {
    public:
     // Notifies the observer that the PersonalDataManager has finished loading.
     virtual void OnPersonalDataLoaded() = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
-  virtual ~PersonalDataManager();
-
   // WebDataServiceConsumer implementation:
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result);
 
   // AutoFillDialogObserver implementation:
   virtual void OnAutoFillDialogApply(std::vector<AutoFillProfile>* profiles,
                                      std::vector<CreditCard>* credit_cards);
 
   // Sets the listener to be notified of PersonalDataManager events.
   virtual void SetObserver(PersonalDataManager::Observer* observer);
@@ skipping 92 matching lines @@
   // the next call to Refresh.  It could get deleted before we
   // manage, but this is safe (we just hold on to the ID a bit longer).
   //
   // Also see SetProfile for more details.
   virtual void Refresh();
 
   // Kicks off asynchronous loading of profiles and credit cards.
   void Init(Profile* profile);
 
  protected:
-  // Make sure that only Profile and the PersonalDataManager tests can create an
-  // instance of PersonalDataManager.
+  // Make sure that only Profile and certain tests can create an instance of
+  // PersonalDataManager.
+  friend class base::RefCountedThreadSafe<PersonalDataManager>;
+  friend class PersonalDataManagerTest;
   friend class ProfileImpl;
-  friend class PersonalDataManagerTest;
+  friend class ProfileSyncServiceAutofillTest;
 
   PersonalDataManager();
+  ~PersonalDataManager();
 
   // Returns the profile of the tab contents.
   Profile* profile();
 
   // Initializes the object if needed.  This should be called at the beginning
   // of all the public functions to make sure that the object has been properly
   // initialized before use.
   virtual void InitializeIfNeeded();
 
   // This will create and reserve a new unique ID for a profile.
@@ skipping 79 matching lines @@
   WebDataService::Handle pending_profiles_query_;
   WebDataService::Handle pending_creditcards_query_;
 
   // The observers.  This can be empty.
   std::vector<PersonalDataManager::Observer*> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_PERSONAL_DATA_MANAGER_H_