#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"
// 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());
// 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());
// 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());
// 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());
// 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());