Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/installed_loader.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/installed_loader.h"
 
 #include "base/file_path.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 163 matching lines @@
   int app_user_count = 0;
   int app_external_count = 0;
   int hosted_app_count = 0;
   int packaged_app_count = 0;
   int user_script_count = 0;
   int extension_user_count = 0;
   int extension_external_count = 0;
   int theme_count = 0;
   int page_action_count = 0;
   int browser_action_count = 0;
-  const ExtensionList* extensions = extension_service_->extensions();
-  ExtensionList::const_iterator ex;
+  const ExtensionSet* extensions = extension_service_->extensions();
+  ExtensionSet::const_iterator ex;
   for (ex = extensions->begin(); ex != extensions->end(); ++ex) {
     Extension::Location location = (*ex)->location();
     Extension::Type type = (*ex)->GetType();
     if ((*ex)->is_app()) {
       UMA_HISTOGRAM_ENUMERATION("Extensions.AppLocation",
                                 location, 100);
     } else if (type == Extension::TYPE_EXTENSION) {
       UMA_HISTOGRAM_ENUMERATION("Extensions.ExtensionLocation",
                                 location, 100);
     }
@@ skipping 43 matching lines @@
           ++extension_user_count;
         }
         break;
     }
     if ((*ex)->page_action() != NULL)
       ++page_action_count;
     if ((*ex)->browser_action() != NULL)
       ++browser_action_count;
 
     extension_service_->RecordPermissionMessagesHistogram(
-        ex->get(), "Extensions.Permissions_Load");
+        *ex, "Extensions.Permissions_Load");
   }
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadApp",
                            app_user_count + app_external_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadAppUser", app_user_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadAppExternal", app_external_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadHostedApp", hosted_app_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadPackagedApp", packaged_app_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadExtension",
                            extension_user_count + extension_external_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadExtensionUser",
@@ skipping 16 matching lines @@
   if (extension_prefs_->AllowFileAccess(info->extension_id))
     flags |= Extension::ALLOW_FILE_ACCESS;
   if (extension_prefs_->IsFromWebStore(info->extension_id))
     flags |= Extension::FROM_WEBSTORE;
   if (extension_prefs_->IsFromBookmark(info->extension_id))
     flags |= Extension::FROM_BOOKMARK;
   return flags;
 }
 
 }  // namespace extensions