Un-refcount AutofillWebData and TokenWebData

components/autofill/browser/webdata/autofill_webdata_service.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
 #define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 25 matching lines @@
 
 // API for Autofill web data.
 class AutofillWebDataService : public AutofillWebData,
                                public WebDataServiceBase {
  public:
   AutofillWebDataService();
 
   AutofillWebDataService(scoped_refptr<WebDatabaseService> wdbs,
                          const ProfileErrorCallback& callback);
 
+  virtual ~AutofillWebDataService();
+
   // Retrieve an AutofillWebDataService for the given context.
   // Can return NULL in some contexts.
-  static scoped_refptr<AutofillWebDataService> FromBrowserContext(
+  static AutofillWebDataService* FromBrowserContext(
       content::BrowserContext* context);
 
   // WebDataServiceBase implementation.
   virtual void ShutdownOnUIThread() OVERRIDE;
 
   // AutofillWebData implementation.
   virtual void AddFormFields(
       const std::vector<FormFieldData>& fields) OVERRIDE;
   virtual WebDataServiceBase::Handle GetFormValuesForElementName(
       const base::string16& name,
@@ skipping 35 matching lines @@
   // |ShutdownOnUIThread()| is called.
   base::SupportsUserData* GetDBUserData();
 
   // Takes a callback which will be called on the DB thread with a pointer to an
   // |AutofillWebdataBackend|. This backend can be used to access or update the
   // WebDatabase directly on the DB thread.
   void GetAutofillBackend(
       const base::Callback<void(AutofillWebDataBackend*)>& callback);
 
  protected:
-  virtual ~AutofillWebDataService();
-
   virtual void NotifyAutofillMultipleChangedOnUIThread();
 
   base::WeakPtr<AutofillWebDataService> AsWeakPtr() {
     return weak_ptr_factory_.GetWeakPtr();
   }
 
  private:
   ObserverList<AutofillWebDataServiceObserverOnUIThread> ui_observer_list_;
 
   // This factory is used on the UI thread. All vended weak pointers are
   // invalidated in ShutdownOnUIThread().
   base::WeakPtrFactory<AutofillWebDataService> weak_ptr_factory_;
 
   scoped_refptr<AutofillWebDataBackendImpl> autofill_backend_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillWebDataService);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_