Fix search engine automation hooks to work with multiple profiles.

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 3243 matching lines @@
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   TemplateURLService* url_model =
       TemplateURLServiceFactory::GetForProfile(browser->profile());
   if (url_model->loaded()) {
     AutomationJSONReply(this, reply_message).SendSuccess(NULL);
     return;
   }
   url_model->AddObserver(new AutomationProviderSearchEngineObserver(
-      this, reply_message));
+      this, browser->profile(), reply_message));
   url_model->Load();
 }
 
 // Sample JSON input { "command": "GetSearchEngineInfo" }
 // Refer to pyauto.py for sample output.
 void TestingAutomationProvider::GetSearchEngineInfo(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   TemplateURLService* url_model =
@@ skipping 48 matching lines @@
       new KeywordEditorController(browser->profile()));
   if (args->GetString("keyword", &keyword)) {
     const TemplateURL* template_url(
         url_model->GetTemplateURLForKeyword(UTF8ToUTF16(keyword)));
     if (template_url == NULL) {
       AutomationJSONReply(this, reply_message).SendError(
           "No match for keyword: " + keyword);
       return;
     }
     url_model->AddObserver(new AutomationProviderSearchEngineObserver(
-        this, reply_message));
+        this, browser->profile(), reply_message));
     controller->ModifyTemplateURL(template_url, new_title, new_keyword,
                                   new_ref_url);
   } else {
     url_model->AddObserver(new AutomationProviderSearchEngineObserver(
-        this, reply_message));
+        this, browser->profile(), reply_message));
     controller->AddTemplateURL(new_title, new_keyword, new_ref_url);
   }
 }
 
 // Sample json input: { "command": "PerformActionOnSearchEngine",
 //                      "keyword": keyword, "action": action }
 void TestingAutomationProvider::PerformActionOnSearchEngine(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   TemplateURLService* url_model =
       TemplateURLServiceFactory::GetForProfile(browser->profile());
   std::string keyword;
   std::string action;
   if (!args->GetString("keyword", &keyword) ||
       !args->GetString("action", &action)) {
     AutomationJSONReply(this, reply_message).SendError(
         "One or more inputs invalid");
     return;
   }
   const TemplateURL* template_url(
       url_model->GetTemplateURLForKeyword(UTF8ToUTF16(keyword)));
   if (template_url == NULL) {
     AutomationJSONReply(this, reply_message).SendError(
         "No match for keyword: " + keyword);
     return;
   }
   if (action == "delete") {
     url_model->AddObserver(new AutomationProviderSearchEngineObserver(
-      this, reply_message));
+      this, browser->profile(), reply_message));
     url_model->Remove(template_url);
   } else if (action == "default") {
     url_model->AddObserver(new AutomationProviderSearchEngineObserver(
-      this, reply_message));
+      this, browser->profile(), reply_message));
     url_model->SetDefaultSearchProvider(template_url);
   } else {
     AutomationJSONReply(this, reply_message).SendError(
         "Invalid action: " + action);
   }
 }
 
 #if defined(ENABLE_PROTECTOR_SERVICE)
 // Sample json output: { "enabled": true,
 //                       "showing_change": false }
@@ skipping 3694 matching lines @@
       *browser_handle = browser_tracker_->Add(browser);
       *success = true;
     }
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }