Add ref count to service workers for extension API.

extensions/browser/extension_function.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/extension_function.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/synchronization/lock.h"
+#include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/browser/extension_message_filter.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_api.h"
@@ skipping 437 matching lines @@
   LogUma(success, timer_.Elapsed(), histogram_value_);
 }
 
 void ExtensionFunction::OnRespondingLater(ResponseValue value) {
   SendResponse(value->Apply());
 }
 
 UIThreadExtensionFunction::UIThreadExtensionFunction()
     : context_(nullptr),
       render_frame_host_(nullptr),
-      is_from_service_worker_(false),
+      service_worker_version_id_(content::kInvalidServiceWorkerVersionId),
       delegate_(nullptr) {}
 
 UIThreadExtensionFunction::~UIThreadExtensionFunction() {
-  if (dispatcher() && render_frame_host())
-    dispatcher()->OnExtensionFunctionCompleted(extension());
+  if (dispatcher() && (render_frame_host() || IsFromServiceWorker())) {
+    dispatcher()->OnExtensionFunctionCompleted(extension(),
+                                               service_worker_version_id_);
+  }
+
   // The extension function should always respond to avoid leaks in the
   // renderer, dangling callbacks, etc. The exception is if the system is
   // shutting down.
   // TODO(devlin): Duplicate this check in IOThreadExtensionFunction. It's
   // tricky because checking IsShuttingDown has to be called from the UI thread.
   extensions::ExtensionsBrowserClient* browser_client =
       extensions::ExtensionsBrowserClient::Get();
   DCHECK(!browser_client || browser_client->IsShuttingDown() || did_respond_ ||
          ignore_all_did_respond_for_testing_do_not_use)
       << name_;
@@ skipping 25 matching lines @@
 }
 
 bool UIThreadExtensionFunction::OnMessageReceived(const IPC::Message& message) {
   return false;
 }
 
 void UIThreadExtensionFunction::Destruct() const {
   BrowserThread::DeleteOnUIThread::Destruct(this);
 }
 
+bool UIThreadExtensionFunction::IsFromServiceWorker() const {

[michaeln, 2016/09/24 01:46:51]

style nit: maybe inline and rename is_from_service_worker()

[lazyboy, 2016/09/27 21:26:45]

Done.

+  return content::kInvalidServiceWorkerVersionId != service_worker_version_id_;
+}
+
 void UIThreadExtensionFunction::SetRenderFrameHost(
     content::RenderFrameHost* render_frame_host) {
   // An extension function from Service Worker does not have a RenderFrameHost.
-  if (is_from_service_worker_) {
+  if (IsFromServiceWorker()) {
     DCHECK(!render_frame_host);
     return;
   }
 
   DCHECK_NE(render_frame_host_ == nullptr, render_frame_host == nullptr);
   render_frame_host_ = render_frame_host;
   tracker_.reset(
       render_frame_host ? new RenderFrameHostTracker(this) : nullptr);
 }
 
@@ skipping 78 matching lines @@
 
 ExtensionFunction::ResponseAction AsyncExtensionFunction::Run() {
   return RunAsync() ? RespondLater() : RespondNow(Error(error_));
 }
 
 // static
 bool AsyncExtensionFunction::ValidationFailure(
     AsyncExtensionFunction* function) {
   return false;
 }