[SyncFS] Simplify MetadataDatabase::Create

chrome/browser/sync_file_system/drive_backend/metadata_database.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/metadata_database.h"
 
 #include <algorithm>
 #include <stack>
 
 #include "base/bind.h"
@@ skipping 501 matching lines @@
   if (dirtying_options & MARK_SAME_PATH_TRACKERS_DIRTY)
     MarkTrackersDirtyByPath(parent_tracker_id, title, index);
 
   if (index->GetFileTrackerIDsByFileID(file_id).empty()) {
     index->RemoveFileMetadata(file_id);
   }
 }
 
 }  // namespace
 
-struct MetadataDatabase::CreateParam {
-  base::FilePath database_path;
-  leveldb::Env* env_override;
-
-  CreateParam(const base::FilePath& database_path,
-              leveldb::Env* env_override)
-      : database_path(database_path),
-        env_override(env_override) {}
-};
-
 // static
 void MetadataDatabase::Create(
     const base::FilePath& database_path,
     leveldb::Env* env_override,
     const CreateCallback& callback) {
-  CreateOnWorkerTaskRunner(
-      make_scoped_ptr(new CreateParam(database_path, env_override)),
-      callback);
+  bool enable_on_disk_index = !CommandLine::ForCurrentProcess()->HasSwitch(
+      kDisableMetadataDatabaseOnDisk);
+  scoped_ptr<MetadataDatabase> metadata_database(
+      new MetadataDatabase(database_path,
+                           enable_on_disk_index,
+                           env_override));
+
+  SyncStatusCode status = metadata_database->Initialize();
+  if (status == SYNC_DATABASE_ERROR_FAILED) {
+    // Delete the previous instance to avoid creating a LevelDB instance for
+    // the same path.
+    metadata_database.reset();
+
+    metadata_database.reset(
+        new MetadataDatabase(database_path,
+                             enable_on_disk_index,
+                             env_override));
+    status = metadata_database->Initialize();
+  }
+
+  if (status != SYNC_STATUS_OK)
+    metadata_database.reset();
+
+  callback.Run(status, metadata_database.Pass());
 }
 
 // static
 SyncStatusCode MetadataDatabase::CreateForTesting(
     scoped_ptr<LevelDBWrapper> db,
     bool enable_on_disk_index,
     scoped_ptr<MetadataDatabase>* metadata_database_out) {
   scoped_ptr<MetadataDatabase> metadata_database(
       new MetadataDatabase(base::FilePath(),
                            enable_on_disk_index,
@@ skipping 759 matching lines @@
     const base::FilePath& database_path,
     bool enable_on_disk_index,
     leveldb::Env* env_override)
     : database_path_(database_path),
       env_override_(env_override),
       enable_on_disk_index_(enable_on_disk_index),
       largest_known_change_id_(0),
       weak_ptr_factory_(this) {
 }
 
-// static
-void MetadataDatabase::CreateOnWorkerTaskRunner(
-    scoped_ptr<CreateParam> create_param,
-    const CreateCallback& callback) {
-  bool enable_on_disk_index = !CommandLine::ForCurrentProcess()->HasSwitch(
-      kDisableMetadataDatabaseOnDisk);
-  scoped_ptr<MetadataDatabase> metadata_database(
-      new MetadataDatabase(create_param->database_path,
-                           enable_on_disk_index,
-                           create_param->env_override));
-
-  SyncStatusCode status = metadata_database->Initialize();
-  if (status == SYNC_DATABASE_ERROR_FAILED) {
-    // Delete the previous instance to avoid creating a LevelDB instance for
-    // the same path.
-    metadata_database.reset();
-
-    metadata_database.reset(
-        new MetadataDatabase(create_param->database_path,
-                             enable_on_disk_index,
-                             create_param->env_override));
-    status = metadata_database->Initialize();
-  }
-
-  if (status != SYNC_STATUS_OK)
-    metadata_database.reset();
-
-  callback.Run(status, metadata_database.Pass());
-}
-
 SyncStatusCode MetadataDatabase::Initialize() {
   SyncStatusCode status = SYNC_STATUS_UNKNOWN;
   bool created = false;
   // Open database unless |db_| is overridden for testing.
   if (!db_) {
     status = OpenDatabase(database_path_, env_override_, &db_, &created);
     if (status != SYNC_STATUS_OK)
       return status;
   }
 
@@ skipping 474 matching lines @@
       return false;
 
   if (!parents.empty())
     return false;
 
   return true;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system