[BackgroundSync] Only allow SyncManager.register to occur from main frame

content/browser/service_worker/service_worker_context_core.cc

Index: content/browser/service_worker/service_worker_context_core.cc
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc
index 503f27de3281d3e318c2bf8ba1beffa56c7df614..920d64f2df1cfc08683151def7c940f483b25df1 100644
--- a/content/browser/service_worker/service_worker_context_core.cc
+++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -12,6 +12,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/service_worker_context_observer.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
@@ -65,6 +66,21 @@ bool IsSameOriginWindowProviderHost(const GURL& origin,
          host->document_url().GetOrigin() == origin;
 }
 
+bool FrameListContainsMainFrameOnUI(
+    scoped_ptr<std::vector<std::pair<int, int>>> frames) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  for (const auto& frame : *frames) {
+    RenderFrameHostImpl* render_frame_host =
+        RenderFrameHostImpl::FromID(frame.first, frame.second);
+    if (!render_frame_host)
+      continue;
+    if (!render_frame_host->GetParent())
+      return true;
+  }
+  return false;
+}
+
 class ClearAllServiceWorkersHelper
     : public base::RefCounted<ClearAllServiceWorkersHelper> {
  public:
@@ -288,11 +304,35 @@ ServiceWorkerContextCore::GetClientProviderHostIterator(const GURL& origin) {
       providers_.get(), base::Bind(IsSameOriginClientProviderHost, origin)));
 }
 
-bool ServiceWorkerContextCore::HasWindowProviderHost(const GURL& origin) const {
+void ServiceWorkerContextCore::HasMainFrameProviderHost(
+    const GURL& origin,
+    const BoolCallback& callback) const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   ProviderHostIterator provider_host_iterator(
       providers_.get(), base::Bind(IsSameOriginWindowProviderHost, origin));
-  return !provider_host_iterator.IsAtEnd();
+
+  scoped_ptr<std::vector<std::pair<int, int>>> render_frames(

[michaeln, 2015/11/25 01:09:46]

maybe move local heap alloc down after line 321

[jkarlin, 2015/11/25 13:15:08]

Done.

+      new std::vector<std::pair<int, int>>());
+
+  if (provider_host_iterator.IsAtEnd()) {
+    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+                                                  base::Bind(callback, false));
+    return;
+  }
+
+  while (!provider_host_iterator.IsAtEnd()) {
+    ServiceWorkerProviderHost* provider_host =
+        provider_host_iterator.GetProviderHost();
+    render_frames->push_back(
+        std::make_pair(provider_host->process_id(), provider_host->frame_id()));
+    provider_host_iterator.Advance();
+  }
+
+  BrowserThread::PostTaskAndReplyWithResult(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&FrameListContainsMainFrameOnUI,
+                 base::Passed(render_frames.Pass())),
+      callback);
 }
 
 void ServiceWorkerContextCore::RegisterProviderHostByClientID(