Refactoring: replace SearchInDirectory by SearchByTitle.

chrome/browser/sync_file_system/drive_file_sync_client_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_client.h"
 
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/values.h"
@@ skipping 115 matching lines @@
 
   virtual void TearDown() OVERRIDE {
     EXPECT_CALL(*mock_drive_service_, RemoveObserver(_));
     EXPECT_CALL(*mock_drive_service(), CancelAll());
     sync_client_.reset();
   }
 
  protected:
   DriveFileSyncClient* sync_client() { return sync_client_.get(); }
 
-  std::string FormatOriginQuery(const GURL& origin) {
-    return FormatTitleQuery(
-        DriveFileSyncClient::OriginToDirectoryTitle(origin));
-  }
-
-  std::string FormatTitleQuery(const std::string& title) {
-    return DriveFileSyncClient::FormatTitleQuery(title);
-  }
-
   StrictMock<MockDriveService>* mock_drive_service() {
     return mock_drive_service_;
   }
 
   MessageLoop* message_loop() { return &message_loop_; }
 
  private:
   MessageLoop message_loop_;
 
   TestingProfile profile_;
@@ skipping 126 matching lines @@
 TEST_F(DriveFileSyncClientTest, GetSyncRoot) {
   const std::string kRootResourceId = "folder:root";
   const std::string kSyncRootResourceId = "folder:sync_root_resource_id";
   scoped_ptr<base::Value> found_result_value(
       LoadJSONFile("chromeos/sync_file_system/sync_root_found.json").Pass());
   scoped_ptr<google_apis::ResourceList> found_result =
       google_apis::ResourceList::ExtractAndParse(*found_result_value);
 
   // Expect to call Search from GetDriveDirectoryForSyncRoot.
   EXPECT_CALL(*mock_drive_service(),
-              Search(FormatTitleQuery(kSyncRootDirectoryName), _))
-      .WillOnce(InvokeGetResourceListCallback1(
+              SearchByTitle(kSyncRootDirectoryName, "", _))

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

s/""/std::string()/ ?

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

Done.

+      .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&found_result)));
 
   // Expect to call GetRootResourceId and RemoveResourceFromDirectory from
   // EnsureSyncRootIsNotInMyDrive.
   EXPECT_CALL(*mock_drive_service(), GetRootResourceId())
       .WillRepeatedly(Return(kRootResourceId));
   EXPECT_CALL(*mock_drive_service(),
               RemoveResourceFromDirectory(kRootResourceId,
                                           kSyncRootResourceId,
@@ skipping 24 matching lines @@
       google_apis::ResourceList::ExtractAndParse(*found_result_value);
 
   scoped_ptr<base::Value> created_result_value =
       LoadJSONFile("chromeos/sync_file_system/sync_root_created.json").Pass();
   scoped_ptr<google_apis::ResourceEntry> created_result =
       google_apis::ResourceEntry::ExtractAndParse(*created_result_value);
 
   // Expect to call Search from GetDriveDirectoryForSyncRoot and
   // EnsureTitleUniqueness
   EXPECT_CALL(*mock_drive_service(),
-              Search(FormatTitleQuery(kSyncRootDirectoryName), _))
-      .WillOnce(InvokeGetResourceListCallback1(
+              SearchByTitle(kSyncRootDirectoryName, "", _))

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

ditto

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

Done.

+      .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&not_found_result)))
-      .WillOnce(InvokeGetResourceListCallback1(
+      .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&found_result)));
 
   // Expect to call GetRootResourceId from GetDriveDirectoryForSyncRoot for the
   // first, and from EnsureSyncRootIsNotInMyDrive for the second.
   EXPECT_CALL(*mock_drive_service(), GetRootResourceId())
       .WillRepeatedly(Return(kRootResourceId));
 
   // Expect to call AddNewDirectory from GetDriveDirectoryForSyncRoot.
   EXPECT_CALL(*mock_drive_service(),
@@ skipping 34 matching lines @@
       google_apis::ResourceList::ExtractAndParse(*duplicated_result_value);
 
   scoped_ptr<base::Value> created_result_value =
       LoadJSONFile("chromeos/sync_file_system/sync_root_created.json").Pass();
   scoped_ptr<google_apis::ResourceEntry> created_result =
       google_apis::ResourceEntry::ExtractAndParse(*created_result_value);
 
   // Expect to call Search from GetDriveDirectoryForSyncRoot and
   // EnsureTitleUniqueness.
   EXPECT_CALL(*mock_drive_service(),
-              Search(FormatTitleQuery(kSyncRootDirectoryName), _))
-      .WillOnce(InvokeGetResourceListCallback1(
+              SearchByTitle(kSyncRootDirectoryName, "", _))

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

ditto

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

Done.

+      .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&not_found_result)))
-      .WillOnce(InvokeGetResourceListCallback1(
+      .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&duplicated_result)));
 
   // Expect to call GetRootResourceId from GetDriveDirectoryForSyncRoot for the
   // first, and from EnsureSyncRootIsNotInMyDrive for the second.
   EXPECT_CALL(*mock_drive_service(), GetRootResourceId())
       .WillRepeatedly(Return(kRootResourceId));
 
   // Expect to call AddNewDirectory from GetDriveDirectoryForSyncRoot.
   EXPECT_CALL(*mock_drive_service(),
@@ skipping 33 matching lines @@
   const GURL kOrigin("chrome-extension://example");
 
   scoped_ptr<base::Value> found_result_value(
       LoadJSONFile(
           "chromeos/sync_file_system/origin_directory_found.json").Pass());
   scoped_ptr<google_apis::ResourceList> found_result =
       google_apis::ResourceList::ExtractAndParse(*found_result_value);
 
   // Expect to call SearchInDirectory from GetDriveDirectoryForOrigin.
   EXPECT_CALL(*mock_drive_service(),
-              SearchInDirectory(FormatOriginQuery(kOrigin),
-                                kParentResourceId,
-                                _))
+              SearchByTitle(
+                  DriveFileSyncClient::OriginToDirectoryTitle(kOrigin),
+                  kParentResourceId, _))
       .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&found_result)));
 
   bool done = false;
   GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   std::string resource_id;
   sync_client()->GetDriveDirectoryForOrigin(
       kParentResourceId, kOrigin,
       base::Bind(&DidGetResourceID, &done, &error, &resource_id));
@@ skipping 25 matching lines @@
   scoped_ptr<google_apis::ResourceEntry> got_parent_result
       = google_apis::ResourceEntry::ExtractAndParse(*got_parent_result_value);
   scoped_ptr<base::Value> created_result_value(
       LoadJSONFile(
           "chromeos/sync_file_system/origin_directory_created.json").Pass());
   scoped_ptr<google_apis::ResourceEntry> created_result =
       google_apis::ResourceEntry::ExtractAndParse(*created_result_value);
 
   // Expect to call SearchInDirectory from GetDriveDirectoryForOrigin.
   EXPECT_CALL(*mock_drive_service(),
-              SearchInDirectory(FormatOriginQuery(kOrigin),
-                                kParentResourceId,  // directory_resource_id
-                                _))
+              SearchByTitle(
+                  DriveFileSyncClient::OriginToDirectoryTitle(kOrigin),
+                  kParentResourceId,  // directory_resource_id
+                  _))
       .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&not_found_result)))
       .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&found_result)));
 
   std::string dir_title(DriveFileSyncClient::OriginToDirectoryTitle(kOrigin));
   // Expect to call AddNewDirectory from GetDriveDirectoryForOrigin.
   EXPECT_CALL(*mock_drive_service(),
@@ skipping 36 matching lines @@
       = google_apis::ResourceEntry::ExtractAndParse(*got_parent_result_value);
   scoped_ptr<base::Value> created_result_value(
       LoadJSONFile(
           "chromeos/sync_file_system/origin_directory_created.json").Pass());
   scoped_ptr<google_apis::ResourceEntry> created_result =
       google_apis::ResourceEntry::ExtractAndParse(*created_result_value);
 
   // Expect to call SearchInDirectory from GetDriveDirectoryForOrigin for the
   // first, and from EnsureTitleUniqueness for the second.
   EXPECT_CALL(*mock_drive_service(),
-              SearchInDirectory(FormatOriginQuery(kOrigin),
-                                kParentResourceId,  // directory_resource_id
-                                _))
+              SearchByTitle(
+                  DriveFileSyncClient::OriginToDirectoryTitle(kOrigin),
+                  kParentResourceId,  // directory_resource_id
+                  _))
       .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&not_found_result)))
       .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&duplicated_result)));
 
   std::string dir_title(DriveFileSyncClient::OriginToDirectoryTitle(kOrigin));
   // Expect to call AddNewDirectory from GetDriveDirectoryForOrigin.
   EXPECT_CALL(*mock_drive_service(),
@@ skipping 265 matching lines @@
 
   scoped_ptr<base::Value> verifying_file_found_data(
       LoadJSONFile(
           "chromeos/sync_file_system/verifing_file_found.json").Pass());
   scoped_ptr<ResourceList> verifying_file_found(
       ResourceList::ExtractAndParse(*verifying_file_found_data));
 
   // Expect to call SearchInDirectory from
   // DriveFileSyncClient::EnsureTitleUniqueness.
   EXPECT_CALL(*mock_drive_service(),
-              SearchInDirectory(FormatTitleQuery(kTitle),
-                                kDirectoryResourceId,
-                                _))
+              SearchByTitle(kTitle, kDirectoryResourceId, _))
       .WillOnce(InvokeGetResourceListCallback2(
           google_apis::HTTP_SUCCESS,
           base::Passed(&verifying_file_found)));
 
   bool done = false;
   GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   std::string resource_id;
   sync_client()->UploadNewFile(kDirectoryResourceId,
                                kLocalFilePath,
                                kTitle,
@@ skipping 148 matching lines @@
                             base::Bind(&DidDeleteFile, &done, &error));
   message_loop()->RunUntilIdle();
 
   EXPECT_TRUE(done);
   EXPECT_EQ(google_apis::HTTP_CONFLICT, error);
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace sync_file_system