Eliminate AutofillWebDataService::FromBrowserContext().

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/singleton.h"
@@ skipping 35 matching lines @@
   scoped_refptr<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|.
-  // |access_type| is either EXPLICIT_ACCESS or IMPLICIT_ACCESS
-  // (see its definition).
+  // Returns the WebDataServiceWrapper associated with the |profile|.
   static WebDataServiceWrapper* GetForProfile(
-      Profile* profile, Profile::ServiceAccessType access_type);
+      Profile* profile,
+      Profile::ServiceAccessType access_type);
 
   static WebDataServiceWrapper* GetForProfileIfExists(
-      Profile* profile, Profile::ServiceAccessType access_type);
+      Profile* profile,
+      Profile::ServiceAccessType access_type);
+
+  // Returns the AutofillWebDataService associated with the |profile|.
+  static scoped_refptr<autofill::AutofillWebDataService>
+      GetAutofillWebDataForProfile(Profile* profile,
+                                   Profile::ServiceAccessType access_type);
 
   static WebDataServiceFactory* GetInstance();
 
  private:
   friend struct DefaultSingletonTraits<WebDataServiceFactory>;
 
   WebDataServiceFactory();
   virtual ~WebDataServiceFactory();
 
   // |BrowserContextKeyedBaseFactory| methods:
   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__