Index: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc |
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc |
index 4a5443f9be85d11e936751a855f959afc7d643ba..dd19b31b874d6a8e106754596a0c17a15d1eebd5 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc |
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc |
@@ -13,6 +13,7 @@ |
#include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" |
#include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" |
#include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" |
+#include "chrome/browser/sync_file_system/logger.h" |
#include "google_apis/drive/drive_api_parser.h" |
#include "google_apis/drive/gdata_wapi_parser.h" |
@@ -111,8 +112,12 @@ SyncEngineInitializer::~SyncEngineInitializer() { |
} |
void SyncEngineInitializer::Run(const SyncStatusCallback& callback) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, "[Initialize] Start."); |
+ |
// The metadata seems to have been already initialized. Just return with OK. |
if (sync_context_ && sync_context_->GetMetadataDatabase()) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Already initialized."); |
callback.Run(SYNC_STATUS_OK); |
return; |
} |
@@ -132,6 +137,8 @@ void SyncEngineInitializer::DidCreateMetadataDatabase( |
SyncStatusCode status, |
scoped_ptr<MetadataDatabase> instance) { |
if (status != SYNC_STATUS_OK) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Failed to initialize MetadataDatabase."); |
callback.Run(status); |
return; |
} |
@@ -139,6 +146,8 @@ void SyncEngineInitializer::DidCreateMetadataDatabase( |
DCHECK(instance); |
metadata_database_ = instance.Pass(); |
if (metadata_database_->HasSyncRoot()) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Found Local cache of sync-root."); |
callback.Run(SYNC_STATUS_OK); |
return; |
} |
@@ -162,6 +171,8 @@ void SyncEngineInitializer::DidGetAboutResource( |
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error); |
if (status != SYNC_STATUS_OK) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Failed to get AboutResource."); |
callback.Run(status); |
return; |
} |
@@ -176,6 +187,8 @@ void SyncEngineInitializer::DidGetAboutResource( |
void SyncEngineInitializer::FindSyncRoot(const SyncStatusCallback& callback) { |
if (find_sync_root_retry_count_++ >= kMaxRetry) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Reached max retry count."); |
callback.Run(SYNC_STATUS_FAILED); |
return; |
} |
@@ -197,10 +210,20 @@ void SyncEngineInitializer::DidFindSyncRoot( |
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error); |
if (status != SYNC_STATUS_OK) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Failed to find sync root."); |
callback.Run(status); |
return; |
} |
+ if (!resource_list) { |
+ NOTREACHED(); |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Got invalid resource list."); |
+ callback.Run(SYNC_STATUS_FAILED); |
+ return; |
+ } |
+ |
ScopedVector<google_apis::ResourceEntry>* entries = |
resource_list->mutable_entries(); |
for (ScopedVector<google_apis::ResourceEntry>::iterator itr = |
@@ -266,6 +289,8 @@ void SyncEngineInitializer::DidCreateSyncRoot( |
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error); |
if (status != SYNC_STATUS_OK) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Failed to create sync root."); |
callback.Run(status); |
return; |
} |
@@ -290,6 +315,8 @@ void SyncEngineInitializer::DidDetachSyncRoot( |
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error); |
if (status != SYNC_STATUS_OK) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Failed to detach sync root."); |
callback.Run(status); |
return; |
} |
@@ -316,10 +343,20 @@ void SyncEngineInitializer::DidListAppRootFolders( |
SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error); |
if (status != SYNC_STATUS_OK) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Failed to get initial app-root folders."); |
callback.Run(status); |
return; |
} |
+ if (!resource_list) { |
+ NOTREACHED(); |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Got invalid initial app-root list."); |
+ callback.Run(SYNC_STATUS_FAILED); |
+ return; |
+ } |
+ |
ScopedVector<google_apis::ResourceEntry>* new_entries = |
resource_list->mutable_entries(); |
app_root_folders_.insert(app_root_folders_.end(), |
@@ -355,10 +392,15 @@ void SyncEngineInitializer::DidPopulateDatabase( |
const SyncStatusCallback& callback, |
SyncStatusCode status) { |
if (status != SYNC_STATUS_OK) { |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Failed to populate initial data" |
+ " to MetadataDatabase."); |
callback.Run(status); |
return; |
} |
+ util::Log(logging::LOG_VERBOSE, FROM_HERE, |
+ "[Initialize] Completed successfully."); |
callback.Run(SYNC_STATUS_OK); |
} |