Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/background/background_contents_service.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/background/background_contents_service.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 400 matching lines @@
   dict->GetString(kUrlKey, &url);
   dict->GetString(kFrameNameKey, &frame_name);
   LoadBackgroundContents(profile,
                          GURL(url),
                          frame_name,
                          UTF8ToUTF16(extension_id));
 }
 
 void BackgroundContentsService::LoadBackgroundContentsFromManifests(
     Profile* profile) {
-  const ExtensionList* extensions =
+  const ExtensionSet* extensions =
       profile->GetExtensionService()->extensions();
-  ExtensionList::const_iterator iter = extensions->begin();
+  ExtensionSet::const_iterator iter = extensions->begin();
   for (; iter != extensions->end(); ++iter) {
     const Extension* extension = *iter;
     if (extension->is_hosted_app() &&
         extension->background_url().is_valid()) {
       LoadBackgroundContents(profile,
                              extension->background_url(),
                              ASCIIToUTF16("background"),
                              UTF8ToUTF16(extension->id()));
     }
   }
@@ skipping 138 matching lines @@
     TabContents* new_contents,
     WindowOpenDisposition disposition,
     const gfx::Rect& initial_pos,
     bool user_gesture) {
   Browser* browser = BrowserList::GetLastActiveWithProfile(
       Profile::FromBrowserContext(new_contents->browser_context()));
   if (!browser)
     return;
   browser->AddTabContents(new_contents, disposition, initial_pos, user_gesture);
 }