Make LoadMonitoringExtensionHostQueue remove itself as an ExtensionHost observer at the correct tim…

chrome/browser/extensions/api/extension_action/extension_action_api.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/active_script_controller.h"
@@ skipping 609 matching lines @@
       !ExtensionActionAPI::Get(GetProfile())->ShowExtensionActionPopup(
           extension_.get(), browser, false)) {
     error_ = kOpenPopupError;
     return false;
   }
 
   // Even if this is for an incognito window, we want to use the normal profile.
   // If the extension is spanning, then extension hosts are created with the
   // original profile, and if it's split, then we know the api call came from
   // the right profile.
-  registrar_.Add(this,
-                 NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
+  registrar_.Add(this, NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD,
                  content::Source<Profile>(profile));
 
   // Set a timeout for waiting for the notification that the popup is loaded.
   // Waiting is required so that the popup view can be retrieved by the custom
   // bindings for the response callback. It's also needed to keep this function
   // instance around until a notification is observed.
   base::MessageLoopForUI::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&BrowserActionOpenPopupFunction::OpenPopupTimedOut, this),
       base::TimeDelta::FromSeconds(10));
   return true;
 }
 
 void BrowserActionOpenPopupFunction::OpenPopupTimedOut() {
   if (response_sent_)
     return;
 
   DVLOG(1) << "chrome.browserAction.openPopup did not show a popup.";
   error_ = kOpenPopupError;
   SendResponse(false);
   response_sent_ = true;
 }
 
 void BrowserActionOpenPopupFunction::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  DCHECK_EQ(NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING, type);
+  DCHECK_EQ(NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD, type);
   if (response_sent_)
     return;
 
   ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
   if (host->extension_host_type() != VIEW_TYPE_EXTENSION_POPUP ||
       host->extension()->id() != extension_->id())
     return;
 
   SendResponse(true);
   response_sent_ = true;
   registrar_.RemoveAll();
 }
 
 }  // namespace extensions