Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

chrome/browser/autofill/personal_data_manager_factory.cc

Index: chrome/browser/autofill/personal_data_manager_factory.cc
diff --git a/chrome/browser/autofill/personal_data_manager_factory.cc b/chrome/browser/autofill/personal_data_manager_factory.cc
index 076770e431ff6f31d90f409f6d345d22cfaae37b..1d318369d98f1a37d990dde6a0d8c583b1bd9e08 100644
--- a/chrome/browser/autofill/personal_data_manager_factory.cc
+++ b/chrome/browser/autofill/personal_data_manager_factory.cc
@@ -11,6 +11,7 @@
 #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 {
@@ -33,9 +34,10 @@ 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() {}