Add ref count to service workers for extension API.

extensions/browser/extension_function.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_EXTENSION_FUNCTION_H_
 #define EXTENSIONS_BROWSER_EXTENSION_FUNCTION_H_
 
 #include <stddef.h>
 
 #include <list>
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/timer/elapsed_timer.h"
+#include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/console_message_level.h"
 #include "extensions/browser/extension_function_histogram_value.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/features/feature.h"
 #include "ipc/ipc_message.h"
 
 class ExtensionFunction;
 class UIThreadExtensionFunction;
@@ skipping 479 matching lines @@
   }
 
   void set_dispatcher(const base::WeakPtr<
       extensions::ExtensionFunctionDispatcher>& dispatcher) {
     dispatcher_ = dispatcher;
   }
   extensions::ExtensionFunctionDispatcher* dispatcher() const {
     return dispatcher_.get();
   }
 
-  void set_is_from_service_worker(bool value) {
-    is_from_service_worker_ = value;
+  void set_service_worker_version_id(int64_t version_id) {
+    service_worker_version_id_ = version_id;
   }
 
   // Gets the "current" web contents if any. If there is no associated web
   // contents then defaults to the foremost one.
   // NOTE: "current" can mean different things in different contexts. You
   // probably want to use GetSenderWebContents().
   virtual content::WebContents* GetAssociatedWebContents();
 
   // Returns the web contents associated with the sending |render_frame_host_|.
   // This can be null.
@@ skipping 17 matching lines @@
 
   // The BrowserContext of this function's extension.
   // TODO(devlin): Grr... protected members. Move this to be private.
   content::BrowserContext* context_;
 
  private:
   class RenderFrameHostTracker;
 
   void Destruct() const override;
 
+  bool is_from_service_worker() const {
+    return content::kInvalidServiceWorkerVersionId !=
+           service_worker_version_id_;

[Devlin, 2016/10/06 16:35:12]

nit: invert

[lazyboy, 2016/10/06 17:57:37]

Done.

+  }
+
   // The dispatcher that will service this extension function call.
   base::WeakPtr<extensions::ExtensionFunctionDispatcher> dispatcher_;
 
   // The RenderFrameHost we will send responses to.
   content::RenderFrameHost* render_frame_host_;
 
-  // Whether or not this ExtensionFunction was called by an extension Service
-  // Worker.
-  bool is_from_service_worker_;
+  // If this ExtensionFunction was called by an extension Service Worker, then
+  // this contains the worker's version id.
+  int64_t service_worker_version_id_;
 
   std::unique_ptr<RenderFrameHostTracker> tracker_;
 
   // The blobs transferred to the renderer process.
   std::vector<std::string> transferred_blob_uuids_;
 
   DISALLOW_COPY_AND_ASSIGN(UIThreadExtensionFunction);
 };
 
 // Extension functions that run on the IO thread. This type of function avoids
@@ skipping 92 matching lines @@
  private:
   // If you're hitting a compile error here due to "final" - great! You're
   // doing the right thing, you just need to extend UIThreadExtensionFunction
   // instead of AsyncExtensionFunction.
   ResponseAction Run() final;
 
   DISALLOW_COPY_AND_ASSIGN(AsyncExtensionFunction);
 };
 
 #endif  // EXTENSIONS_BROWSER_EXTENSION_FUNCTION_H_