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

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc

Issue 12385081: Replace GetAccountMetadata by GetAboutResource in sync_file_system. (Closed) Base URL: http://git.chromium.org/chromium/src.git@b174237_gdata_wapi_get_about_resource_impl4
Patch Set: Created 7 years, 10 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_file_sync_client_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
index 7b86c36f7a444d8f1bc3f3f89435e3c2346800ad..78dc7f05467d35af056624251830802dde5f6567 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
@@ -7,6 +7,7 @@
#include "base/json/json_reader.h"
#include "base/message_loop.h"
#include "base/message_loop_proxy.h"
+#include "chrome/browser/google_apis/drive_api_parser.h"
#include "chrome/browser/google_apis/drive_uploader.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
#include "chrome/browser/google_apis/mock_drive_service.h"
@@ -155,12 +156,12 @@ class DriveFileSyncClientTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(DriveFileSyncClientTest);
};
-// Invokes |arg0| as a GetAccountMetadataCallback.
-ACTION_P2(InvokeGetAccountMetadataCallback0, error, result) {
- scoped_ptr<google_apis::AccountMetadata> account_metadata(result.Pass());
+// Invokes |arg0| as a GetAboutResourceCallback.
+ACTION_P2(InvokeGetAboutResourceCallback0, error, result) {
+ scoped_ptr<google_apis::AboutResource> about_resource(result.Pass());
base::MessageLoopProxy::current()->PostTask(
FROM_HERE,
- base::Bind(arg0, error, base::Passed(&account_metadata)));
+ base::Bind(arg0, error, base::Passed(&about_resource)));
}
// Invokes |arg1| as a GetResourceEntryCallback.
@@ -571,14 +572,16 @@ TEST_F(DriveFileSyncClientTest, CreateOriginDirectory_Conflict) {
TEST_F(DriveFileSyncClientTest, GetLargestChangeStamp) {
scoped_ptr<base::Value> result(
LoadJSONFile("sync_file_system/account_metadata.json").Pass());
- scoped_ptr<google_apis::AccountMetadata> account_metadata(
- google_apis::AccountMetadata::CreateFrom(*result));
-
- // Expect to call GetAccountMetadata from GetLargestChangeStamp.
- EXPECT_CALL(*mock_drive_service(), GetAccountMetadata(_))
- .WillOnce(InvokeGetAccountMetadataCallback0(
+ scoped_ptr<google_apis::AboutResource> about_resource(
+ google_apis::AboutResource::CreateFromAccountMetadata(
+ *google_apis::AccountMetadata::CreateFrom(*result),
+ "folder:root"));
+
+ // Expect to call GetAboutResource from GetLargestChangeStamp.
+ EXPECT_CALL(*mock_drive_service(), GetAboutResource(_))
+ .WillOnce(InvokeGetAboutResourceCallback0(
google_apis::HTTP_SUCCESS,
- base::Passed(&account_metadata)))
+ base::Passed(&about_resource)))
.RetiresOnSaturation();
bool done = false;

Powered by Google App Engine
This is Rietveld 408576698