DriveFileSyncService listens to OnAuthenticated event to recover from unavailable state

chrome/browser/sync_file_system/drive_file_sync_service.cc

Index: chrome/browser/sync_file_system/drive_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
index 3ad2862e5cf19718f0f23721e1861b82a58f569a..a7d4cb5a21e6fe0a5925cbc65310e6d27b2efc7c 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -14,7 +14,6 @@
 #include "base/message_loop_proxy.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/google_apis/gdata_wapi_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_client.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_util.h"
@@ -209,6 +208,7 @@ DriveFileSyncService::DriveFileSyncService(Profile* profile)
   token_.reset(new TaskToken(AsWeakPtr()));
 
   sync_client_.reset(new DriveFileSyncClient(profile));
+  sync_client_->AddObserver(this);
 
   metadata_store_.reset(new DriveMetadataStore(
       profile->GetPath().Append(kSyncFileSystemDir),
@@ -225,6 +225,7 @@ DriveFileSyncService::~DriveFileSyncService() {
   // Invalidate WeakPtr instances here explicitly to notify TaskToken that we
   // can safely discard the token.
   weak_factory_.InvalidateWeakPtrs();
+  sync_client_->RemoveObserver(this);
   token_.reset();
 }
 
@@ -496,6 +497,14 @@ void DriveFileSyncService::ApplyLocalChange(
                       callback, fileapi::SYNC_STATUS_FAILED);
 }
 
+void DriveFileSyncService::OnAuthenticated() {
+  DVLOG(1) << "OnAuthenticated";
+  state_ = REMOTE_SERVICE_OK;

[kinuko, 2012/12/03 06:17:37]

Hmm we're not defining strict state transition map here but maybe we should flip
this only if the service state was

REMOTE_SERVICE_AUTHENTICATION_REQUIRED or possibly
REMOTE_SERVICE_TEMPORARY_UNAVAILABLE

?

[nhiroki, 2012/12/03 06:42:13]

Done.

+  FOR_EACH_OBSERVER(
+        Observer, observers_,
+        OnRemoteServiceStateUpdated(state_, "Authenticated"));
+}
+
 // Called by CreateForTesting.
 DriveFileSyncService::DriveFileSyncService(
     const FilePath& base_dir,