Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_updater_unittest.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 <map>
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 135 matching lines @@
 }
 
 class ServiceForManifestTests : public MockService {
  public:
   ServiceForManifestTests() {}
 
   virtual ~ServiceForManifestTests() {}
 
   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_;
   }
 
   virtual PendingExtensionManager* pending_extension_manager() OVERRIDE {
     return &pending_extension_manager_;
   }
 
   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 {
  public:
   ServiceForDownloadTests()
       : MockService() {
   }
 
   // Add a fake crx installer to be returned by a call to UpdateExtension()
   // with a specific ID.  Caller keeps ownership of |crx_installer|.
@@ skipping 1071 matching lines @@
 
 // TODO(asargent) - (http://crbug.com/12780) add tests for:
 // -prodversionmin (shouldn't update if browser version too old)
 // -manifests & updates arriving out of order / interleaved
 // -malformed update url (empty, file://, has query, has a # fragment, etc.)
 // -An extension gets uninstalled while updates are in progress (so it doesn't
 //  "come back from the dead")
 // -An extension gets manually updated to v3 while we're downloading v2 (ie
 //  you don't get downgraded accidentally)
 // -An update manifest mentions multiple updates