Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(481)

Unified Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc

Issue 24140003: [SyncFS] Add generic result reciever (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reupload Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
index 7b1cafdf4c825d24e927ce3049e0b3f7e17483be..47a40199e11a9deecc52adf785a0d69b2b6e1c7a 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
@@ -64,7 +64,7 @@ void ExpectEquivalentTrackers(const FileTracker& left,
EXPECT_EQ(left.needs_folder_listing(), right.needs_folder_listing());
}
-void ExpectCompatibleResourceAndMetadata(
+void ExpectEquivalentResourceAndMetadata(
const google_apis::FileResource& resource,
const FileMetadata& metadata) {
EXPECT_EQ(resource.file_id(), metadata.file_id());
@@ -94,40 +94,13 @@ void ExpectCompatibleResourceAndMetadata(
EXPECT_EQ(resource.labels().is_trashed(), details.deleted());
}
-void ExpectCompatibleMetadataAndTracker(const FileMetadata& metadata,
+void ExpectEquivalentMetadataAndTracker(const FileMetadata& metadata,
const FileTracker& tracker) {
EXPECT_EQ(metadata.file_id(), tracker.file_id());
if (!tracker.dirty())
ExpectEquivalentDetails(metadata.details(), tracker.synced_details());
}
-void SyncStatusResultCallback(SyncStatusCode* status_out,
- SyncStatusCode status) {
- EXPECT_EQ(SYNC_STATUS_UNKNOWN, *status_out);
- *status_out = status;
-}
-
-void DatabaseCreateResultCallback(SyncStatusCode* status_out,
- scoped_ptr<MetadataDatabase>* database_out,
- SyncStatusCode status,
- scoped_ptr<MetadataDatabase> database) {
- EXPECT_EQ(SYNC_STATUS_UNKNOWN, *status_out);
- *status_out = status;
- *database_out = database.Pass();
-}
-
-void ResourceEntryResultCallback(
- google_apis::GDataErrorCode* error_out,
- scoped_ptr<google_apis::ResourceEntry>* entry_out,
- google_apis::GDataErrorCode error,
- scoped_ptr<google_apis::ResourceEntry> entry) {
- ASSERT_TRUE(error_out);
- ASSERT_TRUE(entry_out);
- EXPECT_EQ(google_apis::GDATA_OTHER_ERROR, *error_out);
- *error_out = error;
- *entry_out = entry.Pass();
-}
-
} // namespace test_util
} // namespace drive_backend
} // namespace sync_file_system

Powered by Google App Engine
This is Rietveld 408576698