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

chrome/browser/chromeos/drive/change_list_processor_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/change_list_processor.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ skipping 178 matching lines @@
     EXPECT_EQ(kExpected[i].id, entry->resource_id());
 
     ResourceEntry parent_entry;
     EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(
         entry->parent_local_id(), &parent_entry));
     EXPECT_EQ(kExpected[i].parent_id, parent_entry.resource_id());
     EXPECT_EQ(kExpected[i].type,
               entry->file_info().is_directory() ? DIRECTORY : FILE);
   }
 
-  EXPECT_EQ(kBaseResourceListChangestamp, metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(kBaseResourceListChangestamp, changestamp);
 }
 
 TEST_F(ChangeListProcessorTest, DeltaFileAddedInNewDirectory) {
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry new_folder;
   new_folder.set_resource_id("folder:new_folder_resource_id");
   new_folder.set_title("New Directory");
   new_folder.mutable_file_info()->set_is_directory(true);
   change_lists[0]->mutable_entries()->push_back(new_folder);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   ResourceEntry new_file;
   new_file.set_resource_id("document:file_added_in_new_dir_id");
   new_file.set_title("File in new dir.txt");
   change_lists[0]->mutable_entries()->push_back(new_file);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       new_folder.resource_id());
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   std::set<base::FilePath> changed_dirs;
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
 
-  EXPECT_EQ(16730, metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(16730, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/New Directory"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/New Directory/File in new dir.txt"));
 
   EXPECT_EQ(2U, changed_dirs.size());
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root")));
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root/New Directory")));
 }
@@ skipping 10 matching lines @@
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "folder:sub_dir_folder_2_self_link");
 
   change_lists[0]->set_largest_changestamp(16809);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   std::set<base::FilePath> changed_dirs;
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
 
-  EXPECT_EQ(16809, metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(16809, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Directory 1"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/Directory 2 excludeDir-test/Directory 1"));
 
   EXPECT_EQ(4U, changed_dirs.size());
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root")));
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
   EXPECT_TRUE(changed_dirs.count(
@@ skipping 14 matching lines @@
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16815);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   std::set<base::FilePath> changed_dirs;
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
 
-  EXPECT_EQ(16815, metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(16815, changestamp);
   EXPECT_FALSE(GetResourceEntry(
       "drive/root/Directory 1/SubDirectory File 1.txt"));
   EXPECT_TRUE(GetResourceEntry("drive/root/SubDirectory File 1.txt"));
 
   EXPECT_EQ(2U, changed_dirs.size());
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root")));
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
 }
 
 TEST_F(ChangeListProcessorTest, DeltaFileRenamedInDirectory) {
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry entry;
   entry.set_resource_id("file:subdirectory_file_1_id");
   entry.set_title("New SubDirectory File 1.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "folder:1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16767);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   std::set<base::FilePath> changed_dirs;
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
 
-  EXPECT_EQ(16767, metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(16767, changestamp);
   EXPECT_FALSE(GetResourceEntry(
       "drive/root/Directory 1/SubDirectory File 1.txt"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/Directory 1/New SubDirectory File 1.txt"));
 
   EXPECT_EQ(1U, changed_dirs.size());
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
 }
 
 TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileInRoot) {
   // Create ChangeList to add a file.
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry entry;
   entry.set_resource_id("document:added_in_root_id");
   entry.set_title("Added file.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16683);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   std::set<base::FilePath> changed_dirs;
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
-  EXPECT_EQ(16683, metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(16683, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/Added file.txt"));
   EXPECT_EQ(1U, changed_dirs.size());
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root")));
 
   // Create ChangeList to delete the file.
   change_lists.push_back(new ChangeList);
 
   entry.set_deleted(true);
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16687);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
-  EXPECT_EQ(16687, metadata_->GetLargestChangestamp());
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(16687, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Added file.txt"));
   EXPECT_EQ(1U, changed_dirs.size());
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root")));
 }
 
 
 TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileFromExistingDirectory) {
   // Create ChangeList to add a file.
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry entry;
   entry.set_resource_id("document:added_in_root_id");
   entry.set_title("Added file.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "folder:1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   std::set<base::FilePath> changed_dirs;
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
-  EXPECT_EQ(16730, metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(16730, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/Directory 1/Added file.txt"));
 
   EXPECT_EQ(1U, changed_dirs.size());
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
 
   // Create ChangeList to delete the file.
   change_lists.push_back(new ChangeList);
 
   entry.set_deleted(true);
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "folder:1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16770);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
-  EXPECT_EQ(16770, metadata_->GetLargestChangestamp());
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(16770, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Directory 1/Added file.txt"));
 
   EXPECT_EQ(1U, changed_dirs.size());
   EXPECT_TRUE(changed_dirs.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
 }
 
 TEST_F(ChangeListProcessorTest, DeltaAddFileToNewButDeletedDirectory) {
   // Create a change which contains the following updates:
   // 1) A new PDF file is added to a new directory
@@ skipping 18 matching lines @@
   change_lists[0]->mutable_entries()->push_back(directory);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   std::set<base::FilePath> changed_dirs;
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
 
-  EXPECT_EQ(16730, metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(16730, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/New Directory/new_pdf_file.pdf"));
 
   EXPECT_TRUE(changed_dirs.empty());
 }
 
 TEST_F(ChangeListProcessorTest, RefreshDirectory) {
   // Prepare metadata.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
   // Create change list.
@@ skipping 133 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
 
   // The change is rejected due to the old modification date.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(local_id, &entry));
   EXPECT_EQ(new_file_local.title(), entry.title());
 }
 
 }  // namespace internal
 }  // namespace drive