Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

chrome/browser/autofill/personal_data_manager_factory.cc

 // 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.
 
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 
 namespace autofill {
 namespace {
 
 class PersonalDataManagerServiceImpl : public PersonalDataManagerService {
  public:
   explicit PersonalDataManagerServiceImpl(Profile* profile);
   virtual ~PersonalDataManagerServiceImpl();
 
   // PersonalDataManagerService:
   virtual void Shutdown() OVERRIDE;
   virtual PersonalDataManager* GetPersonalDataManager() OVERRIDE;
 
  private:
   scoped_ptr<PersonalDataManager> personal_data_manager_;
 };
 
 PersonalDataManagerServiceImpl::PersonalDataManagerServiceImpl(
     Profile* profile) {
   personal_data_manager_.reset(new PersonalDataManager(
       g_browser_process->GetApplicationLocale()));
-  personal_data_manager_->Init(profile,
-                               profile->GetPrefs(),
-                               profile->IsOffTheRecord());
+  personal_data_manager_->Init(
+      AutofillWebDataService::FromBrowserContext(profile),

[blundell, 2013/11/13 22:59:07]

The reason that I didn't change PersonalDataManager::Init() to take in the
AutofillManagerDelegate* (as we had discussed on a previous CL IIRC) is that it
didn't seem straightforward to get at the AutofillManagerDelegate* here, unless
I'm missing something.

[Ilya Sherman, 2013/11/14 02:22:02]

Hmm, I see -- the PersonalDataManager is per-profile rather than
per-WebContents, which makes it hard for it to interface with the AutofillDriver
and AutofillManagerDelegate.  Alright, this seems fine in that case.

+      profile->GetPrefs(),
+      profile->IsOffTheRecord());
 }
 
 PersonalDataManagerServiceImpl::~PersonalDataManagerServiceImpl() {}
 
 void PersonalDataManagerServiceImpl::Shutdown() {
   personal_data_manager_.reset();
 }
 
 PersonalDataManager* PersonalDataManagerServiceImpl::GetPersonalDataManager() {
   return personal_data_manager_.get();
@@ skipping 36 matching lines @@
       new PersonalDataManagerServiceImpl(static_cast<Profile*>(profile));
   return service;
 }
 
 content::BrowserContext* PersonalDataManagerFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
 }  // namespace autofill