cros: Fix DriveAppProvider racing during initialization.

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 <set>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 565 matching lines @@
 
   // Uninstall is removed from sync and the app is added again.
   provider()->RemoveUninstalledDriveAppFromSync(kDriveAppId);
   content::RunAllPendingInMessageLoop();
   WaitForPendingDriveAppConverters();
   chrome_app_id = mapping()->GetChromeApp(kDriveAppId);
   EXPECT_FALSE(chrome_app_id.empty());
   EXPECT_TRUE(ExtensionRegistry::Get(profile())->GetExtensionById(
       chrome_app_id, ExtensionRegistry::EVERYTHING));
 }
+
+// Tests that sync changes are processed after DriveAppRegistry is updated.
+IN_PROC_BROWSER_TEST_F(DriveAppProviderTest,
+                       PRE_UpdateAfterDriveAppRegistryUpdate) {
+  // Add a Drive app.
+  fake_drive_service()->AddApp(
+      kDriveAppId, kDriveAppName, kChromeAppId, kLaunchUrl, true);
+  RefreshDriveAppRegistry();
+  WaitForPendingDriveAppConverters();
+
+  // The Drive app is present in the system.
+  std::string chrome_app_id = mapping()->GetChromeApp(kDriveAppId);
+  EXPECT_FALSE(chrome_app_id.empty());
+  EXPECT_TRUE(ExtensionRegistry::Get(profile())->GetExtensionById(
+      chrome_app_id, ExtensionRegistry::EVERYTHING));
+}
+IN_PROC_BROWSER_TEST_F(DriveAppProviderTest,
+                       UpdateAfterDriveAppRegistryUpdate) {
+  // On the next run, uninstall from sync before DriveAppRegistry updates.
+  provider()->AddUninstalledDriveAppFromSync(kDriveAppId);
+  content::RunAllPendingInMessageLoop();
+  WaitForPendingDriveAppConverters();
+
+  // The app should still be there.
+  std::string chrome_app_id = mapping()->GetChromeApp(kDriveAppId);
+  EXPECT_FALSE(chrome_app_id.empty());
+  EXPECT_TRUE(ExtensionRegistry::Get(profile())->GetExtensionById(
+      chrome_app_id, ExtensionRegistry::EVERYTHING));
+
+  // Now update DriveAppRegistry.
+  fake_drive_service()->AddApp(
+      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));
+}