Un-refcount AutofillWebData and TokenWebData

chrome/browser/webdata/web_data_service_factory.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 CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_FACTORY_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_FACTORY_H__
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
 #include "components/webdata/common/web_database_service.h"
 
 class TokenWebData;
 class WebDataService;
 
 namespace autofill {
 class AutofillWebDataService;
 }  // namespace autofill
 
 // A wrapper of WebDataService so that we can use it as a profile keyed service.
 class WebDataServiceWrapper : public BrowserContextKeyedService {
  public:
   explicit WebDataServiceWrapper(Profile* profile);
 
   // For testing.
   WebDataServiceWrapper();
 
   virtual ~WebDataServiceWrapper();
 
   // BrowserContextKeyedService:
   virtual void Shutdown() OVERRIDE;
 
-  virtual scoped_refptr<autofill::AutofillWebDataService> GetAutofillWebData();
+  virtual autofill::AutofillWebDataService* GetAutofillWebData();
 
   virtual scoped_refptr<WebDataService> GetWebData();
 
-  virtual scoped_refptr<TokenWebData> GetTokenWebData();
+  virtual TokenWebData* GetTokenWebData();
 
  private:
   scoped_refptr<WebDatabaseService> web_database_;
 
-  scoped_refptr<autofill::AutofillWebDataService> autofill_web_data_;
-  scoped_refptr<TokenWebData> token_web_data_;
+  scoped_ptr<autofill::AutofillWebDataService> autofill_web_data_;
+  scoped_ptr<TokenWebData> token_web_data_;
   scoped_refptr<WebDataService> web_data_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDataServiceWrapper);
 };
 
 // Singleton that owns all WebDataServiceWrappers and associates them with
 // Profiles.
 class WebDataServiceFactory : public BrowserContextKeyedServiceFactory {
  public:
   // Returns the |WebDataServiceWrapper| associated with the |profile|.
@@ skipping 17 matching lines @@
   virtual content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const OVERRIDE;
   virtual BrowserContextKeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const OVERRIDE;
   virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(WebDataServiceFactory);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_FACTORY_H__