Remove ResourceIdCanonicalizer from DriveServiceInterface

chrome/browser/chromeos/drive/resource_metadata_storage_unittest.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 <algorithm>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
-#include "chrome/browser/drive/drive_api_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 
 namespace drive {
 namespace internal {
 
 class ResourceMetadataStorageTest : public testing::Test {
  protected:
@@ skipping 278 matching lines @@
   batch.Put("file:abcd", serialized_entry);
 
   FileCacheEntry cache_entry;
   EXPECT_TRUE(cache_entry.SerializeToString(&serialized_entry));
   batch.Put(std::string("file:abcd") + '\0' + "CACHE", serialized_entry);
 
   EXPECT_TRUE(resource_map()->Write(leveldb::WriteOptions(), &batch).ok());
 
   // Upgrade and reopen.
   storage_.reset();
-  EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(
-      temp_dir_.path(), base::Bind(&util::CanonicalizeResourceId)));
+  EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
       temp_dir_.path(), base::MessageLoopProxy::current().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Resource-ID-to-local-ID mapping is added.
   std::string id;
   EXPECT_EQ(FILE_ERROR_OK,
             storage_->GetIdByResourceId("abcd", &id));  // "file:" is dropped.
 
   // Data is erased, except cache entries.
@@ skipping 31 matching lines @@
   FileCacheEntry cache_entry;
   EXPECT_TRUE(cache_entry.SerializeToString(&serialized_entry));
   batch.Put(local_id + '\0' + "CACHE", serialized_entry);
 
   batch.Put('\0' + std::string("ID") + '\0' + resource_id, local_id);
 
   EXPECT_TRUE(resource_map()->Write(leveldb::WriteOptions(), &batch).ok());
 
   // Upgrade and reopen.
   storage_.reset();
-  EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(
-      temp_dir_.path(), base::Bind(&util::CanonicalizeResourceId)));
+  EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
       temp_dir_.path(), base::MessageLoopProxy::current().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Data is erased, except cache and id mapping entries.
   std::string id;
   EXPECT_EQ(FILE_ERROR_OK, storage_->GetIdByResourceId(resource_id, &id));
   EXPECT_EQ(local_id, id);
   int64 largest_changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK,
@@ skipping 40 matching lines @@
   // Put another cache entry which is not accompanied by a ResourceEntry.
   cache_entry.set_md5(md5_2);
   EXPECT_TRUE(cache_entry.SerializeToString(&serialized_entry));
   batch.Put(local_id2 + '\0' + "CACHE", serialized_entry);
   batch.Put('\0' + std::string("ID") + '\0' + resource_id2, local_id2);
 
   EXPECT_TRUE(resource_map()->Write(leveldb::WriteOptions(), &batch).ok());
 
   // Upgrade and reopen.
   storage_.reset();
-  EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(
-      temp_dir_.path(), base::Bind(&util::CanonicalizeResourceId)));
+  EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
       temp_dir_.path(), base::MessageLoopProxy::current().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // No data is lost.
   int64 largest_changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK,
             storage_->GetLargestChangestamp(&largest_changestamp));
   EXPECT_EQ(kLargestChangestamp, largest_changestamp);
 
@@ skipping 17 matching lines @@
   // Put some data.
   EXPECT_EQ(FILE_ERROR_OK,
             storage_->SetLargestChangestamp(kLargestChangestamp));
   ResourceEntry entry;
   entry.set_local_id(key1);
   EXPECT_EQ(FILE_ERROR_OK, storage_->PutEntry(entry));
 
   // Set newer version, upgrade and reopen DB.
   SetDBVersion(ResourceMetadataStorage::kDBVersion + 1);
   storage_.reset();
-  EXPECT_FALSE(ResourceMetadataStorage::UpgradeOldDB(
-      temp_dir_.path(), base::Bind(&util::CanonicalizeResourceId)));
+  EXPECT_FALSE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
       temp_dir_.path(), base::MessageLoopProxy::current().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Data is erased because of the incompatible version.
   int64 largest_changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK,
             storage_->GetLargestChangestamp(&largest_changestamp));
   EXPECT_EQ(0, largest_changestamp);
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, storage_->GetEntry(key1, &entry));
@@ skipping 12 matching lines @@
   batch.Put("id1", serialized_entry);
   batch.Put('\0' + std::string("ID") + '\0' + "resource_id1", "id1");
 
   // Put an ID entry without any corresponding entries.
   batch.Put('\0' + std::string("ID") + '\0' + "resource_id2", "id3");
 
   EXPECT_TRUE(resource_map()->Write(leveldb::WriteOptions(), &batch).ok());
 
   // Upgrade and reopen.
   storage_.reset();
-  EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(
-      temp_dir_.path(), base::Bind(&util::CanonicalizeResourceId)));
+  EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
       temp_dir_.path(), base::MessageLoopProxy::current().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Only the unused entry is deleted.
   std::string id;
   EXPECT_EQ(FILE_ERROR_OK, storage_->GetIdByResourceId("resource_id1", &id));
   EXPECT_EQ("id1", id);
   EXPECT_EQ(FILE_ERROR_NOT_FOUND,
             storage_->GetIdByResourceId("resource_id2", &id));
@@ skipping 116 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, storage_->RemoveEntry(key3));
   EXPECT_TRUE(CheckValidity());
 
   // Remove key1.
   EXPECT_EQ(FILE_ERROR_OK, storage_->RemoveEntry(key1));
   EXPECT_TRUE(CheckValidity());
 }
 
 }  // namespace internal
 }  // namespace drive