drive: Use base_name recovered from trashed DB when DB corruption happens

chrome/browser/chromeos/drive/resource_metadata_storage.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_STORAGE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_STORAGE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 87 matching lines @@
     // Used to implement Advance().
     void AdvanceInternal();
 
     scoped_ptr<leveldb::Iterator> it_;
     std::string id_;
     FileCacheEntry entry_;
 
     DISALLOW_COPY_AND_ASSIGN(CacheEntryIterator);
   };
 
+  // Cache information recovered from trashed DB.
+  struct RecoveredCacheInfo {
+    RecoveredCacheInfo();
+    ~RecoveredCacheInfo();
+
+    bool is_dirty;
+    std::string md5;
+    std::string title;
+  };
+  typedef std::map<std::string, RecoveredCacheInfo> RecoveredCacheInfoMap;
+
   // Returns true if the DB was successfully upgraded to the newest version.
   static bool UpgradeOldDB(const base::FilePath& directory_path,
                            const ResourceIdCanonicalizer& id_canonicalizer);
 
   ResourceMetadataStorage(const base::FilePath& directory_path,
                           base::SequencedTaskRunner* blocking_task_runner);
 
   const base::FilePath& directory_path() const { return directory_path_; }
 
   // Returns true when cache entries were not loaded to the DB during
   // initialization.
   bool cache_file_scan_is_needed() const { return cache_file_scan_is_needed_; }
 
   // Destroys this object.
   void Destroy();
 
   // Initializes this object.
   bool Initialize();
 
-  // Collects FileCacheEntry from trashed resource map DB.
-  void RecoverCacheEntriesFromTrashedResourceMap(
-      std::map<std::string, FileCacheEntry>* out_entries);
+  // Collects cache info from trashed resource map DB.
+  void RecoverCacheInfoFromTrashedResourceMap(RecoveredCacheInfoMap* out_info);
 
   // Sets the largest changestamp.
   bool SetLargestChangestamp(int64 largest_changestamp);
 
   // Gets the largest changestamp.
   int64 GetLargestChangestamp();
 
   // Puts the entry to this storage.
   bool PutEntry(const ResourceEntry& entry);
 
@@ skipping 61 matching lines @@
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceMetadataStorage);
 };
 
 }  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_STORAGE_H_