Third patch in getting rid of caching MessageLoop pointers and always using C...

chrome/browser/notifications/desktop_notification_service.cc

 // Copyright (c) 2009 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 47 matching lines @@
         route_id_(contents->render_view_host()->routing_id()),
         callback_context_(callback_context),
         action_taken_(false) {
   }
 
   // Overridden from ConfirmInfoBarDelegate:
   virtual void InfoBarClosed() {
     if (!action_taken_)
       UMA_HISTOGRAM_COUNTS("NotificationPermissionRequest.Ignored", 1);
 
-    base::Thread* io_thread = g_browser_process->io_thread();
-    if (io_thread && io_thread->message_loop()) {
-      io_thread->message_loop()->PostTask(FROM_HERE,
-        new NotificationPermissionCallbackTask(process_id_, route_id_,
-            callback_context_));
-    }
+    ChromeThread::PostTask(
+      ChromeThread::IO, FROM_HERE,
+      new NotificationPermissionCallbackTask(
+          process_id_, route_id_, callback_context_));
 
     delete this;
   }
 
   virtual std::wstring GetMessageText() const {
     return l10n_util::GetStringF(IDS_NOTIFICATION_PERMISSIONS,
                                  UTF8ToWide(origin_.spec()));
   }
 
   virtual SkBitmap* GetIcon() const {
@@ skipping 79 matching lines @@
       prefs->GetMutableList(prefs::kDesktopNotificationAllowedOrigins);
   ListValue* denied_sites =
       prefs->GetMutableList(prefs::kDesktopNotificationDeniedOrigins);
   // Remove from the black-list and add to the white-list.
   StringValue* value = new StringValue(origin.spec());
   denied_sites->Remove(*value);
   allowed_sites->Append(value);
   prefs->ScheduleSavePersistentPrefs();
 
   // Schedule a cache update on the IO thread.
-  base::Thread* io_thread = g_browser_process->io_thread();
-  if (io_thread && io_thread->message_loop()) {
-    io_thread->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(prefs_cache_.get(),
-                          &NotificationsPrefsCache::CacheAllowedOrigin,
-                          origin));
-  }
+  ChromeThread::PostTask(
+      ChromeThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          prefs_cache_.get(), &NotificationsPrefsCache::CacheAllowedOrigin,
+          origin));
 }
 
 void DesktopNotificationService::DenyPermission(const GURL& origin) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   PrefService* prefs = profile_->GetPrefs();
   ListValue* allowed_sites =
       prefs->GetMutableList(prefs::kDesktopNotificationAllowedOrigins);
   ListValue* denied_sites =
       prefs->GetMutableList(prefs::kDesktopNotificationDeniedOrigins);
   StringValue* value = new StringValue(origin.spec());
   // Remove from the white-list and add to the black-list.
   allowed_sites->Remove(*value);
   denied_sites->Append(value);
   prefs->ScheduleSavePersistentPrefs();
 
   // Schedule a cache update on the IO thread.
-  base::Thread* io_thread = g_browser_process->io_thread();
-  if (io_thread && io_thread->message_loop()) {
-    io_thread->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(prefs_cache_.get(),
-                          &NotificationsPrefsCache::CacheDeniedOrigin,
-                          origin));
-  }
+  ChromeThread::PostTask(
+      ChromeThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          prefs_cache_.get(), &NotificationsPrefsCache::CacheDeniedOrigin,
+          origin));
 }
 
 void DesktopNotificationService::RequestPermission(
     const GURL& origin, int callback_context) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   // Show an info bar requesting permission.
   Browser* browser = BrowserList::GetLastActive();
   if (!browser) {
     // Reached during ui tests.
     return;
   }
   TabContents* tab = browser->GetSelectedTabContents();
   if (!tab)
     return;
   tab->AddInfoBar(new NotificationPermissionInfoBarDelegate(tab, origin,
                                                             callback_context));
 }