Profile shouldn't own PersonalDataManager

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autofill/autofill_manager.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/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/automation/automation_provider_observers.h"
 #include "chrome/browser/automation/automation_tab_tracker.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_storage.h"
@@ skipping 4349 matching lines @@
   // Get the AutofillProfiles currently in the database.
   int tab_index = 0;
   if (!args->GetInteger("tab_index", &tab_index)) {
     reply.SendError("Invalid or missing tab_index integer value.");
     return;
   }
 
   TabContentsWrapper* tab_contents =
       browser->GetTabContentsWrapperAt(tab_index);
   if (tab_contents) {
-    PersonalDataManager* pdm = tab_contents->profile()->GetOriginalProfile()
-        ->GetPersonalDataManager();
+    PersonalDataManager* pdm = PersonalDataManagerFactory::GetForProfile(
+        tab_contents->profile()->GetOriginalProfile());
     if (pdm) {
       std::vector<AutofillProfile*> autofill_profiles = pdm->profiles();
       std::vector<CreditCard*> credit_cards = pdm->credit_cards();
 
       ListValue* profiles = GetListFromAutofillProfiles(autofill_profiles);
       ListValue* cards = GetListFromCreditCards(credit_cards);
 
       scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
 
       return_value->Set("profiles", profiles);
@@ skipping 46 matching lines @@
     AutomationJSONReply(this, reply_message).SendError(
         "Invalid or missing tab_index integer");
     return;
   }
 
   TabContentsWrapper* tab_contents =
       browser->GetTabContentsWrapperAt(tab_index);
 
   if (tab_contents) {
     PersonalDataManager* pdm =
-        tab_contents->profile()->GetPersonalDataManager();
+        PersonalDataManagerFactory::GetForProfile(tab_contents->profile());
     if (pdm) {
       if (profiles || cards) {
         // This observer will delete itself.
         AutofillChangedObserver* observer = new AutofillChangedObserver(
             this, reply_message, autofill_profiles.size(), credit_cards.size());
         observer->Init();
 
         if (profiles)
           pdm->SetProfiles(&autofill_profiles);
         if (cards)
@@ skipping 39 matching lines @@
     AutomationJSONReply(this, reply_message)
         .SendError("'frame_xpath' missing or invalid.");
     return;
   }
   if (!args->GetString("javascript", &javascript)) {
     AutomationJSONReply(this, reply_message)
         .SendError("'javascript' missing or invalid.");
     return;
   }
 
-  PersonalDataManager* pdm = tab_contents->profile()->GetOriginalProfile()
-      ->GetPersonalDataManager();
+  PersonalDataManager* pdm = PersonalDataManagerFactory::GetForProfile(
+      tab_contents->profile()->GetOriginalProfile());
   if (!pdm) {
     AutomationJSONReply(this, reply_message)
         .SendError("No PersonalDataManager.");
     return;
   }
 
   // This observer will delete itself.
   new AutofillFormSubmittedObserver(this, reply_message, pdm);
 
   // Set the routing id of this message with the controller.
@@ skipping 1806 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }