Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_browsertest.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/extensions/extension_browsertest.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 54 matching lines @@
     content::NotificationRegistrar registrar;
     registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                   content::NotificationService::AllSources());
     scoped_refptr<extensions::UnpackedInstaller> installer(
         extensions::UnpackedInstaller::Create(service));
     installer->set_prompt_for_plugins(false);
     installer->Load(path);
     ui_test_utils::RunMessageLoop();
   }
 
-  // Find the extension by iterating backwards since it is likely last.
+  // Find the loaded extension by its path. See crbug.com/59531 for why
+  // we cannot just use last_loaded_extension_id_.
   FilePath extension_path = path;
   file_util::AbsolutePath(&extension_path);
   const Extension* extension = NULL;
-  for (ExtensionList::const_reverse_iterator iter =
-           service->extensions()->rbegin();
-       iter != service->extensions()->rend(); ++iter) {
+  for (ExtensionSet::const_iterator iter = service->extensions()->begin();
+       iter != service->extensions()->end(); ++iter) {
     if ((*iter)->path() == extension_path) {
       extension = *iter;
       break;
     }
   }
   if (!extension)
     return NULL;
 
   const std::string extension_id = extension->id();
 
@@ skipping 197 matching lines @@
     ui_test_utils::RunMessageLoop();
   }
 
   size_t num_after = service->extensions()->size();
   EXPECT_EQ(num_before + expected_change, num_after);
   if (num_before + expected_change != num_after) {
     VLOG(1) << "Num extensions before: " << base::IntToString(num_before)
             << " num after: " << base::IntToString(num_after)
             << " Installed extensions follow:";
 
-    for (size_t i = 0; i < service->extensions()->size(); ++i)
-      VLOG(1) << "  " << (*service->extensions())[i]->id();
+    for (ExtensionSet::const_iterator it = service->extensions()->begin();
+         it != service->extensions()->end(); ++it)
+      VLOG(1) << "  " << (*it)->id();
 
     VLOG(1) << "Errors follow:";
     const std::vector<std::string>* errors =
         ExtensionErrorReporter::GetInstance()->GetErrors();
     for (std::vector<std::string>::const_iterator iter = errors->begin();
          iter != errors->end(); ++iter)
       VLOG(1) << *iter;
 
     return NULL;
   }
@@ skipping 186 matching lines @@
         MessageLoopForUI::current()->Quit();
       }
       break;
     }
 
     default:
       NOTREACHED();
       break;
   }
 }