Merge 140889 - gdata: Fix a crash at shutdown with pending gdata operations

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
===================================================================
--- chrome/browser/chromeos/system/ash_system_tray_delegate.cc	(revision 141016)
+++ chrome/browser/chromeos/system/ash_system_tray_delegate.cc	(working copy)
@@ -229,6 +229,17 @@
     if (SystemKeyEventListener::GetInstance())
       SystemKeyEventListener::GetInstance()->RemoveCapsLockObserver(this);
     bluetooth_adapter_->RemoveObserver(this);
+
+    // Stop observing gdata operations.
+    Profile* profile = ProfileManager::GetDefaultProfile();
+    if (gdata::util::IsGDataAvailable(profile)) {
+      GDataSystemService* system_service =
+          GDataSystemServiceFactory::FindForProfile(profile);
+      if (system_service && system_service->file_system()) {
+        system_service->file_system()->GetOperationRegistry()->
+            RemoveObserver(this);
+      }
+    }
   }
 
   // Overridden from ash::SystemTrayDelegate: