[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..26b81f50e5dcc9691553167343a7effe61b702bc 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) {

[iclelland, 2015/11/25 14:58:16]

Can we document what this method does, and what the `frames` data structure
should contain?

[jkarlin, 2015/11/25 16:47:25]

Done.

+  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();
+
+  if (provider_host_iterator.IsAtEnd()) {
+    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,

[iclelland, 2015/11/25 14:58:16]

Why is this callback task posted differently (through base::TTRH::Get) than in
the code below (which uses BrowserThread::UI explicitly) ?

[jkarlin, 2015/11/25 16:47:25]

It's one less line of code that needs to specify a thread identifier. I see that
as preferable.

[iclelland, 2015/11/25 17:06:03]

OK - I misread the intent of the code, and thought that the callback was
supposed to be called on the UI thread, where it's actually just the
FrameListContainsMainFrameOnUI method that is.

Looks good, thanks.

+                                                  base::Bind(callback, false));
+    return;
+  }
+
+  scoped_ptr<std::vector<std::pair<int, int>>> render_frames(
+      new std::vector<std::pair<int, int>>());
+
+  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(