drive: Use ResourceMetadataStorage from FileCache

chrome/browser/chromeos/drive/resource_metadata_storage.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/chromeos/drive/resource_metadata_storage.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 183 matching lines @@
       resource_id_.assign(it_->key().data(), id_length);
       break;
     }
   }
 }
 
 ResourceMetadataStorage::ResourceMetadataStorage(
     const base::FilePath& directory_path,
     base::SequencedTaskRunner* blocking_task_runner)
     : directory_path_(directory_path),
+      opened_existing_db_(false),
       blocking_task_runner_(blocking_task_runner) {
 }
 
 void ResourceMetadataStorage::Destroy() {
   blocking_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&ResourceMetadataStorage::DestroyOnBlockingPool,
                  base::Unretained(this)));
 }
 
@@ skipping 27 matching lines @@
     // Check the validity of existing DB.
     ResourceMetadataHeader header;
     if (!GetHeader(&header) || header.version() != kDBVersion) {
       open_existing_result = DB_INIT_INCOMPATIBLE;
       LOG(INFO) << "Reject incompatible DB.";
     } else if (!CheckValidity()) {
       open_existing_result = DB_INIT_BROKEN;
       LOG(ERROR) << "Reject invalid DB.";
     }
 
-    if (open_existing_result != DB_INIT_SUCCESS)
+    if (open_existing_result == DB_INIT_SUCCESS)
+      opened_existing_db_ = true;
+    else
       resource_map_.reset();
   }
 
   UMA_HISTOGRAM_ENUMERATION("Drive.MetadataDBOpenExistingResult",
                             open_existing_result,
                             DB_INIT_MAX_VALUE);
 
   DBInitStatus init_result = DB_INIT_SUCCESS;
 
   // Failed to open the existing DB, create new DB.
@@ skipping 343 matching lines @@
   if (!it->status().ok() || num_child_entries != num_entries_with_parent) {
     DLOG(ERROR) << "Error during checking resource map. status = "
                 << it->status().ToString();
     return false;
   }
   return true;
 }
 
 }  // namespace internal
 }  // namespace drive