Remove ExtensionURLInfo, make security decisions in render process

chrome/browser/notifications/notification_options_menu_model.cc

 // Copyright (c) 2012 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/notifications/notification_options_menu_model.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 122 matching lines @@
 NotificationOptionsMenuModel::NotificationOptionsMenuModel(Balloon* balloon)
     : ui::SimpleMenuModel(this),
       balloon_(balloon) {
   const Notification& notification = balloon->notification();
   const GURL& origin = notification.origin_url();
 
   if (origin.SchemeIs(extensions::kExtensionScheme)) {
     ExtensionService* extension_service =
         balloon_->profile()->GetExtensionService();
     const extensions::Extension* extension =
-        extension_service->extensions()->GetExtensionOrAppByURL(
-            ExtensionURLInfo(origin));
+        extension_service->extensions()->GetExtensionOrAppByURL(origin);
     // We get back no extension here when we show the notification after
     // the extension has crashed.
     if (extension) {
       const string16 disable_label = l10n_util::GetStringUTF16(
           IDS_EXTENSIONS_DISABLE);
       AddItem(kToggleExtensionCommand, disable_label);
     }
   } else if (!notification.display_source().empty()) {
     const string16 disable_label = l10n_util::GetStringFUTF16(
         IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE,
@@ skipping 30 matching lines @@
       command_id == kToggleExtensionCommand) {
     const Notification& notification = balloon_->notification();
     const GURL& origin = notification.origin_url();
 
     DesktopNotificationService* service =
         DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());
     if (origin.SchemeIs(extensions::kExtensionScheme)) {
       ExtensionService* extension_service =
           balloon_->profile()->GetExtensionService();
       const extensions::Extension* extension =
-          extension_service->extensions()->GetExtensionOrAppByURL(
-              ExtensionURLInfo(origin));
+          extension_service->extensions()->GetExtensionOrAppByURL(origin);
       if (extension) {
         return l10n_util::GetStringUTF16(
             extension_service->IsExtensionEnabled(extension->id()) ?
                 IDS_EXTENSIONS_DISABLE :
                 IDS_EXTENSIONS_ENABLE);
       }
     } else {
       if (service->GetContentSetting(origin) == CONTENT_SETTING_ALLOW) {
         return l10n_util::GetStringFUTF16(
             IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE,
@@ skipping 37 matching lines @@
   const GURL& origin = balloon_->notification().origin_url();
   switch (command_id) {
     case kTogglePermissionCommand:
       if (service->GetContentSetting(origin) == CONTENT_SETTING_ALLOW)
         service->DenyPermission(origin);
       else
         service->GrantPermission(origin);
       break;
     case kToggleExtensionCommand: {
       const extensions::Extension* extension =
-          extension_service->extensions()->GetExtensionOrAppByURL(
-              ExtensionURLInfo(origin));
+          extension_service->extensions()->GetExtensionOrAppByURL(origin);
       if (extension) {
         const std::string& id = extension->id();
         if (extension_service->IsExtensionEnabled(id))
           extension_service->DisableExtension(
               id, extensions::Extension::DISABLE_USER_ACTION);
         else
           extension_service->EnableExtension(id);
       }
       break;
     }
     case kOpenContentSettingsCommand: {
       chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();
       Browser* browser = chrome::FindLastActiveWithProfile(
           balloon_->profile(), active_desktop);
       if (!browser) {
         // It is possible that there is no browser window (e.g. when there are
         // background pages, or for a chrome frame process on windows).
         browser = new Browser(Browser::CreateParams(balloon_->profile(),
                                                     active_desktop));
       }
       chrome::ShowContentSettings(browser, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }