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 390 matching lines @@
   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);
+      const Extension* extension =
+          ext_service->extensions()->GetByURL(ExtensionURLInfo(origin));

[abarth-chromium, 2011/12/07 23:51:44]

Same here.

[Yoyo Zhou, 2011/12/08 20:52:17]

Turns out this one is actually also a WebSecurityOrigin converted into a string
converted into a GURL.

Any thoughts on whether GURL or string16 is better for this? I'd like to be
consistent.

       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;
 }