Revert 61899 for breaking cookes on file:// URLs....

chrome/browser/notifications/desktop_notification_service_unittest.cc

 // Copyright (c) 2010 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/ref_counted.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 23 matching lines @@
     io_thread_.reset(new ChromeThread(ChromeThread::IO));
     io_thread_->Start();
 
     // Calling PauseIOThread() here isn't safe, because the runnable method
     // could complete before the constructor is done, deleting |this|.
   }
 
   int CacheHasPermission(NotificationsPrefsCache* cache, const GURL& url) {
     DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
     ChromeThread::PostTask(ChromeThread::IO, FROM_HERE,
-        NewRunnableMethod(this,
-                          &ThreadProxy::CacheHasPermissionIO,
-                          make_scoped_refptr(cache),
-                          url));
+        NewRunnableMethod(this, &ThreadProxy::CacheHasPermissionIO,
+                          cache, url));
     io_event_.Signal();
     ui_event_.Wait();  // Wait for IO thread to be done.
     ChromeThread::PostTask(ChromeThread::IO, FROM_HERE,
         NewRunnableMethod(this, &ThreadProxy::PauseIOThreadIO));
 
     return permission_;
   }
 
   void PauseIOThread() {
     ChromeThread::PostTask(ChromeThread::IO, FROM_HERE,
@@ skipping 182 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