google_apis: DriveServiceInterface::GetResourceEntry() returns ResourceEntry

chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc

 // Copyright (c) 2012 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/sync_file_system/drive_file_sync_service.h"
 
 #include <utility>
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 288 matching lines @@
 }
 
 // Invokes |arg0| as a GetDataCallback.
 ACTION_P2(InvokeGetDataCallback0, error, result) {
   scoped_ptr<base::Value> value(result.Pass());
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(arg0, error, base::Passed(&value)));
 }
 
-// Invokes |arg0| as a GetDataCallback.
-ACTION_P2(InvokeGetDataCallback1, error, result) {
-  scoped_ptr<base::Value> value(result.Pass());
+// Invokes |arg1| as a GetResourceEntryCallback.
+ACTION_P2(InvokeGetResourceEntryCallback1, error, result) {
+  scoped_ptr<google_apis::ResourceEntry> entry(result.Pass());
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
-      base::Bind(arg1, error, base::Passed(&value)));
+      base::Bind(arg1, error, base::Passed(&entry)));
 }
 
 // Invokes |arg2| as a GetDataCallback.
 ACTION_P2(InvokeGetDataCallback2, error, result) {
   scoped_ptr<base::Value> value(result.Pass());
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(arg2, error, base::Passed(&value)));
 }
 
@@ skipping 161 matching lines @@
           google_apis::HTTP_SUCCESS,
           base::Passed(&origin_directory_not_found)))
       .RetiresOnSaturation();
 
   // If the directory for the origin is missing, DriveFileSyncService should
   // attempt to create it. And as a preparation, it should fetch the content url
   // of the parent directory.
   //
   // |sync_root_entry| contains kSyncRootContentURL which is to be added as
   // a new origin directory under the root directory.
-  scoped_ptr<Value> sync_root_entry(LoadJSONFile(
+  scoped_ptr<Value> sync_root_entry_value(LoadJSONFile(
       "sync_file_system/sync_root_entry.json"));
+  scoped_ptr<google_apis::ResourceEntry> sync_root_entry
+      = google_apis::ResourceEntry::ExtractAndParse(*sync_root_entry_value);
   EXPECT_CALL(*mock_drive_service(),
               GetResourceEntry(kSyncRootResourceId, _))
-      .WillOnce(InvokeGetDataCallback1(
+      .WillOnce(InvokeGetResourceEntryCallback1(
           google_apis::HTTP_SUCCESS,
           base::Passed(&sync_root_entry)));
 
   scoped_ptr<Value> origin_directory_created(LoadJSONFile(
       "sync_file_system/origin_directory_created.json"));
   FilePath::StringType dirname = FilePath().AppendASCII(
       DriveFileSyncClient::OriginToDirectoryTitle(kOrigin)).value();
   EXPECT_CALL(*mock_drive_service(),
               AddNewDirectory(kSyncRootContentURL, dirname, _))
       .WillOnce(InvokeGetDataCallback2(
@@ skipping 324 matching lines @@
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   EXPECT_CALL(*mock_remote_processor(),
               PrepareForProcessRemoteChange(CreateURL(kOrigin, kFileName), _))
       .WillOnce(PrepareForRemoteChange_NotFound());
   EXPECT_CALL(*mock_remote_processor(),
               ClearLocalChanges(CreateURL(kOrigin, kFileName), _))
       .WillOnce(InvokeCompletionCallback());
 
-  scoped_ptr<Value> file_entry(LoadJSONFile("gdata/file_entry.json").Pass());
+  scoped_ptr<Value> file_entry_value(
+      LoadJSONFile("gdata/file_entry.json").Pass());
+  scoped_ptr<google_apis::ResourceEntry> file_entry
+      = google_apis::ResourceEntry::ExtractAndParse(*file_entry_value);
   EXPECT_CALL(*mock_drive_service(),
               GetResourceEntry(kFileResourceId, _))
-      .WillOnce(InvokeGetDataCallback1(google_apis::HTTP_SUCCESS,
-                                       base::Passed(&file_entry)));
+      .WillOnce(InvokeGetResourceEntryCallback1(
+          google_apis::HTTP_SUCCESS,
+          base::Passed(&file_entry)));
 
   EXPECT_CALL(*mock_drive_service(),
               DownloadFile(_, _, GURL("https://file_content_url"), _, _))
       .WillOnce(InvokeDidDownloadFile());
 
   EXPECT_CALL(*mock_remote_processor(),
               ApplyRemoteChange(_, _, CreateURL(kOrigin, kFileName), _))
       .WillOnce(InvokeDidApplyRemoteChange());
 
   SetUpDriveSyncService();
@@ skipping 24 matching lines @@
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   EXPECT_CALL(*mock_remote_processor(),
               PrepareForProcessRemoteChange(CreateURL(kOrigin, kFileName), _))
       .WillOnce(PrepareForRemoteChange_NotModified());
   EXPECT_CALL(*mock_remote_processor(),
               ClearLocalChanges(CreateURL(kOrigin, kFileName), _))
       .WillOnce(InvokeCompletionCallback());
 
-  scoped_ptr<Value> file_entry(LoadJSONFile("gdata/file_entry.json").Pass());
+  scoped_ptr<Value> file_entry_value(
+      LoadJSONFile("gdata/file_entry.json").Pass());
+  scoped_ptr<google_apis::ResourceEntry> file_entry
+      = google_apis::ResourceEntry::ExtractAndParse(*file_entry_value);
   EXPECT_CALL(*mock_drive_service(),
               GetResourceEntry(kFileResourceId, _))
-      .WillOnce(InvokeGetDataCallback1(google_apis::HTTP_SUCCESS,
-                                       base::Passed(&file_entry)));
+      .WillOnce(InvokeGetResourceEntryCallback1(
+          google_apis::HTTP_SUCCESS,
+          base::Passed(&file_entry)));
 
   EXPECT_CALL(*mock_drive_service(),
               DownloadFile(_, _, GURL("https://file_content_url"), _, _))
       .WillOnce(InvokeDidDownloadFile());
 
   EXPECT_CALL(*mock_remote_processor(),
               ApplyRemoteChange(_, _, CreateURL(kOrigin, kFileName), _))
       .WillOnce(InvokeDidApplyRemoteChange());
 
   SetUpDriveSyncService();
 
   scoped_ptr<ResourceEntry> entry(ResourceEntry::ExtractAndParse(
       *LoadJSONFile("gdata/file_entry.json")));
   AppendIncrementalRemoteChange(kOrigin, *entry, 12345);
   ProcessRemoteChange(fileapi::SYNC_STATUS_OK,
                       CreateURL(kOrigin, kFileName),
                       fileapi::SYNC_OPERATION_UPDATED);
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace sync_file_system