Introduce State to DriveIntegrationService.

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 121 matching lines @@
 }
 
 }  // namespace
 
 DriveIntegrationService::DriveIntegrationService(
     Profile* profile,
     DriveServiceInterface* test_drive_service,
     const base::FilePath& test_cache_root,
     FileSystemInterface* test_file_system)
     : profile_(profile),
-      is_initialized_(false),
+      state_(NOT_INITIALIZED),
       cache_root_directory_(!test_cache_root.empty() ?
                             test_cache_root : util::GetCacheRootPath(profile)),
       weak_ptr_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
   blocking_task_runner_ = blocking_pool->GetSequencedTaskRunner(
       blocking_pool->GetSequenceToken());
 
   OAuth2TokenService* oauth_service =
@@ skipping 49 matching lines @@
   debug_info_collector_.reset(
       new DebugInfoCollector(file_system(), cache_.get()));
 }
 
 DriveIntegrationService::~DriveIntegrationService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 void DriveIntegrationService::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_EQ(NOT_INITIALIZED, state_);
+
+  state_ = INITIALIZING;
   drive_service_->Initialize();
   file_system_->Initialize();
 
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&InitializeMetadata,
                  cache_root_directory_,
                  metadata_storage_.get(),
                  cache_.get(),
                  resource_metadata_.get()),
       base::Bind(&DriveIntegrationService::InitializeAfterMetadataInitialized,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void DriveIntegrationService::Shutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  weak_ptr_factory_.InvalidateWeakPtrs();
+
   DriveNotificationManager* drive_notification_manager =
       DriveNotificationManagerFactory::GetForBrowserContext(profile_);
   if (drive_notification_manager)
     drive_notification_manager->RemoveObserver(this);
 
   RemoveDriveMountPoint();
   debug_info_collector_.reset();
   download_handler_.reset();
   file_system_.reset();
   drive_app_registry_.reset();
@@ skipping 25 matching lines @@
   const char* status = (enabled ? "enabled" : "disabled");
   util::Log(logging::LOG_INFO, "Push notification is %s", status);
 }
 
 bool DriveIntegrationService::IsDriveEnabled() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!util::IsDriveEnabledForProfile(profile_))
     return false;
 
-  return is_initialized_;
+  // For backword compatibility, REMOUNTING also means enabled.
+  return state_ == INITIALIZED || state_ == REMOUNTING;
 }
 
 void DriveIntegrationService::ClearCacheAndRemountFileSystem(
     const base::Callback<void(bool)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
+  if (state_ != INITIALIZED) {
+    callback.Run(false);
+    return;
+  }
+
+  state_ = REMOUNTING;
+
   RemoveDriveMountPoint();
   // Reloading the file system will clear the resource metadata.
   file_system_->Reload();
   // Reload the Drive app registry too.
   drive_app_registry_->Update();
 
   cache_->ClearAllOnUIThread(base::Bind(
       &DriveIntegrationService::AddBackDriveMountPoint,
       weak_ptr_factory_.GetWeakPtr(),
       callback));
@@ skipping 24 matching lines @@
   fileapi::ExternalMountPoints* mount_points =
       BrowserContext::GetMountPoints(profile_);
   DCHECK(mount_points);
 
   bool success = mount_points->RegisterFileSystem(
       drive_mount_point.BaseName().AsUTF8Unsafe(),
       fileapi::kFileSystemTypeDrive,
       drive_mount_point);
 
   if (success) {
+    state_ = INITIALIZED;
     util::Log(logging::LOG_INFO, "Drive mount point is added");
     FOR_EACH_OBSERVER(DriveIntegrationServiceObserver, observers_,
                       OnFileSystemMounted());
+  } else {
+    state_ = NOT_INITIALIZED;
   }
 }
 
 void DriveIntegrationService::RemoveDriveMountPoint() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   job_list()->CancelAllJobs();
 
   FOR_EACH_OBSERVER(DriveIntegrationServiceObserver, observers_,
                     OnFileSystemBeingUnmounted());
@@ skipping 15 matching lines @@
     LOG(WARNING) << "Failed to initialize: " << FileErrorToString(error);
 
     // Change the download directory to the default value if the download
     // destination is set to under Drive mount point.
     PrefService* pref_service = profile_->GetPrefs();
     if (util::IsUnderDriveMountPoint(
             pref_service->GetFilePath(prefs::kDownloadDefaultDirectory))) {
       pref_service->SetFilePath(prefs::kDownloadDefaultDirectory,
                                 DownloadPrefs::GetDefaultDownloadDirectory());
     }
+
+    // Back to NOT_INITIALIZED state. Then, re-running Initialize() should
+    // work if the error is recovarable manually (such as out of disk space).
+    state_ = NOT_INITIALIZED;
     return;
   }
-  is_initialized_ = true;
 
   content::DownloadManager* download_manager =
       g_browser_process->download_status_updater() ?
       BrowserContext::GetDownloadManager(profile_) : NULL;
   download_handler_->Initialize(
       download_manager,
       cache_root_directory_.Append(kTemporaryFileDirectory));
 
   // Register for Google Drive invalidation notifications.
   DriveNotificationManager* drive_notification_manager =
       DriveNotificationManagerFactory::GetForBrowserContext(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(logging::LOG_INFO, "Push notification is %s", status);
 
     if (drive_notification_manager->push_notification_enabled())
       drive_app_registry_->Update();
   }
 
   AddDriveMountPoint();
+  state_ = INITIALIZED;
 }
 
 //===================== DriveIntegrationServiceFactory =======================
 
 // static
 DriveIntegrationService* DriveIntegrationServiceFactory::GetForProfile(
     Profile* profile) {
   DriveIntegrationService* service = GetForProfileRegardlessOfStates(profile);
   if (service && !service->IsDriveEnabled())
     return NULL;
@@ skipping 61 matching lines @@
         profile, NULL, base::FilePath(), NULL);
   } else {
     service = factory_for_test_.Run(profile);
   }
 
   service->Initialize();
   return service;
 }
 
 }  // namespace drive