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

chrome/browser/apps/drive/drive_app_provider_browsertest.cc

 // Copyright 2014 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/apps/drive/drive_app_provider.h"
 
 #include <memory>
 #include <set>
 #include <string>
 
@@ skipping 259 matching lines @@
   EXPECT_FALSE(fake_drive_service()->HasApp(kDriveAppId));
 }
 
 // A matching Chrome app replaces the created URL app.
 IN_PROC_BROWSER_TEST_F(DriveAppProviderTest, MatchingChromeAppInstalled) {
   // Prepare a Drive app that matches the not-yet-installed kChromeAppId.
   fake_drive_service()->AddApp(
       kDriveAppId, kDriveAppName, kChromeAppId, kLaunchUrl, true);
   RefreshDriveAppRegistry();
   WaitForPendingDriveAppConverters();
-  ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
 
   // An Url app should be created.
-  const Extension* url_app = registry->GetExtensionById(
-      mapping()->GetChromeApp(kDriveAppId), ExtensionRegistry::EVERYTHING);
+  const Extension* url_app =
+      ExtensionRegistry::Get(profile())->GetExtensionById(
+          mapping()->GetChromeApp(kDriveAppId), ExtensionRegistry::EVERYTHING);
   EXPECT_TRUE(url_app->is_hosted_app());
   EXPECT_TRUE(url_app->from_bookmark());
 
   const std::string url_app_id = url_app->id();
   EXPECT_NE(kChromeAppId, url_app_id);
   EXPECT_EQ(url_app_id, mapping()->GetChromeApp(kDriveAppId));
   EXPECT_TRUE(mapping()->IsChromeAppGenerated(url_app_id));
 
-  // Install a chrome app with matching id.
-  size_t num_before = registry->enabled_extensions().size();
-  InstallChromeApp(1);
-  // Url app should be auto uninstalled. This happens asynchronously after the
-  // installation of the app that replaces it, so the task might still be
-  // pending.
-  content::RunAllPendingInMessageLoop();
-  EXPECT_FALSE(
-      registry->GetExtensionById(url_app_id, ExtensionRegistry::EVERYTHING));
-  EXPECT_EQ(num_before, registry->enabled_extensions().size());
+  // Installs a chrome app with matching id.
+  InstallChromeApp(0);
 
   // The Drive app should be mapped to chrome app.
   EXPECT_EQ(kChromeAppId, mapping()->GetChromeApp(kDriveAppId));
   EXPECT_FALSE(mapping()->IsChromeAppGenerated(kChromeAppId));
+
+  // Url app should be auto uninstalled.
+  EXPECT_FALSE(ExtensionRegistry::Get(profile())->GetExtensionById(
+      url_app_id, ExtensionRegistry::EVERYTHING));
 }
 
 // Tests that the corresponding URL app is uninstalled when a Drive app is
 // disconnected.
 IN_PROC_BROWSER_TEST_F(DriveAppProviderTest,
                        DisconnectDriveAppUninstallUrlApp) {
   // Prepare a Drive app that matches the not-yet-installed kChromeAppId.
   fake_drive_service()->AddApp(
       kDriveAppId, kDriveAppName, kChromeAppId, kLaunchUrl, true);
   RefreshDriveAppRegistry();
@@ skipping 304 matching lines @@
       kDriveAppId, kDriveAppName, kChromeAppId, kLaunchUrl, true);
   RefreshDriveAppRegistry();
   WaitForPendingDriveAppConverters();
 
   // The app should be gone.
   chrome_app_id = mapping()->GetChromeApp(kDriveAppId);
   EXPECT_TRUE(chrome_app_id.empty());
   EXPECT_FALSE(ExtensionRegistry::Get(profile())->GetExtensionById(
       chrome_app_id, ExtensionRegistry::EVERYTHING));
 }