[SyncFS] Expand simple functions to their caller in drive_backend/

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc

 // Copyright 2013 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_backend/sync_engine_initializer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "chrome/browser/drive/drive_api_service.h"
@@ skipping 70 matching lines @@
   if (sync_context_->GetMetadataDatabase()) {
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[Initialize] Already initialized.");
     SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_OK);
     return;
   }
 
   SyncStatusCode status = SYNC_STATUS_FAILED;
   scoped_ptr<MetadataDatabase> metadata_database =
       MetadataDatabase::Create(database_path_, env_override_, &status);
-  // TODO(tzik): Expand this function.
-  DidCreateMetadataDatabase(token.Pass(), status, metadata_database.Pass());
-}
 
-scoped_ptr<MetadataDatabase> SyncEngineInitializer::PassMetadataDatabase() {
-  return metadata_database_.Pass();
-}
-
-void SyncEngineInitializer::DidCreateMetadataDatabase(
-    scoped_ptr<SyncTaskToken> token,
-    SyncStatusCode status,
-    scoped_ptr<MetadataDatabase> instance) {
   if (status != SYNC_STATUS_OK) {
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[Initialize] Failed to initialize MetadataDatabase.");
     SyncTaskManager::NotifyTaskDone(token.Pass(), status);
     return;
   }
 
-  DCHECK(instance);
-  metadata_database_ = instance.Pass();
+  DCHECK(metadata_database_);

[peria, 2014/09/10 01:59:01]

Local variable |metadata_database| (not a member variable |..._|) should be
checked.

[tzik, 2014/09/10 05:00:22]

Good catch! Done.

+  metadata_database_ = metadata_database.Pass();
   if (metadata_database_->HasSyncRoot()) {
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[Initialize] Found local cache of sync-root.");
     SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_OK);
     return;
   }
 
   GetAboutResource(token.Pass());
 }
 
+scoped_ptr<MetadataDatabase> SyncEngineInitializer::PassMetadataDatabase() {
+  return metadata_database_.Pass();
+}
+
 void SyncEngineInitializer::GetAboutResource(
     scoped_ptr<SyncTaskToken> token) {
   set_used_network(true);
   sync_context_->GetDriveService()->GetAboutResource(
       base::Bind(&SyncEngineInitializer::DidGetAboutResource,
                  weak_ptr_factory_.GetWeakPtr(), base::Passed(&token)));
 }
 
 void SyncEngineInitializer::DidGetAboutResource(
     scoped_ptr<SyncTaskToken> token,
@@ skipping 209 matching lines @@
   }
 
   PopulateDatabase(token.Pass());
 }
 
 void SyncEngineInitializer::PopulateDatabase(
     scoped_ptr<SyncTaskToken> token) {
   DCHECK(sync_root_folder_);
   SyncStatusCode status = metadata_database_->PopulateInitialData(
       largest_change_id_, *sync_root_folder_, app_root_folders_);
-  // TODO(tzik): Expand this function.
-  DidPopulateDatabase(token.Pass(), status);
-}
-
-void SyncEngineInitializer::DidPopulateDatabase(
-    scoped_ptr<SyncTaskToken> token,
-    SyncStatusCode status) {
   if (status != SYNC_STATUS_OK) {
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[Initialize] Failed to populate initial data"
               " to MetadataDatabase.");
     SyncTaskManager::NotifyTaskDone(token.Pass(), status);
     return;
   }
 
   util::Log(logging::LOG_VERBOSE, FROM_HERE,
             "[Initialize] Completed successfully.");
   SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_OK);
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system