Backend changes for notifications content settings.

chrome/browser/notifications/desktop_notification_service_unittest.cc

Index: chrome/browser/notifications/desktop_notification_service_unittest.cc
diff --git a/chrome/browser/notifications/desktop_notification_service_unittest.cc b/chrome/browser/notifications/desktop_notification_service_unittest.cc
index 4e0a705e2a8df7c761cec19474e8095311325efe..3af8b0f4c6164d0c3534fd2371ec219ebd980f69 100644
--- a/chrome/browser/notifications/desktop_notification_service_unittest.cc
+++ b/chrome/browser/notifications/desktop_notification_service_unittest.cc
@@ -4,70 +4,243 @@
 
 #include "chrome/browser/notifications/desktop_notification_service.h"
 
-#include "base/task.h"
+#include "base/ref_counted.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
+#include "chrome/browser/pref_service.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
+#include "chrome/browser/scoped_pref_update.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h"
 
 namespace {
 
-class WaitTask : public Task {
+// NotificationsPrefsCache wants to be called on the IO thread. This class
+// routes calls to the cache on the IO thread.
+class ThreadProxy : public base::RefCountedThreadSafe<ThreadProxy> {
  public:
-  WaitTask(base::WaitableEvent* event)
-      : event_(event) {
+  ThreadProxy()
+      : io_event_(false, false),
+        ui_event_(false, false) {
+    // The current message loop was already initalized by the test superclass.
+    ui_thread_.reset(
+        new ChromeThread(ChromeThread::UI, MessageLoop::current()));
+
+    // Create IO thread, start its message loop.
+    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|.
   }
-  virtual void Run() {
-    event_->Wait();
+
+  int CacheHasPermission(NotificationsPrefsCache* cache, const GURL& url) {
+    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+    ChromeThread::PostTask(ChromeThread::IO, FROM_HERE,
+        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,
+        NewRunnableMethod(this, &ThreadProxy::PauseIOThreadIO));
+  }
+
+  void DrainIOThread() {
+    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+    io_event_.Signal();
+    io_thread_->Stop();
   }
 
  private:
-  base::WaitableEvent* event_;
+  friend class base::RefCountedThreadSafe<ThreadProxy>;
+  ~ThreadProxy() {
+     DrainIOThread();
+  }
+
+  void PauseIOThreadIO() {
+    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+    io_event_.Wait();
+  }
+
+  void CacheHasPermissionIO(NotificationsPrefsCache* cache, const GURL& url) {
+    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+    permission_ = cache->HasPermission(url);
+    ui_event_.Signal();
+  }
+
+  base::WaitableEvent io_event_;
+  base::WaitableEvent ui_event_;
+  scoped_ptr<ChromeThread> ui_thread_;
+  scoped_ptr<ChromeThread> io_thread_;
+
+  int permission_;
 };
 
 
 class DesktopNotificationServiceTest : public RenderViewHostTestHarness {
  public:
-  DesktopNotificationServiceTest()
-      : event_(false, false) {
+  DesktopNotificationServiceTest() {
   }
-  base::WaitableEvent event_;
-};
 
-TEST_F(DesktopNotificationServiceTest, DefaultContentSettingSentToCache) {
-  // The current message loop was already initalized by the superclass.
-  ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
+  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_ = profile()->GetDesktopNotificationService();
+    cache_ = service_->prefs_cache();
+  }
 
-  // Create IO thread, start its message loop.
-  ChromeThread io_thread(ChromeThread::IO);
-  io_thread.Start();
-  ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, new WaitTask(&event_));
+  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();
+  }
 
-  // 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.
-  DesktopNotificationService* service =
-      profile()->GetDesktopNotificationService();
-  NotificationsPrefsCache* cache = service->prefs_cache();
+  DesktopNotificationService* service_;
+  NotificationsPrefsCache* cache_;
+  scoped_refptr<ThreadProxy> proxy_;
+};
 
+TEST_F(DesktopNotificationServiceTest, DefaultContentSettingSentToCache) {
   // The default pref registered in DesktopNotificationService is "ask",
   // and that's what sent to the cache.
-  EXPECT_EQ(CONTENT_SETTING_ASK, cache->CachedDefaultContentSetting());
+  EXPECT_EQ(CONTENT_SETTING_ASK, cache_->CachedDefaultContentSetting());
 
   // Change the default content setting. This will post a task on the IO thread
   // to update the cache.
-  service->SetDefaultContentSetting(CONTENT_SETTING_BLOCK);
+  service_->SetDefaultContentSetting(CONTENT_SETTING_BLOCK);
 
   // The updated pref shouldn't be sent to the cache immediately.
-  EXPECT_EQ(CONTENT_SETTING_ASK, cache->CachedDefaultContentSetting());
+  EXPECT_EQ(CONTENT_SETTING_ASK, cache_->CachedDefaultContentSetting());
 
   // Run IO thread tasks.
-  event_.Signal();
-  io_thread.Stop();
+  proxy_->DrainIOThread();
 
   // Now that IO thread events have been processed, it should be there.
-  EXPECT_EQ(CONTENT_SETTING_BLOCK, cache->CachedDefaultContentSetting());
+  EXPECT_EQ(CONTENT_SETTING_BLOCK, cache_->CachedDefaultContentSetting());
+}
+
+TEST_F(DesktopNotificationServiceTest, GrantPermissionSentToCache) {
+  GURL url("http://allowed.com");
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionNotAllowed,
+            proxy_->CacheHasPermission(cache_, url));
+
+  service_->GrantPermission(url);
+
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionAllowed,
+            proxy_->CacheHasPermission(cache_, url));
+}
+
+TEST_F(DesktopNotificationServiceTest, DenyPermissionSentToCache) {
+  GURL url("http://denied.com");
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionNotAllowed,
+            proxy_->CacheHasPermission(cache_, url));
+
+  service_->DenyPermission(url);
+
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionDenied,
+            proxy_->CacheHasPermission(cache_, url));
+}
+
+TEST_F(DesktopNotificationServiceTest, PrefChangesSentToCache) {
+  PrefService* prefs = profile()->GetPrefs();
+
+  ListValue* allowed_sites =
+      prefs->GetMutableList(prefs::kDesktopNotificationAllowedOrigins);
+  {
+    allowed_sites->Append(new StringValue(GURL("http://allowed.com").spec()));
+    ScopedPrefUpdate updateAllowed(
+        prefs, prefs::kDesktopNotificationAllowedOrigins);
+  }
+
+  ListValue* denied_sites =
+      prefs->GetMutableList(prefs::kDesktopNotificationDeniedOrigins);
+  {
+    denied_sites->Append(new StringValue(GURL("http://denied.com").spec()));
+    ScopedPrefUpdate updateDenied(
+        prefs, prefs::kDesktopNotificationDeniedOrigins);
+  }
+
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionAllowed,
+            proxy_->CacheHasPermission(cache_, GURL("http://allowed.com")));
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionDenied,
+            proxy_->CacheHasPermission(cache_, GURL("http://denied.com")));
+}
+
+TEST_F(DesktopNotificationServiceTest, GetAllowedOrigins) {
+  service_->GrantPermission(GURL("http://allowed2.com"));
+  service_->GrantPermission(GURL("http://allowed.com"));
+
+  std::vector<GURL> allowed_origins(service_->GetAllowedOrigins());
+  ASSERT_EQ(2u, allowed_origins.size());
+  EXPECT_EQ(GURL("http://allowed2.com"), allowed_origins[0]);
+  EXPECT_EQ(GURL("http://allowed.com"), allowed_origins[1]);
+}
+
+TEST_F(DesktopNotificationServiceTest, GetBlockedOrigins) {
+  service_->DenyPermission(GURL("http://denied2.com"));
+  service_->DenyPermission(GURL("http://denied.com"));
+
+  std::vector<GURL> denied_origins(service_->GetBlockedOrigins());
+  ASSERT_EQ(2u, denied_origins.size());
+  EXPECT_EQ(GURL("http://denied2.com"), denied_origins[0]);
+  EXPECT_EQ(GURL("http://denied.com"), denied_origins[1]);
+}
+
+TEST_F(DesktopNotificationServiceTest, ResetAllSentToCache) {
+  GURL allowed_url("http://allowed.com");
+  service_->GrantPermission(allowed_url);
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionAllowed,
+            proxy_->CacheHasPermission(cache_, allowed_url));
+  GURL denied_url("http://denied.com");
+  service_->DenyPermission(denied_url);
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionDenied,
+            proxy_->CacheHasPermission(cache_, denied_url));
+
+  service_->ResetAllOrigins();
+
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionNotAllowed,
+            proxy_->CacheHasPermission(cache_, allowed_url));
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionNotAllowed,
+            proxy_->CacheHasPermission(cache_, denied_url));
+}
+
+TEST_F(DesktopNotificationServiceTest, ResetAllowedSentToCache) {
+  GURL allowed_url("http://allowed.com");
+  service_->GrantPermission(allowed_url);
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionAllowed,
+            proxy_->CacheHasPermission(cache_, allowed_url));
+
+  service_->ResetAllowedOrigin(allowed_url);
+
+  EXPECT_EQ(WebKit::WebNotificationPresenter::PermissionNotAllowed,
+            proxy_->CacheHasPermission(cache_, allowed_url));
+}
+
+TEST_F(DesktopNotificationServiceTest, ResetBlockedSentToCache) {
+  GURL denied_url("http://denied.com");
+  service_->DenyPermission(denied_url);
+  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