Initial call for DriveAppRegistry::Update should wait for notification start-up.

chrome/browser/chromeos/drive/drive_integration_service.cc

 // Copyright (c) 2012 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/chromeos/drive/drive_integration_service.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
@@ skipping 234 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   observers_.RemoveObserver(observer);
 }
 
 void DriveIntegrationService::OnNotificationReceived() {
   file_system_->CheckForUpdates();
   drive_app_registry_->Update();
 }
 
 void DriveIntegrationService::OnPushNotificationEnabled(bool enabled) {
+  if (enabled)
+    drive_app_registry_->Update();
+
   const char* status = (enabled ? "enabled" : "disabled");
   util::Log("Push notification is %s", status);
 }
 
 bool DriveIntegrationService::IsDriveEnabled() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!IsDriveEnabledForProfile(profile_))
     return false;
 
@@ skipping 96 matching lines @@
 
   // Register for Google Drive invalidation notifications.
   DriveNotificationManager* drive_notification_manager =
       DriveNotificationManagerFactory::GetForProfile(profile_);
   if (drive_notification_manager) {
     drive_notification_manager->AddObserver(this);
     const bool registered =
         drive_notification_manager->push_notification_registered();
     const char* status = (registered ? "registered" : "not registered");
     util::Log("Push notification is %s", status);
+
+    if (drive_notification_manager->push_notification_enabled())
+      drive_app_registry_->Update();
   }
 
-  drive_app_registry_->Update();
   AddDriveMountPoint();
 }
 
 void DriveIntegrationService::DisableDrive() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   drive_disabled_ = true;
   // Change the download directory to the default value if the download
   // destination is set to under Drive mount point.
   PrefService* pref_service = profile_->GetPrefs();
@@ skipping 75 matching lines @@
         profile, NULL, base::FilePath(), NULL);
   } else {
     service = factory_for_test_.Run(profile);
   }
 
   service->Initialize();
   return service;
 }
 
 }  // namespace drive