Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet.

chrome/browser/notifications/desktop_notification_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/notifications/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 22 matching lines @@
 #include "content/browser/site_instance.h"
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/show_desktop_notification_params.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/escape.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
 using WebKit::WebNotificationPresenter;
 using WebKit::WebTextDirection;
+using WebKit::WebSecurityOrigin;
 
 const ContentSetting kDefaultSetting = CONTENT_SETTING_ASK;
 
 // NotificationPermissionInfoBarDelegate --------------------------------------
 
 // The delegate for the infobar shown when an origin requests notification
 // permissions.
 class NotificationPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   NotificationPermissionInfoBarDelegate(
@@ skipping 340 matching lines @@
       origin, contents, DisplayNameForOrigin(origin),
       params.replace_id, proxy);
   ShowNotification(notification);
   return true;
 }
 
 string16 DesktopNotificationService::DisplayNameForOrigin(
     const GURL& origin) {
   // If the source is an extension, lookup the display name.
   if (origin.SchemeIs(chrome::kExtensionScheme)) {
-    ExtensionService* ext_service = profile_->GetExtensionService();
-    if (ext_service) {
-      const Extension* extension = ext_service->GetExtensionByURL(origin);
+    ExtensionService* extension_service = profile_->GetExtensionService();
+    if (extension_service) {
+      const Extension* extension =
+          extension_service->extensions()->GetExtensionOrAppByURL(
+              ExtensionURLInfo(
+                  WebSecurityOrigin::createFromString(
+                      UTF8ToUTF16(origin.spec())),
+                  origin));
       if (extension)
         return UTF8ToUTF16(extension->name());
     }
   }
   return UTF8ToUTF16(origin.host());
 }
 
 void DesktopNotificationService::NotifySettingsChange() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED,
@@ skipping 22 matching lines @@
 
   if (setting == CONTENT_SETTING_ALLOW)
     return WebKit::WebNotificationPresenter::PermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return WebKit::WebNotificationPresenter::PermissionDenied;
   if (setting == CONTENT_SETTING_ASK)
     return WebKit::WebNotificationPresenter::PermissionNotAllowed;
   NOTREACHED() << "Invalid notifications settings value: " << setting;
   return WebKit::WebNotificationPresenter::PermissionNotAllowed;
 }