Revert "Revert of Reland: Switch WindowedNotificationObserver to use base::RunLoop. (patchset #3 id…

chrome/browser/extensions/chrome_extension_test_notification_observer.cc

 // Copyright 2016 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/chrome_extension_test_notification_observer.h>
 #include "base/scoped_observer.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/test/test_utils.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
 
 namespace extensions {
 
 namespace {
 
 // A callback that returns true if the condition has been met and takes no
 // arguments.
@@ skipping 49 matching lines @@
   DCHECK(browser_);
   ScopedObserver<ExtensionActionAPI, ExtensionActionAPI::Observer> observer(
       this);
   observer.Add(ExtensionActionAPI::Get(GetBrowserContext()));
   WaitForCondition(
       base::Bind(&HasPageActionVisibilityReachedTarget, browser_, count), NULL);
   return true;
 }
 
 bool ChromeExtensionTestNotificationObserver::WaitForExtensionViewsToLoad() {
+  // Some views might be not created yet. This call may become insufficient if
+  // e.g. implementation of ExtensionHostQueue changes.
+  content::RunAllPendingInMessageLoop();
+
   ProcessManager* manager = ProcessManager::Get(GetBrowserContext());
   NotificationSet notification_set;
   notification_set.Add(content::NOTIFICATION_WEB_CONTENTS_DESTROYED);
   notification_set.Add(content::NOTIFICATION_LOAD_STOP);
   notification_set.AddExtensionFrameUnregistration(manager);
   WaitForCondition(
       base::Bind(&HaveAllExtensionRenderFrameHostsFinishedLoading, manager),
       &notification_set);
   return true;
 }
@@ skipping 21 matching lines @@
                    &notification_set);
   return true;
 }
 
 void ChromeExtensionTestNotificationObserver::OnPageActionsUpdated(
     content::WebContents* web_contents) {
   MaybeQuit();
 }
 
 }  // namespace extensions