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

chrome/browser/extensions/extension_messages_apitest.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 "base/base64.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 31 matching lines @@
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 namespace extensions {
 namespace {
 
 class MessageSender : public content::NotificationObserver {
  public:
   MessageSender() {
     registrar_.Add(this,
-                   extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
+                   extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD,
                    content::NotificationService::AllSources());
   }
 
  private:
   static scoped_ptr<base::ListValue> BuildEventArguments(
       const bool last_message,
       const std::string& data) {
     base::DictionaryValue* event = new base::DictionaryValue();
     event->SetBoolean("lastMessage", last_message);
     event->SetString("data", data);
     scoped_ptr<base::ListValue> arguments(new base::ListValue());
     arguments->Append(event);
     return arguments.Pass();
   }
 
   static scoped_ptr<Event> BuildEvent(scoped_ptr<base::ListValue> event_args,
                                       Profile* profile,
                                       GURL event_url) {
     scoped_ptr<Event> event(new Event("test.onMessage", event_args.Pass()));
     event->restrict_to_browser_context = profile;
     event->event_url = event_url;
     return event.Pass();
   }
 
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override {
-    DCHECK_EQ(extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING, type);
+    DCHECK_EQ(extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD,
+              type);
     EventRouter* event_router =
         EventRouter::Get(content::Source<Profile>(source).ptr());
 
     // Sends four messages to the extension. All but the third message sent
     // from the origin http://b.com/ are supposed to arrive.
     event_router->BroadcastEvent(BuildEvent(
         BuildEventArguments(false, "no restriction"),
         content::Source<Profile>(source).ptr(),
         GURL()));
     event_router->BroadcastEvent(BuildEvent(
@@ skipping 1095 matching lines @@
   ui_test_utils::NavigateToURL(browser(), chromium_org_url());
   EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR,
             CanConnectAndSendMessagesToMainFrame(invalid.get()));
 }
 
 #endif  // !defined(OS_WIN) - http://crbug.com/350517.
 
 }  // namespace
 
 };  // namespace extensions