Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

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/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 125 matching lines @@
   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 =
       Profile::FromWebUI(web_ui_)->GetExtensionService();
   if (extension_service) {
-    const ExtensionList* extensions = extension_service->extensions();
-    for (ExtensionList::const_iterator it = extensions->begin();
+    const ExtensionSet* extensions = extension_service->extensions();
+    for (ExtensionSet::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",
                                   defaults_list, others_list, keyword_list);
 }
 
@@ skipping 146 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);
 }