Fix broken threading model in CheckDesktopNotificationPermission

chrome/browser/profiles/profile_io_data.cc

Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index d950e99c6244f37fd3ae257355e111cc7ccbcfd1..96b0e919b2c8071d0930f72390cac8d8f6a2b6c9 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -44,7 +44,6 @@
 #include "chrome/browser/net/load_time_stats.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
-#include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/policy/url_blacklist_manager.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h"
@@ -277,11 +276,6 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
         new chrome_browser_net::ResourcePrefetchPredictorObserver(predictor));
   }
 
-#if defined(ENABLE_NOTIFICATIONS)
-  params->notification_service =
-      DesktopNotificationServiceFactory::GetForProfile(profile);
-#endif
-
   ProtocolHandlerRegistry* protocol_handler_registry =
       ProtocolHandlerRegistryFactory::GetForProfile(profile);
   DCHECK(protocol_handler_registry);
@@ -410,9 +404,6 @@ ProfileIOData::AppRequestContext::~AppRequestContext() {}
 
 ProfileIOData::ProfileParams::ProfileParams()
     : io_thread(NULL),
-#if defined(ENABLE_NOTIFICATIONS)
-      notification_service(NULL),
-#endif
       profile(NULL) {
 }
 
@@ -420,9 +411,6 @@ ProfileIOData::ProfileParams::~ProfileParams() {}
 
 ProfileIOData::ProfileIOData(bool is_incognito)
     : initialized_(false),
-#if defined(ENABLE_NOTIFICATIONS)
-      notification_service_(NULL),
-#endif
       resource_context_(new ResourceContext(this)),
       load_time_stats_(NULL),
       initialized_on_UI_thread_(false),
@@ -643,13 +631,6 @@ HostContentSettingsMap* ProfileIOData::GetHostContentSettingsMap() const {
   return host_content_settings_map_.get();
 }
 
-#if defined(ENABLE_NOTIFICATIONS)
-DesktopNotificationService* ProfileIOData::GetNotificationService() const {
-  DCHECK(initialized_);
-  return notification_service_;
-}
-#endif
-
 void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_CHROMEOS)
@@ -829,9 +810,6 @@ void ProfileIOData::Init(content::ProtocolHandlerMap* protocol_handlers) const {
   // Take ownership over these parameters.
   cookie_settings_ = profile_params_->cookie_settings;
   host_content_settings_map_ = profile_params_->host_content_settings_map;
-#if defined(ENABLE_NOTIFICATIONS)
-  notification_service_ = profile_params_->notification_service;
-#endif
   extension_info_map_ = profile_params_->extension_info_map;
 
   resource_context_->host_resolver_ = io_thread_globals->host_resolver.get();