DriveFileSyncService listens to OnAuthenticated event to recover from unavailable state

chrome/browser/sync_file_system/drive_file_sync_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/sync_file_system/drive_file_sync_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #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"
 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
 #include "chrome/browser/sync_file_system/remote_change_processor.h"
 #include "chrome/browser/sync_file_system/sync_file_system.pb.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/escape.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/syncable/sync_file_metadata.h"
@@ skipping 174 matching lines @@
 DriveFileSyncService::DriveFileSyncService(Profile* profile)
     : last_operation_status_(fileapi::SYNC_STATUS_OK),
       state_(REMOTE_SERVICE_OK),
       largest_changestamp_(0),
       weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   temporary_file_dir_ =
       profile->GetPath().Append(kSyncFileSystemDir).Append(kTempDirName);
   token_.reset(new TaskToken(AsWeakPtr()));
 
   sync_client_.reset(new DriveFileSyncClient(profile));
+  sync_client_->AddObserver(this);
 
   metadata_store_.reset(new DriveMetadataStore(
       profile->GetPath().Append(kSyncFileSystemDir),
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::FILE)));
 
   metadata_store_->Initialize(
       base::Bind(&DriveFileSyncService::DidInitializeMetadataStore, AsWeakPtr(),
                  base::Passed(GetToken(FROM_HERE, TASK_TYPE_DATABASE,
                                        "Metadata database initialization"))));
 }
 
 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();
 }
 
 // static
 scoped_ptr<DriveFileSyncService> DriveFileSyncService::CreateForTesting(
     const FilePath& base_dir,
     scoped_ptr<DriveFileSyncClient> sync_client,
     scoped_ptr<DriveMetadataStore> metadata_store) {
   return make_scoped_ptr(new DriveFileSyncService(
       base_dir, sync_client.Pass(), metadata_store.Pass()));
@@ skipping 251 matching lines @@
       DidApplyLocalChange(token.Pass(), url, google_apis::GDATA_OTHER_ERROR,
                           callback, fileapi::SYNC_STATUS_FAILED);
       return;
     }
   }
   NOTREACHED();
   DidApplyLocalChange(token.Pass(), url, google_apis::GDATA_OTHER_ERROR,
                       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,
     scoped_ptr<DriveFileSyncClient> sync_client,
     scoped_ptr<DriveMetadataStore> metadata_store)
     : last_operation_status_(fileapi::SYNC_STATUS_OK),
       state_(REMOTE_SERVICE_OK),
       largest_changestamp_(0),
       weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   temporary_file_dir_ = base_dir.Append(kTempDirName);
@@ skipping 809 matching lines @@
     return false;
   const PathToChange& path_to_change = found_url->second;
   PathToChange::const_iterator found_path = path_to_change.find(url.path());
   if (found_path == path_to_change.end())
     return false;
   *change = found_path->second;
   return true;
 }
 
 }  // namespace sync_file_system