Clear UIThreadExtensionFunction::render_frame_host_ when RFH is gone.

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"
@@ skipping 407 matching lines @@
   }
 }
 
 void ExtensionFunction::OnRespondingLater(ResponseValue value) {
   SendResponse(value->Apply());
 }
 
 UIThreadExtensionFunction::UIThreadExtensionFunction()
     : context_(nullptr),
       render_frame_host_(nullptr),
-      delegate_(nullptr) {
-}
+      is_from_service_worker_(false),
+      delegate_(nullptr) {}
 
 UIThreadExtensionFunction::~UIThreadExtensionFunction() {
   if (dispatcher() && render_frame_host())
     dispatcher()->OnExtensionFunctionCompleted(extension());
 }
 
 UIThreadExtensionFunction*
 UIThreadExtensionFunction::AsUIThreadExtensionFunction() {
   return this;
 }
 
 bool UIThreadExtensionFunction::OnMessageReceived(const IPC::Message& message) {
   return false;
 }
 
 void UIThreadExtensionFunction::Destruct() const {
   BrowserThread::DeleteOnUIThread::Destruct(this);
 }
 
 content::RenderViewHost*
 UIThreadExtensionFunction::render_view_host_do_not_use() const {
   return render_frame_host_ ? render_frame_host_->GetRenderViewHost() : nullptr;
 }
 
 void UIThreadExtensionFunction::SetRenderFrameHost(
     content::RenderFrameHost* render_frame_host) {
   // An extension function from Service Worker does not have a RenderFrameHost.
-  if (!render_frame_host)
+  if (is_from_service_worker_) {
+    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);
 }
 
 content::WebContents* UIThreadExtensionFunction::GetAssociatedWebContents() {
   content::WebContents* web_contents = NULL;
   if (dispatcher())
     web_contents = dispatcher()->GetAssociatedWebContents();
@@ skipping 103 matching lines @@
 ExtensionFunction::ResponseAction SyncIOThreadExtensionFunction::Run() {
   return RespondNow(RunSync() ? ArgumentList(std::move(results_))
                               : Error(error_));
 }
 
 // static
 bool SyncIOThreadExtensionFunction::ValidationFailure(
     SyncIOThreadExtensionFunction* function) {
   return false;
 }