Fix broken threading model in CheckDesktopNotificationPermission

chrome/browser/notifications/desktop_notification_service.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/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
@@ skipping 40 matching lines @@
 #include "ui/message_center/notifier_settings.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/system_notifier.h"
 #endif
 
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::WebContents;
 using message_center::NotifierId;
-using WebKit::WebNotificationPresenter;
 using WebKit::WebTextDirection;
 
 
 // NotificationPermissionInfoBarDelegate --------------------------------------
 
 // The delegate for the infobar shown when an origin requests notification
 // permissions.
 class NotificationPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // Creates a notification permission infobar delegate and adds it to
@@ skipping 571 matching lines @@
   const base::ListValue* pref_list = profile_->GetPrefs()->GetList(pref_name);
   for (size_t i = 0; i < pref_list->GetSize(); ++i) {
     std::string element;
     if (pref_list->GetString(i, &element) && !element.empty())
       ids_field->insert(element);
     else
       LOG(WARNING) << i << "-th element is not a string for " << pref_name;
   }
 }
 
-WebKit::WebNotificationPresenter::Permission
-    DesktopNotificationService::HasPermission(const GURL& origin) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  HostContentSettingsMap* host_content_settings_map =
-      profile_->GetHostContentSettingsMap();
-  ContentSetting setting = host_content_settings_map->GetContentSetting(
-      origin,
-      origin,
-      CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
-      NO_RESOURCE_IDENTIFIER);
-
-  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;
-}
-
 void DesktopNotificationService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_UNINSTALLED, type);
 
   extensions::Extension* extension =
       content::Details<extensions::Extension>(details).ptr();
   NotifierId notifier_id(NotifierId::APPLICATION, extension->id());
   if (IsNotifierEnabled(notifier_id))
     return;
 
   SetNotifierEnabled(notifier_id, true);
 }
 
 void DesktopNotificationService::FirePermissionLevelChangedEvent(
     const NotifierId& notifier_id, bool enabled) {
   DCHECK_EQ(NotifierId::APPLICATION, notifier_id.type);
   extensions::api::notifications::PermissionLevel permission =
       enabled ? extensions::api::notifications::PERMISSION_LEVEL_GRANTED
               : extensions::api::notifications::PERMISSION_LEVEL_DENIED;
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Append(new base::StringValue(
       extensions::api::notifications::ToString(permission)));
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::api::notifications::OnPermissionLevelChanged::kEventName,
       args.Pass()));
   extensions::ExtensionSystem::Get(profile_)->event_router()->
       DispatchEventToExtension(notifier_id.id, event.Pass());
+
+  // Tell the IO thread that this extension's permission for notifications
+  // has changed.
+  ExtensionInfoMap* extension_info_map =
+      extensions::ExtensionSystem::Get(profile_)->info_map();
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&ExtensionInfoMap::SetNotificationsDisabled,
+                 extension_info_map, notifier_id.id, !enabled));
+
 }