Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

ExtensionManagementApiBrowserTest.LaunchApp fixed by r113141.

Make ExtensionSet iterate like a set instead of a map.

BUG=104091
TEST=existing tests

Review URL: http://codereview.chromium.org/8733004

TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/8789018

TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/8822021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113233 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 16 deletions

diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 3e3d8c8..89f4762 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -20,7 +21,7 @@ namespace {
 class MockExtensionService : public TestExtensionService {
  private:
   bool ready_;
-  ExtensionList extension_list_;
+  ExtensionSet extension_set_;
 
  public:
   MockExtensionService() : ready_(false) {
@@ -28,37 +29,30 @@ class MockExtensionService : public TestExtensionService {
 
   virtual void AddExtension(const Extension* extension) OVERRIDE {
     // ExtensionService must become the owner of the extension object.
-    extension_list_.push_back(extension);
+    extension_set_.Insert(extension);
   }
 
   virtual void UnloadExtension(
       const std::string& extension_id,
       extension_misc::UnloadedExtensionReason reason) OVERRIDE {
     // Remove the extension with the matching id.
-    for (ExtensionList::iterator it = extension_list_.begin();
-         it != extension_list_.end();
-         ++it) {
-      if ((*it)->id() == extension_id) {
-        extension_list_.erase(it);
-        return;
-      }
-    }
+    extension_set_.Remove(extension_id);
   }
 
   virtual bool is_ready() OVERRIDE {
     return ready_;
   }
 
-  virtual const ExtensionList* extensions() const OVERRIDE {
-    return &extension_list_;
+  virtual const ExtensionSet* extensions() const OVERRIDE {
+    return &extension_set_;
   }
 
   void set_ready(bool ready) {
     ready_ = ready;
   }
 
-  void clear_extension_list() {
-    extension_list_.clear();
+  void clear_extensions() {
+    extension_set_.Clear();
   }
 };
 
@@ -217,7 +211,7 @@ TEST_F(ComponentLoaderTest, LoadAll) {
   unsigned int default_count = extension_service_.extensions()->size();
 
   // Clear the list of loaded extensions, and reload with one more.
-  extension_service_.clear_extension_list();
+  extension_service_.clear_extensions();
   component_loader_.Add(manifest_contents_, extension_path_);
   component_loader_.LoadAll();
 
@@ -237,7 +231,7 @@ TEST_F(ComponentLoaderTest, EnterpriseWebStore) {
 
   // Now that the pref is set, check if it's added by default.
   extension_service_.set_ready(false);
-  extension_service_.clear_extension_list();
+  extension_service_.clear_extensions();
   component_loader_.ClearAllRegistered();
   component_loader_.AddDefaultComponentExtensions();
   component_loader_.LoadAll();