Revert of Revert "Revert of Reland: Switch WindowedNotificationObserver to use base::RunLoop....

chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

 // 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/app_window/native_app_window.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/foundation_util.h"
 #import "base/mac/mac_util.h"
@@ skipping 25 matching lines @@
 
 using extensions::AppWindow;
 using extensions::PlatformAppBrowserTest;
 
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Return;
 
 namespace {
 
-class AppWindowObserver : public extensions::AppWindowRegistry::Observer {
- public:
-  AppWindowObserver(Profile* profile)
-      : registry_(extensions::AppWindowRegistry::Get(profile)) {
-    registry_->AddObserver(this);
-  }
-
-  ~AppWindowObserver() override { registry_->RemoveObserver(this); }
-
-  void Wait(int window_count) {
-    if (windows_added_count_ < window_count) {
-      windows_added_count_expected_ = window_count;
-      run_loop_.Run();
-    }
-  }
-
- private:
-  void OnAppWindowAdded(AppWindow* app_window) override {
-    ++windows_added_count_;
-    if (windows_added_count_expected_ > 0 &&
-        windows_added_count_ >= windows_added_count_expected_) {
-      run_loop_.Quit();
-    }
-  }
-
-  extensions::AppWindowRegistry* registry_;
-  int windows_added_count_ = 0;
-  int windows_added_count_expected_ = 0;
-  base::RunLoop run_loop_;
-};
-
 // The param selects whether to use ChromeNativeAppWindowViewsMac, otherwise it
 // will use NativeAppWindowCocoa.
 class NativeAppWindowCocoaBrowserTest
     : public testing::WithParamInterface<bool>,
       public PlatformAppBrowserTest {
  protected:
   NativeAppWindowCocoaBrowserTest() {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     PlatformAppBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(
         GetParam() ? switches::kEnableMacViewsNativeAppWindows
                    : switches::kDisableMacViewsNativeAppWindows);
   }
 
   void SetUpAppWithWindows(int num_windows) {
     app_ = InstallExtension(
         test_data_dir_.AppendASCII("platform_apps").AppendASCII("minimal"), 1);
     EXPECT_TRUE(app_);
 
-    AppWindowObserver window_observer(profile());
     for (int i = 0; i < num_windows; ++i) {
+      content::WindowedNotificationObserver app_loaded_observer(
+          content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
+          content::NotificationService::AllSources());
       OpenApplication(AppLaunchParams(
           profile(), app_, extensions::LAUNCH_CONTAINER_NONE,
           WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
+      app_loaded_observer.Wait();
     }
-    window_observer.Wait(num_windows);
   }
 
   const extensions::Extension* app_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoaBrowserTest);
 };
 
 }  // namespace
 
@@ skipping 609 matching lines @@
   [expected_color getComponents:expected_components];
   [color getComponents:color_components];
   EXPECT_NEAR(expected_components[0], color_components[0], 0.01);
   EXPECT_NEAR(expected_components[1], color_components[1], 0.01);
   EXPECT_NEAR(expected_components[2], color_components[2], 0.01);
 }
 
 INSTANTIATE_TEST_CASE_P(NativeAppWindowCocoaBrowserTestInstance,
                         NativeAppWindowCocoaBrowserTest,
                         ::testing::Bool());