Removal of Profile from content part 6.

chrome/browser/ui/webui/options/search_engine_manager_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/search_engine_manager_handler.h"
 
 #include "base/callback.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 enum EngineInfoIndexes {
   ENGINE_NAME,
   ENGINE_KEYWORD,
   ENGINE_URL,
 };
 
 };  // namespace
 
 SearchEngineManagerHandler::SearchEngineManagerHandler() {
 }
 
 SearchEngineManagerHandler::~SearchEngineManagerHandler() {
   if (list_controller_.get() && list_controller_->table_model())
     list_controller_->table_model()->SetObserver(NULL);
 }
 
 void SearchEngineManagerHandler::Initialize() {
-  list_controller_.reset(new KeywordEditorController(web_ui_->GetProfile()));
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
+  list_controller_.reset(new KeywordEditorController(profile));
   if (list_controller_.get()) {
     list_controller_->table_model()->SetObserver(this);
     OnModelChanged();
   }
 }
 
 void SearchEngineManagerHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
@@ skipping 74 matching lines @@
   ListValue others_list;
   if (last_default_engine_index < 0)
     last_default_engine_index = 0;
   int engine_count = list_controller_->table_model()->RowCount();
   for (int i = last_default_engine_index; i < engine_count; ++i) {
     others_list.Append(CreateDictionaryForEngine(i, i == default_index));
   }
 
   // Build the extension keywords list.
   ListValue keyword_list;
-  ExtensionService* extension_service =
-      web_ui_->GetProfile()->GetExtensionService();
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
+  ExtensionService* extension_service = profile->GetExtensionService();
   if (extension_service) {
     const ExtensionList* extensions = extension_service->extensions();
     for (ExtensionList::const_iterator it = extensions->begin();
          it != extensions->end(); ++it) {
       if ((*it)->omnibox_keyword().size() > 0)
         keyword_list.Append(CreateDictionaryForExtension(*(*it)));
     }
   }
 
   web_ui_->CallJavascriptFunction("SearchEngineManager.updateSearchEngineList",
@@ skipping 85 matching lines @@
     NOTREACHED();
     return;
   }
   // Allow -1, which means we are adding a new engine.
   if (index < -1 || index >= list_controller_->table_model()->RowCount())
     return;
 
   const TemplateURL* edit_url = NULL;
   if (index != -1)
     edit_url = list_controller_->GetTemplateURL(index);
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
   edit_controller_.reset(
-      new EditSearchEngineController(edit_url, this, web_ui_->GetProfile()));
+      new EditSearchEngineController(edit_url, this, profile));
 }
 
 void SearchEngineManagerHandler::OnEditedKeyword(
     const TemplateURL* template_url,
     const string16& title,
     const string16& keyword,
     const std::string& url) {
   if (template_url) {
     list_controller_->ModifyTemplateURL(template_url, title, keyword, url);
   } else {
@@ skipping 42 matching lines @@
   string16 keyword;
   std::string url;
   if (!args->GetString(ENGINE_NAME, &name) ||
       !args->GetString(ENGINE_KEYWORD, &keyword) ||
       !args->GetString(ENGINE_URL, &url)) {
     NOTREACHED();
     return;
   }
   edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }