Properly handle initialization failure and following manager shutdown without

sync/internal_api/sync_rollback_manager_base.cc

 // Copyright 2014 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 "sync/internal_api/sync_rollback_manager_base.h"
 
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/internal_components_factory.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
@@ skipping 25 matching lines @@
   }
 };
 
 }  // anonymous namespace
 
 namespace syncer {
 
 SyncRollbackManagerBase::SyncRollbackManagerBase()
     : report_unrecoverable_error_function_(NULL),
       weak_ptr_factory_(this),
-      dummy_handler_(new DummyEntryptionHandler) {
+      dummy_handler_(new DummyEntryptionHandler),
+      initialized_(false) {
 }
 
 SyncRollbackManagerBase::~SyncRollbackManagerBase() {
 }
 
 void SyncRollbackManagerBase::Init(
       const base::FilePath& database_location,
       const WeakHandle<JsEventHandler>& event_handler,
       const std::string& sync_server_and_path,
       int sync_server_port,
@@ skipping 13 matching lines @@
           report_unrecoverable_error_function,
       CancelationSignal* cancelation_signal) {
   unrecoverable_error_handler_ = unrecoverable_error_handler.Pass();
   report_unrecoverable_error_function_ = report_unrecoverable_error_function;
 
   if (!InitBackupDB(database_location, internal_components_factory)) {
     NotifyInitializationFailure();
     return;
   }
 
+  initialized_ = true;
   NotifyInitializationSuccess();
 }
 
 ModelTypeSet SyncRollbackManagerBase::InitialSyncEndedTypes() {
   return share_.directory->InitialSyncEndedTypes();
 }
 
 ModelTypeSet SyncRollbackManagerBase::GetTypesWithEmptyProgressMarkerToken(
       ModelTypeSet types) {
   ModelTypeSet inited_types = share_.directory->InitialSyncEndedTypes();
@@ skipping 54 matching lines @@
 }
 
 SyncStatus SyncRollbackManagerBase::GetDetailedStatus() const {
   return SyncStatus();
 }
 
 void SyncRollbackManagerBase::SaveChanges() {
 }
 
 void SyncRollbackManagerBase::ShutdownOnSyncThread() {
-  if (share_.directory) {
+  if (initialized_) {
     SaveChanges();
     share_.directory->Close();
     share_.directory.reset();
+    initialized_ = false;
   }
 }
 
 UserShare* SyncRollbackManagerBase::GetUserShare() {
   return &share_;
 }
 
 const std::string SyncRollbackManagerBase::cache_guid() {
   return share_.directory->cache_guid();
 }
@@ skipping 169 matching lines @@
 
 void SyncRollbackManagerBase::UnregisterDirectoryTypeDebugInfoObserver(
     syncer::TypeDebugInfoObserver* observer) {}
 
 bool SyncRollbackManagerBase::HasDirectoryTypeDebugInfoObserver(
     syncer::TypeDebugInfoObserver* observer) { return false; }
 
 void SyncRollbackManagerBase::RequestEmitDebugInfo() {}
 
 }  // namespace syncer