OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/notifications/desktop_notification_service.h" | 5 #include "chrome/browser/notifications/desktop_notification_service.h" |
6 | 6 |
7 #include "base/ref_counted.h" | 7 #include "base/ref_counted.h" |
8 #include "base/waitable_event.h" | 8 #include "base/waitable_event.h" |
9 #include "chrome/browser/notifications/notifications_prefs_cache.h" | 9 #include "chrome/browser/notifications/notifications_prefs_cache.h" |
10 #include "chrome/browser/prefs/pref_service.h" | 10 #include "chrome/browser/prefs/pref_service.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 io_thread_.reset(new ChromeThread(ChromeThread::IO)); | 34 io_thread_.reset(new ChromeThread(ChromeThread::IO)); |
35 io_thread_->Start(); | 35 io_thread_->Start(); |
36 | 36 |
37 // Calling PauseIOThread() here isn't safe, because the runnable method | 37 // Calling PauseIOThread() here isn't safe, because the runnable method |
38 // could complete before the constructor is done, deleting |this|. | 38 // could complete before the constructor is done, deleting |this|. |
39 } | 39 } |
40 | 40 |
41 int CacheHasPermission(NotificationsPrefsCache* cache, const GURL& url) { | 41 int CacheHasPermission(NotificationsPrefsCache* cache, const GURL& url) { |
42 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); | 42 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); |
43 ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, | 43 ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, |
44 NewRunnableMethod(this, &ThreadProxy::CacheHasPermissionIO, | 44 NewRunnableMethod(this, |
45 cache, url)); | 45 &ThreadProxy::CacheHasPermissionIO, |
| 46 make_scoped_refptr(cache), |
| 47 url)); |
46 io_event_.Signal(); | 48 io_event_.Signal(); |
47 ui_event_.Wait(); // Wait for IO thread to be done. | 49 ui_event_.Wait(); // Wait for IO thread to be done. |
48 ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, | 50 ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, |
49 NewRunnableMethod(this, &ThreadProxy::PauseIOThreadIO)); | 51 NewRunnableMethod(this, &ThreadProxy::PauseIOThreadIO)); |
50 | 52 |
51 return permission_; | 53 return permission_; |
52 } | 54 } |
53 | 55 |
54 void PauseIOThread() { | 56 void PauseIOThread() { |
55 ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, | 57 ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionDenied, | 240 EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionDenied, |
239 proxy_->CacheHasPermission(cache_, denied_url)); | 241 proxy_->CacheHasPermission(cache_, denied_url)); |
240 | 242 |
241 service_->ResetBlockedOrigin(denied_url); | 243 service_->ResetBlockedOrigin(denied_url); |
242 | 244 |
243 EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionNotAllowed, | 245 EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionNotAllowed, |
244 proxy_->CacheHasPermission(cache_, denied_url)); | 246 proxy_->CacheHasPermission(cache_, denied_url)); |
245 } | 247 } |
246 | 248 |
247 } // namespace | 249 } // namespace |
OLD | NEW |