Refactoring: replace SearchInDirectory by SearchByTitle.

chrome/browser/sync_file_system/drive_file_sync_service_mock_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"
@@ skipping 431 matching lines @@
     return &mock_file_status_observer_;
   }
 
   StrictMock<MockRemoteChangeProcessor>* mock_remote_processor() {
     return &mock_remote_processor_;
   }
 
   MessageLoop* message_loop() { return &message_loop_; }
   DriveFileSyncService* sync_service() { return sync_service_.get(); }
 
-  std::string FormatTitleQuery(const std::string& title) {
-    return DriveFileSyncClient::FormatTitleQuery(title);
-  }
-
   const DriveFileSyncService::PendingChangeQueue& pending_changes() const {
     return sync_service_->pending_changes_;
   }
 
   fileapi::FileSystemURL CreateURL(const GURL& origin,
                                    const base::FilePath::StringType& path) {
     return CreateSyncableFileSystemURL(
         origin, kServiceName, base::FilePath(path));
   }
 
@@ skipping 48 matching lines @@
       const std::string& resource_id,
       int64 changestamp,
       const std::string& remote_file_md5) {
     return sync_service_->AppendRemoteChangeInternal(
         origin, path, is_deleted, resource_id,
         changestamp, remote_file_md5, base::Time(),
         DriveFileSyncService::REMOTE_SYNC_TYPE_INCREMENTAL);
   }
 
   // Mock setup helpers ------------------------------------------------------
-  void SetUpDriveServiceExpectCallsForSearchInDirectory(
+  void SetUpDriveServiceExpectCallsForSearchByTitle(
       const std::string& result_mock_json_name,
-      const std::string& query,
+      const std::string& title,
       const std::string& search_directory) {
     scoped_ptr<Value> result_value(LoadJSONFile(
         result_mock_json_name));
     scoped_ptr<google_apis::ResourceList> result(
         google_apis::ResourceList::ExtractAndParse(*result_value));
     EXPECT_CALL(*mock_drive_service(),
-                SearchInDirectory(query, search_directory, _))
+                SearchByTitle(title, search_directory, _))
         .WillOnce(InvokeGetResourceListCallback2(
             google_apis::HTTP_SUCCESS,
             base::Passed(&result)))
         .RetiresOnSaturation();
   }
 
   void SetUpDriveServiceExpectCallsForGetResourceListInDirectory(
       const std::string& result_mock_json_name,
       const std::string& search_directory) {
     scoped_ptr<Value> result_value(LoadJSONFile(
@@ skipping 19 matching lines @@
             base::Passed(&result)))
         .RetiresOnSaturation();
   }
 
   void SetUpDriveServiceExpectCallsForGetSyncRoot() {
     scoped_ptr<Value> result_value(LoadJSONFile(
         "chromeos/sync_file_system/sync_root_found.json"));
     scoped_ptr<google_apis::ResourceList> result(
         google_apis::ResourceList::ExtractAndParse(*result_value));
     EXPECT_CALL(*mock_drive_service(),
-                Search(FormatTitleQuery(kSyncRootDirectoryName), _))
+                SearchByTitle(kSyncRootDirectoryName, "", _))

[tzik, 2013/04/18 14:26:23]

ditto

[hidehiko, 2013/04/22 04:24:45]

Done.

         .Times(AtMost(1))
-        .WillOnce(InvokeGetResourceListCallback1(
+        .WillOnce(InvokeGetResourceListCallback2(
             google_apis::HTTP_SUCCESS,
             base::Passed(&result)))
         .RetiresOnSaturation();
   }
 
   void SetUpDriveServiceExpectCallsForGetAboutResource() {
     scoped_ptr<Value> account_metadata_value(LoadJSONFile(
         "chromeos/gdata/account_metadata.json"));
     scoped_ptr<google_apis::AboutResource> about_resource(
         google_apis::AboutResource::CreateFromAccountMetadata(
@@ skipping 131 matching lines @@
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AtLeast(1));
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
       .Times(AnyNumber());
 
   // Expect to call GetResourceList for the sync root from
   // RegisterOriginForTrackingChanges.
   SetUpDriveServiceExpectCallsForGetSyncRoot();
 
-  SetUpDriveServiceExpectCallsForSearchInDirectory(
+  SetUpDriveServiceExpectCallsForSearchByTitle(
       "chromeos/sync_file_system/origin_directory_found.json",
-      FormatTitleQuery(DriveFileSyncClient::OriginToDirectoryTitle(kOrigin)),
+      DriveFileSyncClient::OriginToDirectoryTitle(kOrigin),
       kSyncRootResourceId);
-  SetUpDriveServiceExpectCallsForSearchInDirectory(
+  SetUpDriveServiceExpectCallsForSearchByTitle(
       "chromeos/sync_file_system/origin_directory_not_found.json",
-      FormatTitleQuery(DriveFileSyncClient::OriginToDirectoryTitle(kOrigin)),
+      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 GetAboutResource should be called to get
   // the largest changestamp for the origin as a prepariation of the batch sync.
@@ skipping 27 matching lines @@
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   InSequence sequence;
 
   // Expect to call GetResourceList for the sync root from
   // RegisterOriginForTrackingChanges.
   SetUpDriveServiceExpectCallsForGetSyncRoot();
 
   // We already have a directory for the origin.
-  SetUpDriveServiceExpectCallsForSearchInDirectory(
+  SetUpDriveServiceExpectCallsForSearchByTitle(
       "chromeos/sync_file_system/origin_directory_found.json",
-      FormatTitleQuery(DriveFileSyncClient::OriginToDirectoryTitle(kOrigin)),
+      DriveFileSyncClient::OriginToDirectoryTitle(kOrigin),
       kSyncRootResourceId);
 
   SetUpDriveServiceExpectCallsForGetAboutResource();
 
   // DriveFileSyncService should fetch the list of the directory content
   // to start the batch sync.
   SetUpDriveServiceExpectCallsForGetResourceListInDirectory(
       "chromeos/sync_file_system/listing_files_in_directory.json",
       kDirectoryResourceId);
 
@@ skipping 377 matching lines @@
       .Times(AtLeast(1));
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
       .Times(AnyNumber());
 
   InSequence sequence;
 
   // Expect to call GetResourceList for the sync root from
   // RegisterOriginForTrackingChanges.
   SetUpDriveServiceExpectCallsForGetSyncRoot();
 
-  SetUpDriveServiceExpectCallsForSearchInDirectory(
+  SetUpDriveServiceExpectCallsForSearchByTitle(
       "chromeos/sync_file_system/origin_directory_found.json",
-      FormatTitleQuery(DriveFileSyncClient::OriginToDirectoryTitle(kOrigin)),
+      DriveFileSyncClient::OriginToDirectoryTitle(kOrigin),
       kSyncRootResourceId);
 
   // Usually the sync service starts batch sync here, but since we're
   // setting up a drive service with sync disabled batch sync doesn't
   // start (while register origin should still return OK).
 
   SetUpDriveSyncService(false);
   bool done = false;
   sync_service()->RegisterOriginForTrackingChanges(
       kOrigin, base::Bind(&ExpectEqStatus, &done, SYNC_STATUS_OK));
@@ skipping 92 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