ServiceWorker: Support includeUncontrolled option in clients.matchAll() (1/2, chromium)

content/browser/service_worker/service_worker_context_unittest.cc

Index: content/browser/service_worker/service_worker_context_unittest.cc
diff --git a/content/browser/service_worker/service_worker_context_unittest.cc b/content/browser/service_worker/service_worker_context_unittest.cc
index fe206bca8701582bf0bb33994b97a1ff8390c64c..568364a222855bf1d0fc192f8682eec863c56ba9 100644
--- a/content/browser/service_worker/service_worker_context_unittest.cc
+++ b/content/browser/service_worker/service_worker_context_unittest.cc
@@ -13,6 +13,7 @@
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_observer.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
+#include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_storage.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
@@ -606,4 +607,78 @@ TEST_F(ServiceWorkerContextTest, DeleteAndStartOver) {
   EXPECT_EQ(registration_id, notifications_[2].registration_id);
 }
 
+TEST_F(ServiceWorkerContextTest, ProviderHostIterator) {
+  const int kRenderProcessId1 = 1;
+  const int kRenderProcessId2 = 2;
+  const GURL kOrigin1 = GURL("http://www.example.com/");
+  const GURL kOrigin2 = GURL("https://www.example.com/");
+  int provider_id = 1;
+
+  // Host1 (provider_id=1): process_id=1, origin1.
+  ServiceWorkerProviderHost* host1(new ServiceWorkerProviderHost(
+      kRenderProcessId1, MSG_ROUTING_NONE, provider_id++,
+      SERVICE_WORKER_PROVIDER_FOR_CONTROLLEE, context()->AsWeakPtr(), nullptr));
+  host1->SetDocumentUrl(kOrigin1);
+
+  // Host2 (provider_id=2): process_id=2, origin2.
+  ServiceWorkerProviderHost* host2(new ServiceWorkerProviderHost(
+      kRenderProcessId2, MSG_ROUTING_NONE, provider_id++,
+      SERVICE_WORKER_PROVIDER_FOR_CONTROLLEE, context()->AsWeakPtr(), nullptr));
+  host2->SetDocumentUrl(kOrigin2);
+
+  // Host3 (provider_id=3): process_id=2, origin1.
+  ServiceWorkerProviderHost* host3(new ServiceWorkerProviderHost(
+      kRenderProcessId2, MSG_ROUTING_NONE, provider_id++,
+      SERVICE_WORKER_PROVIDER_FOR_CONTROLLEE, context()->AsWeakPtr(), nullptr));
+  host3->SetDocumentUrl(kOrigin1);
+
+  // Host4 (provider_id=4): process_id=2, origin2, for ServiceWorker.
+  ServiceWorkerProviderHost* host4(new ServiceWorkerProviderHost(
+      kRenderProcessId2, MSG_ROUTING_NONE, provider_id++,
+      SERVICE_WORKER_PROVIDER_FOR_CONTROLLER, context()->AsWeakPtr(), nullptr));
+  host3->SetDocumentUrl(kOrigin1);

[nhiroki, 2015/03/20 09:08:05]

According to the comment, this should be

host3 -> host4
kOrigin1 -> kOrigin2

[kinuko, 2015/03/20 09:19:12]

:O fixed.

+
+  context()->AddProviderHost(make_scoped_ptr(host1));
+  context()->AddProviderHost(make_scoped_ptr(host2));
+  context()->AddProviderHost(make_scoped_ptr(host3));
+  context()->AddProviderHost(make_scoped_ptr(host4));
+
+  // Iterate over all provider hosts.
+  std::set<ServiceWorkerProviderHost*> results;
+  for (auto it = context()->GetProviderHostIterator(); !it->IsAtEnd();
+       it->Advance()) {
+    results.insert(it->GetProviderHost());
+  }
+  EXPECT_EQ(4u, results.size());
+  EXPECT_TRUE(ContainsKey(results, host1));
+  EXPECT_TRUE(ContainsKey(results, host2));
+  EXPECT_TRUE(ContainsKey(results, host3));
+  EXPECT_TRUE(ContainsKey(results, host4));
+
+  // Iterate over the client provider hosts that belong to kOrigin1.
+  results.clear();
+  for (auto it = context()->GetClientProviderHostIterator(kOrigin1);
+       !it->IsAtEnd(); it->Advance()) {
+    results.insert(it->GetProviderHost());
+  }
+  EXPECT_EQ(2u, results.size());
+  EXPECT_TRUE(ContainsKey(results, host1));
+  EXPECT_TRUE(ContainsKey(results, host3));
+
+  // Iterate over the provider hosts that belong to kOrigin2.
+  // (This should not include host4 as it's not for controllee.)
+  results.clear();
+  for (auto it = context()->GetClientProviderHostIterator(kOrigin2);
+       !it->IsAtEnd(); it->Advance()) {
+    results.insert(it->GetProviderHost());
+  }
+  EXPECT_EQ(1u, results.size());
+  EXPECT_TRUE(ContainsKey(results, host2));
+
+  context()->RemoveProviderHost(kRenderProcessId1, 1);
+  context()->RemoveProviderHost(kRenderProcessId2, 2);
+  context()->RemoveProviderHost(kRenderProcessId2, 3);
+  context()->RemoveProviderHost(kRenderProcessId2, 4);
+}
+
 }  // namespace content