Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now...

chrome/browser/notifications/desktop_notification_service_unittest.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/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
-#include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
@@ skipping 75 matching lines @@
   DesktopNotificationServiceTest() {
   }
 
   virtual void SetUp() {
     RenderViewHostTestHarness::SetUp();
     proxy_ = new ThreadProxy;
     proxy_->PauseIOThread();
 
     // Creates the service, calls InitPrefs() on it which loads data from the
     // profile into the cache and then puts the cache in io thread mode.
-    service_ = DesktopNotificationServiceFactory::GetForProfile(profile());
+    service_ = profile()->GetDesktopNotificationService();
     cache_ = service_->prefs_cache();
   }
 
   virtual void TearDown() {
     // The io thread's waiting on the io_event_ might hold a ref to |proxy_|,
     // preventing its destruction. Clear that ref.
     proxy_->DrainIOThread();
     RenderViewHostTestHarness::TearDown();
   }
 
@@ skipping 158 matching lines @@
   EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionDenied,
             proxy_->CacheHasPermission(cache_, denied_url));
 
   service_->ResetBlockedOrigin(denied_url);
 
   EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionNotAllowed,
             proxy_->CacheHasPermission(cache_, denied_url));
 }
 
 }  // namespace