Revert 56059 - Merge 55103 - Refactored extension privilege enumeration and i...

chrome/browser/extensions/extension_install_ui.cc

 // Copyright (c) 2010 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_install_ui.h"
 
 #include <map>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 11 matching lines @@
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/views/app_launcher.h"
 #include "chrome/browser/views/extensions/extension_installed_bubble.h"
 #elif defined(TOOLKIT_GTK)
 #include "chrome/browser/gtk/extension_installed_bubble_gtk.h"
 #endif
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
-#include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/extensions/gtk_theme_installed_infobar_delegate.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
@@ skipping 28 matching lines @@
     // presentation for this case?
     warnings->push_back(
         l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT2_WARNING_FULL_ACCESS));
     return;
   }
 
   if (extension->HasAccessToAllHosts()) {
     warnings->push_back(
         l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT2_WARNING_ALL_HOSTS));
   } else {
-    std::vector<URLPattern> hosts =
-        extension->GetEffectiveHostPermissions().patterns();
+    std::set<std::string> hosts = extension->GetEffectiveHostPermissions();
     if (hosts.size() == 1) {
       warnings->push_back(
           l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT2_WARNING_1_HOST,
-                                     UTF8ToUTF16(hosts.begin()->host())));
+                                     UTF8ToUTF16(*hosts.begin())));
     } else if (hosts.size() == 2) {
       warnings->push_back(
           l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT2_WARNING_2_HOSTS,
-                                     UTF8ToUTF16(hosts.begin()->host()),
-                                     UTF8ToUTF16((++hosts.begin())->host())));
+                                     UTF8ToUTF16(*hosts.begin()),
+                                     UTF8ToUTF16(*(++hosts.begin()))));
     } else if (hosts.size() == 3) {
       warnings->push_back(
           l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT2_WARNING_3_HOSTS,
-                                     UTF8ToUTF16(hosts.begin()->host()),
-                                     UTF8ToUTF16((++hosts.begin())->host()),
-                                     UTF8ToUTF16((++++hosts.begin())->host())));
+                                     UTF8ToUTF16(*hosts.begin()),
+                                     UTF8ToUTF16(*(++hosts.begin())),
+                                     UTF8ToUTF16(*(++++hosts.begin()))));
     } else if (hosts.size() >= 4) {
       warnings->push_back(
           l10n_util::GetStringFUTF16(
               IDS_EXTENSION_PROMPT2_WARNING_4_OR_MORE_HOSTS,
-              UTF8ToUTF16(hosts.begin()->host()),
-              UTF8ToUTF16((++hosts.begin())->host()),
+              UTF8ToUTF16(*hosts.begin()),
+              UTF8ToUTF16(*(++hosts.begin())),
               IntToString16(hosts.size() - 2)));
     }
   }
 
   if (extension->HasEffectiveBrowsingHistoryPermission()) {
     warnings->push_back(
         l10n_util::GetStringUTF16(
             IDS_EXTENSION_PROMPT2_WARNING_BROWSING_HISTORY));
   }
 
@@ skipping 250 matching lines @@
     TabContents* tab_contents, Extension* new_theme,
     const std::string& previous_theme_id, bool previous_use_system_theme) {
 #if defined(TOOLKIT_GTK)
   return new GtkThemeInstalledInfoBarDelegate(tab_contents, new_theme,
       previous_theme_id, previous_use_system_theme);
 #else
   return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme,
       previous_theme_id);
 #endif
 }