drive: Change the return type of ResourceMetadata's methods to FileError

chrome/browser/chromeos/drive/resource_metadata_unittest.cc

Index: chrome/browser/chromeos/drive/resource_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
index 7ff3a5a9922acc0ecec22a246b083e748c22f726..9ea3b44f18bc205528dd49a6f161d885712aacf0 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
@@ -159,7 +159,10 @@ TEST_F(ResourceMetadataTest, LargestChangestamp) {
   const int64 kChangestamp = 123456;
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->SetLargestChangestamp(kChangestamp));
-  EXPECT_EQ(kChangestamp, resource_metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK,
+            resource_metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(kChangestamp, changestamp);
 }
 
 TEST_F(ResourceMetadataTest, GetResourceEntryByPath) {
@@ -227,8 +230,9 @@ TEST_F(ResourceMetadataTest, RefreshEntry) {
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->RefreshEntry(file_entry));
 
-  EXPECT_EQ("drive/root/dir1/dir3/file100",
-            resource_metadata_->GetFilePath(file_id).AsUTF8Unsafe());
+  base::FilePath path;
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(file_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir3/file100", path.AsUTF8Unsafe());
   entry.Clear();
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->GetResourceEntryById(file_id, &entry));
@@ -243,8 +247,8 @@ TEST_F(ResourceMetadataTest, RefreshEntry) {
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->RefreshEntry(file_entry));
 
-  EXPECT_EQ("drive/root/dir1/dir3/file100",
-            resource_metadata_->GetFilePath(file_id).AsUTF8Unsafe());
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(file_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir3/file100", path.AsUTF8Unsafe());
   entry.Clear();
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->GetResourceEntryById(file_id, &entry));
@@ -281,8 +285,8 @@ TEST_F(ResourceMetadataTest, RefreshEntry) {
   dir_entry.set_parent_local_id(dir3_id);
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->RefreshEntry(dir_entry));
 
-  EXPECT_EQ("drive/root/dir1/dir3/dir100",
-            resource_metadata_->GetFilePath(dir_id).AsUTF8Unsafe());
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(dir_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir3/dir100", path.AsUTF8Unsafe());
   entry.Clear();
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->GetResourceEntryById(dir_id, &entry));
@@ -343,20 +347,23 @@ TEST_F(ResourceMetadataTest, GetSubDirectoriesRecursively) {
   std::string local_id;
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3/file9"), &local_id));
-  resource_metadata_->GetSubDirectoriesRecursively(local_id, &sub_directories);
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetSubDirectoriesRecursively(
+      local_id, &sub_directories));
   EXPECT_TRUE(sub_directories.empty());
 
   // dir2: no child directories.
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir2"), &local_id));
-  resource_metadata_->GetSubDirectoriesRecursively(local_id, &sub_directories);
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetSubDirectoriesRecursively(
+      local_id, &sub_directories));
   EXPECT_TRUE(sub_directories.empty());
   const std::string dir2_id = local_id;
 
   // dir1: dir3 is the only child
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1"), &local_id));
-  resource_metadata_->GetSubDirectoriesRecursively(local_id, &sub_directories);
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetSubDirectoriesRecursively(
+      local_id, &sub_directories));
   EXPECT_EQ(1u, sub_directories.size());
   EXPECT_EQ(1u, sub_directories.count(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3")));
@@ -389,7 +396,8 @@ TEST_F(ResourceMetadataTest, GetSubDirectoriesRecursively) {
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(
       CreateDirectoryEntry("dir107", local_id), &local_id));
 
-  resource_metadata_->GetSubDirectoriesRecursively(dir2_id, &sub_directories);
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetSubDirectoriesRecursively(
+      dir2_id, &sub_directories));
   EXPECT_EQ(8u, sub_directories.size());
   EXPECT_EQ(1u, sub_directories.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/dir2/dir101")));
@@ -400,24 +408,23 @@ TEST_F(ResourceMetadataTest, GetSubDirectoriesRecursively) {
 }
 
 TEST_F(ResourceMetadataTest, AddEntry) {
-  base::FilePath drive_file_path;
-
   // Add a file to dir3.
   std::string local_id;
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3"), &local_id));
   ResourceEntry file_entry = CreateFileEntry("file100", local_id);
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(file_entry, &local_id));
-  EXPECT_EQ("drive/root/dir1/dir3/file100",
-            resource_metadata_->GetFilePath(local_id).AsUTF8Unsafe());
+  base::FilePath path;
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(local_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir3/file100", path.AsUTF8Unsafe());
 
   // Add a directory.
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1"), &local_id));
   ResourceEntry dir_entry = CreateDirectoryEntry("dir101", local_id);
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(dir_entry, &local_id));
-  EXPECT_EQ("drive/root/dir1/dir101",
-            resource_metadata_->GetFilePath(local_id).AsUTF8Unsafe());
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(local_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir101", path.AsUTF8Unsafe());
 
   // Add to an invalid parent.
   ResourceEntry file_entry3 = CreateFileEntry("file103", "id:invalid");
@@ -622,7 +629,10 @@ TEST_F(ResourceMetadataTest, Reset) {
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->Reset());
 
   // change stamp should be reset.
-  EXPECT_EQ(0, resource_metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK,
+            resource_metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(0, changestamp);
 
   // root should continue to exist.
   ResourceEntry entry;