Replace GetAccountMetadata by GetAboutResource in sync_file_system.

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/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.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/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/mock_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_client.h"
 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
 #include "chrome/browser/sync_file_system/file_status_observer.h"
 #include "chrome/browser/sync_file_system/mock_remote_change_processor.h"
 #include "chrome/browser/sync_file_system/sync_file_system.pb.h"
@@ skipping 77 matching lines @@
 GURL ExtensionNameToGURL(const base::FilePath::StringType& extension_name) {
   std::string id = Extension::GenerateIdForPath(base::FilePath(extension_name));
   return extensions::Extension::GetBaseURLFromExtensionId(id);
 }
 
 ACTION(InvokeCompletionCallback) {
   base::MessageLoopProxy::current()->PostTask(FROM_HERE, arg1);
 }
 
 // Invokes |arg0| as a GetDataCallback.
-ACTION_P2(InvokeGetAccountMetadataCallback0, error, result) {
-  scoped_ptr<google_apis::AccountMetadata> account_metadata(result.Pass());
+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.
 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(&entry)));
 }
 
@@ skipping 335 matching lines @@
         .RetiresOnSaturation();
   }
 
   void SetUpDriveServiceExpectCallsForGetSyncRoot() {
     SetUpDriveServiceExpectCallsForGetResourceList(
         "sync_file_system/sync_root_found.json",
         FormatTitleQuery(kSyncRootDirectoryName),
         std::string());
   }
 
-  void SetUpDriveServiceExpectCallsForGetAccountMetadata() {
+  void SetUpDriveServiceExpectCallsForGetAboutResource() {
     scoped_ptr<Value> account_metadata_value(LoadJSONFile(
         "gdata/account_metadata.json"));
-    scoped_ptr<google_apis::AccountMetadata> account_metadata(
-        google_apis::AccountMetadata::CreateFrom(*account_metadata_value));
-    EXPECT_CALL(*mock_drive_service(),
-                GetAccountMetadata(_))
-        .WillOnce(InvokeGetAccountMetadataCallback0(
+    scoped_ptr<google_apis::AboutResource> about_resource(
+        google_apis::AboutResource::CreateFromAccountMetadata(
+            *google_apis::AccountMetadata::CreateFrom(*account_metadata_value),
+            "folder:root"));
+    EXPECT_CALL(*mock_drive_service(), GetAboutResource(_))
+        .WillOnce(InvokeGetAboutResourceCallback0(
             google_apis::HTTP_SUCCESS,
-            base::Passed(&account_metadata)))
+            base::Passed(&about_resource)))
         .RetiresOnSaturation();
   }
 
   void SetUpDriveServiceExpectCallsForDownloadFile(
       const std::string& file_resource_id) {
     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(),
@@ skipping 87 matching lines @@
   metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin2);
 
   Sequence change_queue_seq;
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
       .InSequence(change_queue_seq);
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(3))
       .InSequence(change_queue_seq);
 
   InSequence sequence;
 
-  SetUpDriveServiceExpectCallsForGetAccountMetadata();
+  SetUpDriveServiceExpectCallsForGetAboutResource();
   SetUpDriveServiceExpectCallsForGetResourceList(
       "sync_file_system/listing_files_in_directory.json",
       std::string(),
       kDirectoryResourceId1);
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(1);
 
   SetUpDriveSyncService(true);
@@ skipping 30 matching lines @@
       "sync_file_system/origin_directory_not_found.json",
       FormatTitleQuery(DriveFileSyncClient::OriginToDirectoryTitle(kOrigin)),
       kSyncRootResourceId);
 
   // If the directory for the origin is missing, DriveFileSyncService should
   // attempt to create it.
   SetUpDriveServiceExpectCallsForAddNewDirectory(
       kSyncRootResourceId,
       DriveFileSyncClient::OriginToDirectoryTitle(kOrigin));
 
-  // Once the directory is created GetAccountMetadata should be called to get
+  // Once the directory is created GetAboutResource should be called to get
   // the largest changestamp for the origin as a prepariation of the batch sync.
-  SetUpDriveServiceExpectCallsForGetAccountMetadata();
+  SetUpDriveServiceExpectCallsForGetAboutResource();
 
   SetUpDriveServiceExpectCallsForGetResourceList(
       "sync_file_system/listing_files_in_empty_directory.json",
       std::string(),
       kDirectoryResourceId);
 
   SetUpDriveSyncService(true);
   bool done = false;
   sync_service()->RegisterOriginForTrackingChanges(
       kOrigin, base::Bind(&ExpectEqStatus, &done, SYNC_STATUS_OK));
@@ skipping 19 matching lines @@
       .Times(AnyNumber());
 
   InSequence sequence;
 
   // We already have a directory for the origin.
   SetUpDriveServiceExpectCallsForGetResourceList(
       "sync_file_system/origin_directory_found.json",
       FormatTitleQuery(DriveFileSyncClient::OriginToDirectoryTitle(kOrigin)),
       kSyncRootResourceId);
 
-  SetUpDriveServiceExpectCallsForGetAccountMetadata();
+  SetUpDriveServiceExpectCallsForGetAboutResource();
 
   // DriveFileSyncService should fetch the list of the directory content
   // to start the batch sync.
   SetUpDriveServiceExpectCallsForGetResourceList(
       "sync_file_system/listing_files_in_directory.json",
       std::string(),
       kDirectoryResourceId);
 
   SetUpDriveSyncService(true);
   bool done = false;
@@ skipping 25 matching lines @@
   metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin2);
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AtLeast(1));
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   InSequence sequence;
 
-  SetUpDriveServiceExpectCallsForGetAccountMetadata();
+  SetUpDriveServiceExpectCallsForGetAboutResource();
   SetUpDriveServiceExpectCallsForGetResourceList(
       "sync_file_system/listing_files_in_directory.json",
       std::string(),
       kDirectoryResourceId1);
 
   SetUpDriveSyncService(true);
   message_loop()->RunUntilIdle();
 
   EXPECT_EQ(1u, metadata_store()->batch_sync_origins().size());
   EXPECT_EQ(1u, metadata_store()->incremental_sync_origins().size());
@@ skipping 359 matching lines @@
   entry->set_kind(google_apis::ENTRY_KIND_FOLDER);
 
   // Expect to drop this change for file.
   EXPECT_FALSE(AppendIncrementalRemoteChangeByEntry(
       kOrigin, *entry, 1));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace sync_file_system