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

chrome/test/base/extension_load_waiter_one_shot.cc

Index: chrome/test/base/extension_load_waiter_one_shot.cc
diff --git a/chrome/test/base/extension_load_waiter_one_shot.cc b/chrome/test/base/extension_load_waiter_one_shot.cc
index ccd3661006f5af9a47e6a7552bafef62158f40a4..ae052c691f565714a98c89b210efc0982f5b7a21 100644
--- a/chrome/test/base/extension_load_waiter_one_shot.cc
+++ b/chrome/test/base/extension_load_waiter_one_shot.cc
@@ -25,7 +25,7 @@ void ExtensionLoadWaiterOneShot::WaitForExtension(const char* extension_id,
   extension_id_ = extension_id;
   load_looper_ = new content::MessageLoopRunner();
   registrar_.Add(this,
-                 extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
+                 extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD,
                  content::NotificationService::AllSources());
   load_cb.Run();
   load_looper_->Run();
@@ -35,15 +35,14 @@ void ExtensionLoadWaiterOneShot::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   switch (type) {
-    case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: {
+    case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD: {
       extensions::ExtensionHost* host =
           content::Details<extensions::ExtensionHost>(details).ptr();
       if (host->extension_id() == extension_id_) {
         browser_context_ = host->browser_context();
         CHECK(browser_context_);
         registrar_.Remove(
-            this,
-            extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
+            this, extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD,
             content::NotificationService::AllSources());
         load_looper_->Quit();
       }