Profile shouldn't own PersonalDataManager

chrome/browser/ui/webui/options/autofill_options_handler.cc

 // Copyright (c) 2011 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/ui/webui/options/autofill_options_handler.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
+#include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/guid.h"
 #include "grit/generated_resources.h"
 #include "grit/webkit_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
@@ skipping 190 matching lines @@
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "autofillOptionsPage",
                 IDS_AUTOFILL_OPTIONS_TITLE);
 
   SetAddressOverlayStrings(localized_strings);
   SetCreditCardOverlayStrings(localized_strings);
 }
 
 void AutofillOptionsHandler::Initialize() {
-  personal_data_ = Profile::FromWebUI(web_ui_)->GetPersonalDataManager();
+  personal_data_ = PersonalDataManagerFactory::GetForProfile(
+      Profile::FromWebUI(web_ui_));
   personal_data_->SetObserver(this);
 
   LoadAutofillData();
 }
 
 void AutofillOptionsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback(
       "removeAddress",
       NewCallback(this, &AutofillOptionsHandler::RemoveAddress));
   web_ui_->RegisterMessageCallback(
@@ skipping 277 matching lines @@
 void AutofillOptionsHandler::ValidatePhoneNumbers(const ListValue* args) {
   if (!personal_data_->IsDataLoaded())
     return;
 
   ListValue* list_value = NULL;
   ValidatePhoneArguments(args, &list_value);
 
   web_ui_->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }