Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_updater_unittest.cc

Index: chrome/browser/extensions/extension_updater_unittest.cc
===================================================================
--- chrome/browser/extensions/extension_updater_unittest.cc	(revision 113231)
+++ chrome/browser/extensions/extension_updater_unittest.cc	(working copy)
@@ -153,16 +153,10 @@
 
   virtual const Extension* GetExtensionById(
       const std::string& id, bool include_disabled) const OVERRIDE {
-    for (ExtensionList::const_iterator iter = extensions_.begin();
-        iter != extensions_.end(); ++iter) {
-      if ((*iter)->id() == id) {
-        return *iter;
-      }
-    }
-    return NULL;
+    return extensions_.GetByID(id);
   }
 
-  virtual const ExtensionList* extensions() const OVERRIDE {
+  virtual const ExtensionSet* extensions() const OVERRIDE {
     return &extensions_;
   }
 
@@ -171,11 +165,14 @@
   }
 
   void set_extensions(ExtensionList extensions) {
-    extensions_ = extensions;
+    for (ExtensionList::const_iterator it = extensions.begin();
+         it != extensions.end(); ++it) {
+      extensions_.Insert(*it);
+    }
   }
 
  private:
-  ExtensionList extensions_;
+  ExtensionSet extensions_;
 };
 
 class ServiceForDownloadTests : public MockService {