Rename GDataDirectoryService to DriveResourceMetadata

chrome/browser/chromeos/gdata/drive_resource_metadata_unittest.cc

Index: chrome/browser/chromeos/gdata/drive_resource_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_directory_service_unittest.cc b/chrome/browser/chromeos/gdata/drive_resource_metadata_unittest.cc
similarity index 74%
rename from chrome/browser/chromeos/gdata/gdata_directory_service_unittest.cc
rename to chrome/browser/chromeos/gdata/drive_resource_metadata_unittest.cc
index d2892746618de7caff5d3cc94f658a8b1d385179..681687abea284615fec83ce16248d41154499499 100644
--- a/chrome/browser/chromeos/gdata/gdata_directory_service_unittest.cc
+++ b/chrome/browser/chromeos/gdata/drive_resource_metadata_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/gdata_directory_service.h"
+#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
 
 #include <algorithm>
 #include <string>
@@ -31,9 +31,9 @@ const char kResumableCreateMediaUrl[] = "http://resumable-create-media/";
 // Add a directory to |parent| and return that directory. The name and
 // resource_id are determined by the incrementing counter |sequence_id|.
 DriveDirectory* AddDirectory(DriveDirectory* parent,
-                             GDataDirectoryService* directory_service,
+                             DriveResourceMetadata* resource_metadata,
                              int sequence_id) {
-  DriveDirectory* dir = directory_service->CreateDriveDirectory();
+  DriveDirectory* dir = resource_metadata->CreateDriveDirectory();
   const std::string dir_name = "dir" + base::IntToString(sequence_id);
   const std::string resource_id = std::string("dir_resource_id:") +
                                   dir_name;
@@ -41,7 +41,7 @@ DriveDirectory* AddDirectory(DriveDirectory* parent,
   dir->set_resource_id(resource_id);
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
   FilePath moved_file_path;
-  directory_service->MoveEntryToDirectory(
+  resource_metadata->MoveEntryToDirectory(
       parent->GetFilePath(),
       dir,
       base::Bind(&test_util::CopyResultsFromFileMoveCallback,
@@ -56,9 +56,9 @@ DriveDirectory* AddDirectory(DriveDirectory* parent,
 // Add a file to |parent| and return that file. The name and
 // resource_id are determined by the incrementing counter |sequence_id|.
 DriveFile* AddFile(DriveDirectory* parent,
-                   GDataDirectoryService* directory_service,
+                   DriveResourceMetadata* resource_metadata,
                    int sequence_id) {
-  DriveFile* file = directory_service->CreateDriveFile();
+  DriveFile* file = resource_metadata->CreateDriveFile();
   const std::string title = "file" + base::IntToString(sequence_id);
   const std::string resource_id = std::string("file_resource_id:") +
                                   title;
@@ -67,7 +67,7 @@ DriveFile* AddFile(DriveDirectory* parent,
   file->set_file_md5(std::string("file_md5:") + title);
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
   FilePath moved_file_path;
-  directory_service->MoveEntryToDirectory(
+  resource_metadata->MoveEntryToDirectory(
       parent->GetFilePath(),
       file,
       base::Bind(&test_util::CopyResultsFromFileMoveCallback,
@@ -90,107 +90,107 @@ DriveFile* AddFile(DriveDirectory* parent,
 // drive/dir2/file8
 // drive/dir1/dir3/file9
 // drive/dir1/dir3/file10
-void InitDirectoryService(GDataDirectoryService* directory_service) {
+void InitDirectoryService(DriveResourceMetadata* resource_metadata) {
   int sequence_id = 1;
-  DriveDirectory* dir1 = AddDirectory(directory_service->root(),
-      directory_service, sequence_id++);
-  DriveDirectory* dir2 = AddDirectory(directory_service->root(),
-      directory_service, sequence_id++);
-  DriveDirectory* dir3 = AddDirectory(dir1, directory_service, sequence_id++);
+  DriveDirectory* dir1 = AddDirectory(resource_metadata->root(),
+      resource_metadata, sequence_id++);
+  DriveDirectory* dir2 = AddDirectory(resource_metadata->root(),
+      resource_metadata, sequence_id++);
+  DriveDirectory* dir3 = AddDirectory(dir1, resource_metadata, sequence_id++);
 
-  AddFile(dir1, directory_service, sequence_id++);
-  AddFile(dir1, directory_service, sequence_id++);
+  AddFile(dir1, resource_metadata, sequence_id++);
+  AddFile(dir1, resource_metadata, sequence_id++);
 
-  AddFile(dir2, directory_service, sequence_id++);
-  AddFile(dir2, directory_service, sequence_id++);
-  AddFile(dir2, directory_service, sequence_id++);
+  AddFile(dir2, resource_metadata, sequence_id++);
+  AddFile(dir2, resource_metadata, sequence_id++);
+  AddFile(dir2, resource_metadata, sequence_id++);
 
-  AddFile(dir3, directory_service, sequence_id++);
-  AddFile(dir3, directory_service, sequence_id++);
+  AddFile(dir3, resource_metadata, sequence_id++);
+  AddFile(dir3, resource_metadata, sequence_id++);
 }
 
 // Find directory by path.
-DriveDirectory* FindDirectory(GDataDirectoryService* directory_service,
+DriveDirectory* FindDirectory(DriveResourceMetadata* resource_metadata,
                               const char* path) {
-  return directory_service->FindEntryByPathSync(
+  return resource_metadata->FindEntryByPathSync(
       FilePath(path))->AsDriveDirectory();
 }
 
 // Find file by path.
-DriveFile* FindFile(GDataDirectoryService* directory_service,
+DriveFile* FindFile(DriveResourceMetadata* resource_metadata,
                     const char* path) {
-  return directory_service->FindEntryByPathSync(FilePath(path))->AsDriveFile();
+  return resource_metadata->FindEntryByPathSync(FilePath(path))->AsDriveFile();
 }
 
 // Verify that the recreated directory service matches what we created in
 // InitDirectoryService.
-void VerifyDirectoryService(GDataDirectoryService* directory_service) {
-  ASSERT_TRUE(directory_service->root());
+void VerifyDirectoryService(DriveResourceMetadata* resource_metadata) {
+  ASSERT_TRUE(resource_metadata->root());
 
-  DriveDirectory* dir1 = FindDirectory(directory_service, "drive/dir1");
+  DriveDirectory* dir1 = FindDirectory(resource_metadata, "drive/dir1");
   ASSERT_TRUE(dir1);
-  DriveDirectory* dir2 = FindDirectory(directory_service, "drive/dir2");
+  DriveDirectory* dir2 = FindDirectory(resource_metadata, "drive/dir2");
   ASSERT_TRUE(dir2);
-  DriveDirectory* dir3 = FindDirectory(directory_service, "drive/dir1/dir3");
+  DriveDirectory* dir3 = FindDirectory(resource_metadata, "drive/dir1/dir3");
   ASSERT_TRUE(dir3);
 
-  DriveFile* file4 = FindFile(directory_service, "drive/dir1/file4");
+  DriveFile* file4 = FindFile(resource_metadata, "drive/dir1/file4");
   ASSERT_TRUE(file4);
   EXPECT_EQ(file4->parent(), dir1);
 
-  DriveFile* file5 = FindFile(directory_service, "drive/dir1/file5");
+  DriveFile* file5 = FindFile(resource_metadata, "drive/dir1/file5");
   ASSERT_TRUE(file5);
   EXPECT_EQ(file5->parent(), dir1);
 
-  DriveFile* file6 = FindFile(directory_service, "drive/dir2/file6");
+  DriveFile* file6 = FindFile(resource_metadata, "drive/dir2/file6");
   ASSERT_TRUE(file6);
   EXPECT_EQ(file6->parent(), dir2);
 
-  DriveFile* file7 = FindFile(directory_service, "drive/dir2/file7");
+  DriveFile* file7 = FindFile(resource_metadata, "drive/dir2/file7");
   ASSERT_TRUE(file7);
   EXPECT_EQ(file7->parent(), dir2);
 
-  DriveFile* file8 = FindFile(directory_service, "drive/dir2/file8");
+  DriveFile* file8 = FindFile(resource_metadata, "drive/dir2/file8");
   ASSERT_TRUE(file8);
   EXPECT_EQ(file8->parent(), dir2);
 
-  DriveFile* file9 = FindFile(directory_service, "drive/dir1/dir3/file9");
+  DriveFile* file9 = FindFile(resource_metadata, "drive/dir1/dir3/file9");
   ASSERT_TRUE(file9);
   EXPECT_EQ(file9->parent(), dir3);
 
-  DriveFile* file10 = FindFile(directory_service, "drive/dir1/dir3/file10");
+  DriveFile* file10 = FindFile(resource_metadata, "drive/dir1/dir3/file10");
   ASSERT_TRUE(file10);
   EXPECT_EQ(file10->parent(), dir3);
 
-  EXPECT_EQ(dir1, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(dir1, resource_metadata->GetEntryByResourceId(
       "dir_resource_id:dir1"));
-  EXPECT_EQ(dir2, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(dir2, resource_metadata->GetEntryByResourceId(
       "dir_resource_id:dir2"));
-  EXPECT_EQ(dir3, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(dir3, resource_metadata->GetEntryByResourceId(
       "dir_resource_id:dir3"));
-  EXPECT_EQ(file4, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(file4, resource_metadata->GetEntryByResourceId(
       "file_resource_id:file4"));
-  EXPECT_EQ(file5, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(file5, resource_metadata->GetEntryByResourceId(
       "file_resource_id:file5"));
-  EXPECT_EQ(file6, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(file6, resource_metadata->GetEntryByResourceId(
       "file_resource_id:file6"));
-  EXPECT_EQ(file7, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(file7, resource_metadata->GetEntryByResourceId(
       "file_resource_id:file7"));
-  EXPECT_EQ(file8, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(file8, resource_metadata->GetEntryByResourceId(
       "file_resource_id:file8"));
-  EXPECT_EQ(file9, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(file9, resource_metadata->GetEntryByResourceId(
       "file_resource_id:file9"));
-  EXPECT_EQ(file10, directory_service->GetEntryByResourceId(
+  EXPECT_EQ(file10, resource_metadata->GetEntryByResourceId(
       "file_resource_id:file10"));
 }
 
-// Callback for GDataDirectoryService::InitFromDB.
+// Callback for DriveResourceMetadata::InitFromDB.
 void InitFromDBCallback(GDataFileError expected_error,
                         GDataFileError actual_error) {
   EXPECT_EQ(expected_error, actual_error);
 }
 
-// Callback for GDataDirectoryService::ReadDirectoryByPath.
+// Callback for DriveResourceMetadata::ReadDirectoryByPath.
 void ReadDirectoryByPathCallback(
     scoped_ptr<DriveEntryProtoVector>* result,
     GDataFileError error,
@@ -201,57 +201,57 @@ void ReadDirectoryByPathCallback(
 
 }  // namespace
 
-TEST(GDataDirectoryServiceTest, VersionCheck) {
+TEST(DriveResourceMetadataTest, VersionCheck) {
   // Set up the root directory.
   DriveRootDirectoryProto proto;
   DriveEntryProto* mutable_entry =
       proto.mutable_gdata_directory()->mutable_gdata_entry();
   mutable_entry->mutable_file_info()->set_is_directory(true);
-  mutable_entry->set_resource_id(kGDataRootDirectoryResourceId);
+  mutable_entry->set_resource_id(kDriveRootDirectoryResourceId);
   mutable_entry->set_upload_url(kResumableCreateMediaUrl);
   mutable_entry->set_title("drive");
 
-  GDataDirectoryService directory_service;
+  DriveResourceMetadata resource_metadata;
 
   std::string serialized_proto;
   ASSERT_TRUE(proto.SerializeToString(&serialized_proto));
   // This should fail as the version is emtpy.
-  ASSERT_FALSE(directory_service.ParseFromString(serialized_proto));
+  ASSERT_FALSE(resource_metadata.ParseFromString(serialized_proto));
 
   // Set an older version, and serialize.
   proto.set_version(kProtoVersion - 1);
   ASSERT_TRUE(proto.SerializeToString(&serialized_proto));
   // This should fail as the version is older.
-  ASSERT_FALSE(directory_service.ParseFromString(serialized_proto));
+  ASSERT_FALSE(resource_metadata.ParseFromString(serialized_proto));
 
   // Set the current version, and serialize.
   proto.set_version(kProtoVersion);
   ASSERT_TRUE(proto.SerializeToString(&serialized_proto));
   // This should succeed as the version matches the current number.
-  ASSERT_TRUE(directory_service.ParseFromString(serialized_proto));
+  ASSERT_TRUE(resource_metadata.ParseFromString(serialized_proto));
 
   // Set a newer version, and serialize.
   proto.set_version(kProtoVersion + 1);
   ASSERT_TRUE(proto.SerializeToString(&serialized_proto));
   // This should fail as the version is newer.
-  ASSERT_FALSE(directory_service.ParseFromString(serialized_proto));
+  ASSERT_FALSE(resource_metadata.ParseFromString(serialized_proto));
 }
 
-TEST(GDataDirectoryServiceTest, RefreshFile) {
+TEST(DriveResourceMetadataTest, RefreshFile) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
 
-  GDataDirectoryService directory_service;
+  DriveResourceMetadata resource_metadata;
   // Add a directory to the file system.
-  DriveDirectory* directory_entry = directory_service.CreateDriveDirectory();
+  DriveDirectory* directory_entry = resource_metadata.CreateDriveDirectory();
   directory_entry->set_resource_id("folder:directory_resource_id");
   directory_entry->set_title("directory");
   directory_entry->SetBaseNameFromTitle();
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
   FilePath moved_file_path;
-  FilePath root_path(kGDataRootDirectory);
-  directory_service.MoveEntryToDirectory(
+  FilePath root_path(kDriveRootDirectory);
+  resource_metadata.MoveEntryToDirectory(
       root_path,
       directory_entry,
       base::Bind(&test_util::CopyResultsFromFileMoveCallback,
@@ -263,13 +263,13 @@ TEST(GDataDirectoryServiceTest, RefreshFile) {
             moved_file_path);
 
   // Add a new file to the directory.
-  DriveFile* initial_file_entry = directory_service.CreateDriveFile();
+  DriveFile* initial_file_entry = resource_metadata.CreateDriveFile();
   initial_file_entry->set_resource_id("file:file_resource_id");
   initial_file_entry->set_title("file");
   initial_file_entry->SetBaseNameFromTitle();
   error = GDATA_FILE_ERROR_FAILED;
   moved_file_path.clear();
-  directory_service.MoveEntryToDirectory(
+  resource_metadata.MoveEntryToDirectory(
       directory_entry->GetFilePath(),
       initial_file_entry,
       base::Bind(&test_util::CopyResultsFromFileMoveCallback,
@@ -285,48 +285,48 @@ TEST(GDataDirectoryServiceTest, RefreshFile) {
   // Initial file system state set, let's try refreshing entries.
 
   // New value for the entry with resource id "file:file_resource_id".
-  DriveFile* new_file_entry = directory_service.CreateDriveFile();
+  DriveFile* new_file_entry = resource_metadata.CreateDriveFile();
   new_file_entry->set_resource_id("file:file_resource_id");
-  directory_service.RefreshFile(scoped_ptr<DriveFile>(new_file_entry).Pass());
+  resource_metadata.RefreshFile(scoped_ptr<DriveFile>(new_file_entry).Pass());
   // Root should have |new_file_entry|, not |initial_file_entry|.
   // If this is not true, |new_file_entry| has probably been destroyed, hence
   // ASSERT (we're trying to access |new_file_entry| later on).
   ASSERT_EQ(new_file_entry,
-      directory_service.GetEntryByResourceId("file:file_resource_id"));
+      resource_metadata.GetEntryByResourceId("file:file_resource_id"));
   // We have just verified new_file_entry exists inside root, so accessing
   // |new_file_entry->parent()| should be safe.
   EXPECT_EQ(directory_entry, new_file_entry->parent());
 
   // Let's try refreshing file that didn't prviously exist.
-  DriveFile* non_existent_entry = directory_service.CreateDriveFile();
+  DriveFile* non_existent_entry = resource_metadata.CreateDriveFile();
   non_existent_entry->set_resource_id("file:does_not_exist");
-  directory_service.RefreshFile(
+  resource_metadata.RefreshFile(
       scoped_ptr<DriveFile>(non_existent_entry).Pass());
   // File with non existent resource id should not be added.
-  EXPECT_FALSE(directory_service.GetEntryByResourceId("file:does_not_exist"));
+  EXPECT_FALSE(resource_metadata.GetEntryByResourceId("file:does_not_exist"));
 }
 
-TEST(GDataDirectoryServiceTest, GetEntryByResourceId_RootDirectory) {
-  GDataDirectoryService directory_service;
+TEST(DriveResourceMetadataTest, GetEntryByResourceId_RootDirectory) {
+  DriveResourceMetadata resource_metadata;
   // Look up the root directory by its resource ID.
-  DriveEntry* entry = directory_service.GetEntryByResourceId(
-      kGDataRootDirectoryResourceId);
+  DriveEntry* entry = resource_metadata.GetEntryByResourceId(
+      kDriveRootDirectoryResourceId);
   ASSERT_TRUE(entry);
-  EXPECT_EQ(kGDataRootDirectoryResourceId, entry->resource_id());
+  EXPECT_EQ(kDriveRootDirectoryResourceId, entry->resource_id());
 }
 
-TEST(GDataDirectoryServiceTest, GetEntryInfoByResourceId) {
+TEST(DriveResourceMetadataTest, GetEntryInfoByResourceId) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
-  GDataDirectoryService directory_service;
-  InitDirectoryService(&directory_service);
+  DriveResourceMetadata resource_metadata;
+  InitDirectoryService(&resource_metadata);
 
   // Confirm that an existing file is found.
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
   FilePath drive_file_path;
   scoped_ptr<DriveEntryProto> entry_proto;
-  directory_service.GetEntryInfoByResourceId(
+  resource_metadata.GetEntryInfoByResourceId(
       "file_resource_id:file4",
       base::Bind(&test_util::CopyResultsFromGetEntryInfoWithFilePathCallback,
                  &error, &drive_file_path, &entry_proto));
@@ -339,7 +339,7 @@ TEST(GDataDirectoryServiceTest, GetEntryInfoByResourceId) {
   // Confirm that a non existing file is not found.
   error = GDATA_FILE_ERROR_FAILED;
   entry_proto.reset();
-  directory_service.GetEntryInfoByResourceId(
+  resource_metadata.GetEntryInfoByResourceId(
       "file:non_existing",
       base::Bind(&test_util::CopyResultsFromGetEntryInfoWithFilePathCallback,
                  &error, &drive_file_path, &entry_proto));
@@ -348,17 +348,17 @@ TEST(GDataDirectoryServiceTest, GetEntryInfoByResourceId) {
   EXPECT_FALSE(entry_proto.get());
 }
 
-TEST(GDataDirectoryServiceTest, GetEntryInfoByPath) {
+TEST(DriveResourceMetadataTest, GetEntryInfoByPath) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
-  GDataDirectoryService directory_service;
-  InitDirectoryService(&directory_service);
+  DriveResourceMetadata resource_metadata;
+  InitDirectoryService(&resource_metadata);
 
   // Confirm that an existing file is found.
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
   scoped_ptr<DriveEntryProto> entry_proto;
-  directory_service.GetEntryInfoByPath(
+  resource_metadata.GetEntryInfoByPath(
       FilePath::FromUTF8Unsafe("drive/dir1/file4"),
       base::Bind(&test_util::CopyResultsFromGetEntryInfoCallback,
                  &error, &entry_proto));
@@ -370,7 +370,7 @@ TEST(GDataDirectoryServiceTest, GetEntryInfoByPath) {
   // Confirm that a non existing file is not found.
   error = GDATA_FILE_ERROR_FAILED;
   entry_proto.reset();
-  directory_service.GetEntryInfoByPath(
+  resource_metadata.GetEntryInfoByPath(
       FilePath::FromUTF8Unsafe("drive/dir1/non_existing"),
       base::Bind(&test_util::CopyResultsFromGetEntryInfoCallback,
                  &error, &entry_proto));
@@ -379,17 +379,17 @@ TEST(GDataDirectoryServiceTest, GetEntryInfoByPath) {
   EXPECT_FALSE(entry_proto.get());
 }
 
-TEST(GDataDirectoryServiceTest, ReadDirectoryByPath) {
+TEST(DriveResourceMetadataTest, ReadDirectoryByPath) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
-  GDataDirectoryService directory_service;
-  InitDirectoryService(&directory_service);
+  DriveResourceMetadata resource_metadata;
+  InitDirectoryService(&resource_metadata);
 
   // Confirm that an existing directory is found.
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
   scoped_ptr<DriveEntryProtoVector> entries;
-  directory_service.ReadDirectoryByPath(
+  resource_metadata.ReadDirectoryByPath(
       FilePath::FromUTF8Unsafe("drive/dir1"),
       base::Bind(&test_util::CopyResultsFromReadDirectoryCallback,
                  &error, &entries));
@@ -411,7 +411,7 @@ TEST(GDataDirectoryServiceTest, ReadDirectoryByPath) {
   // Confirm that a non existing directory is not found.
   error = GDATA_FILE_ERROR_FAILED;
   entries.reset();
-  directory_service.ReadDirectoryByPath(
+  resource_metadata.ReadDirectoryByPath(
       FilePath::FromUTF8Unsafe("drive/non_existing"),
       base::Bind(&test_util::CopyResultsFromReadDirectoryCallback,
                  &error, &entries));
@@ -422,7 +422,7 @@ TEST(GDataDirectoryServiceTest, ReadDirectoryByPath) {
   // Confirm that reading a file results in GDATA_FILE_ERROR_NOT_A_DIRECTORY.
   error = GDATA_FILE_ERROR_FAILED;
   entries.reset();
-  directory_service.ReadDirectoryByPath(
+  resource_metadata.ReadDirectoryByPath(
       FilePath::FromUTF8Unsafe("drive/dir1/file4"),
       base::Bind(&test_util::CopyResultsFromReadDirectoryCallback,
                  &error, &entries));
@@ -431,16 +431,16 @@ TEST(GDataDirectoryServiceTest, ReadDirectoryByPath) {
   EXPECT_FALSE(entries.get());
 }
 
-TEST(GDataDirectoryServiceTest, GetEntryInfoPairByPaths) {
+TEST(DriveResourceMetadataTest, GetEntryInfoPairByPaths) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
-  GDataDirectoryService directory_service;
-  InitDirectoryService(&directory_service);
+  DriveResourceMetadata resource_metadata;
+  InitDirectoryService(&resource_metadata);
 
   // Confirm that existing two files are found.
   scoped_ptr<EntryInfoPairResult> pair_result;
-  directory_service.GetEntryInfoPairByPaths(
+  resource_metadata.GetEntryInfoPairByPaths(
       FilePath::FromUTF8Unsafe("drive/dir1/file4"),
       FilePath::FromUTF8Unsafe("drive/dir1/file5"),
       base::Bind(&test_util::CopyResultsFromGetEntryInfoPairCallback,
@@ -461,7 +461,7 @@ TEST(GDataDirectoryServiceTest, GetEntryInfoPairByPaths) {
 
   // Confirm that the first non existent file is not found.
   pair_result.reset();
-  directory_service.GetEntryInfoPairByPaths(
+  resource_metadata.GetEntryInfoPairByPaths(
       FilePath::FromUTF8Unsafe("drive/dir1/non_existent"),
       FilePath::FromUTF8Unsafe("drive/dir1/file5"),
       base::Bind(&test_util::CopyResultsFromGetEntryInfoPairCallback,
@@ -479,7 +479,7 @@ TEST(GDataDirectoryServiceTest, GetEntryInfoPairByPaths) {
 
   // Confirm that the second non existent file is not found.
   pair_result.reset();
-  directory_service.GetEntryInfoPairByPaths(
+  resource_metadata.GetEntryInfoPairByPaths(
       FilePath::FromUTF8Unsafe("drive/dir1/file4"),
       FilePath::FromUTF8Unsafe("drive/dir1/non_existent"),
       base::Bind(&test_util::CopyResultsFromGetEntryInfoPairCallback,
@@ -498,7 +498,7 @@ TEST(GDataDirectoryServiceTest, GetEntryInfoPairByPaths) {
   ASSERT_FALSE(pair_result->second.proto.get());
 }
 
-TEST(GDataDirectoryServiceTest, DBTest) {
+TEST(DriveResourceMetadataTest, DBTest) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
@@ -509,27 +509,27 @@ TEST(GDataDirectoryServiceTest, DBTest) {
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner =
       pool->GetSequencedTaskRunner(pool->GetSequenceToken());
 
-  GDataDirectoryService directory_service;
+  DriveResourceMetadata resource_metadata;
   FilePath db_path(GDataCache::GetCacheRootPath(profile.get()).
       AppendASCII("meta").AppendASCII("resource_metadata.db"));
   // InitFromDB should fail with GDATA_FILE_ERROR_NOT_FOUND since the db
   // doesn't exist.
-  directory_service.InitFromDB(db_path, blocking_task_runner,
+  resource_metadata.InitFromDB(db_path, blocking_task_runner,
       base::Bind(&InitFromDBCallback, GDATA_FILE_ERROR_NOT_FOUND));
   test_util::RunBlockingPoolTask();
-  InitDirectoryService(&directory_service);
+  InitDirectoryService(&resource_metadata);
 
   // Write the filesystem to db.
-  directory_service.SaveToDB();
+  resource_metadata.SaveToDB();
   test_util::RunBlockingPoolTask();
 
-  GDataDirectoryService directory_service2;
+  DriveResourceMetadata resource_metadata2;
   // InitFromDB should succeed with GDATA_FILE_OK as the db now exists.
-  directory_service2.InitFromDB(db_path, blocking_task_runner,
+  resource_metadata2.InitFromDB(db_path, blocking_task_runner,
       base::Bind(&InitFromDBCallback, GDATA_FILE_OK));
   test_util::RunBlockingPoolTask();
 
-  VerifyDirectoryService(&directory_service2);
+  VerifyDirectoryService(&resource_metadata2);
 }
 
 }  // namespace gdata