cros: Fix DriveAppProvider racing during initialization.

chrome/browser/apps/drive/drive_app_provider.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 <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 24 matching lines @@
 
 }  // namespace
 
 DriveAppProvider::DriveAppProvider(
     Profile* profile,
     DriveAppUninstallSyncService* uninstall_sync_service)
     : profile_(profile),
       uninstall_sync_service_(uninstall_sync_service),
       service_bridge_(DriveServiceBridge::Create(profile).Pass()),
       mapping_(new DriveAppMapping(profile->GetPrefs())),
+      drive_app_registry_updated_(false),
       weak_ptr_factory_(this) {
   service_bridge_->GetAppRegistry()->AddObserver(this);
   ExtensionRegistry::Get(profile_)->AddObserver(this);
 }
 
 DriveAppProvider::~DriveAppProvider() {
   ExtensionRegistry::Get(profile_)->RemoveObserver(this);
   service_bridge_->GetAppRegistry()->RemoveObserver(this);
 }
 
@@ skipping 174 matching lines @@
 
   extensions::ExtensionSystem::Get(profile_)
       ->extension_service()
       ->UninstallExtension(chrome_app_id,
                            extensions::UNINSTALL_REASON_SYNC,
                            base::Bind(&base::DoNothing),
                            NULL);
 }
 
 void DriveAppProvider::UpdateDriveApps() {
+  if (!drive_app_registry_updated_)
+    return;
+
   service_bridge_->GetAppRegistry()->GetAppList(&drive_apps_);
 
   IdSet current_ids;
   for (size_t i = 0; i < drive_apps_.size(); ++i) {
     const std::string& drive_app_id = drive_apps_[i].app_id;
     if (!mapping_->IsUninstalledDriveApp(drive_app_id) &&
         drive_apps_[i].create_url.is_valid()) {
       current_ids.insert(drive_app_id);
     }
   }
@@ skipping 10 matching lines @@
   for (size_t i = 0; i < drive_apps_.size(); ++i) {
     if (!mapping_->IsUninstalledDriveApp(drive_apps_[i].app_id) &&
         drive_apps_[i].create_url.is_valid()) {
       AddOrUpdateDriveApp(drive_apps_[i]);
     }
   }
   SchedulePendingConverters();
 }
 
 void DriveAppProvider::OnDriveAppRegistryUpdated() {
+  drive_app_registry_updated_ = true;
   UpdateDriveApps();
 }
 
 void DriveAppProvider::OnExtensionInstalled(
     content::BrowserContext* browser_context,
     const Extension* extension,
     bool is_update) {
   // Bail if the |extension| is installed from a converter. The post install
   // processing will be handled in OnLocalAppConverted.
   if (!pending_converters_.empty() &&
@@ skipping 42 matching lines @@
       service_bridge_->GetAppRegistry()->UninstallApp(
           drive_app_id, base::Bind(&IgnoreUninstallResult));
     } else {
       mapping_->AddUninstalledDriveApp(drive_app_id);
       uninstall_sync_service_->TrackUninstalledDriveApp(drive_app_id);
     }
 
     return;
   }
 }