summaryrefslogtreecommitdiffstats
path: root/chrome/browser/google_apis
diff options
context:
space:
mode:
authorhidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 18:09:29 +0000
committerhidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 18:09:29 +0000
commita556fdc61addb9521d390d7effe879337ae91437 (patch)
tree4d90cd4f127276f9bce94074d946aeb950aa4639 /chrome/browser/google_apis
parent195b9161909c7693e08f4e910c23ba2c650f6036 (diff)
downloadchromium_src-a556fdc61addb9521d390d7effe879337ae91437.zip
chromium_src-a556fdc61addb9521d390d7effe879337ae91437.tar.gz
chromium_src-a556fdc61addb9521d390d7effe879337ae91437.tar.bz2
Eliminate CopyResultsFromEntryActionCallback.
Replace the method with CreateCopyResultCallback, RunAndQuit and CreateComposedCallback. BUG=180569 TEST=Ran ./out/Debug/unit_tests --gtest_filter=FakeDriveServiceTest*:DriveSchedulerTest* Review URL: https://chromiumcodereview.appspot.com/12623009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google_apis')
-rw-r--r--chrome/browser/google_apis/fake_drive_service_unittest.cc75
-rw-r--r--chrome/browser/google_apis/test_util.cc5
-rw-r--r--chrome/browser/google_apis/test_util.h4
3 files changed, 27 insertions, 57 deletions
diff --git a/chrome/browser/google_apis/fake_drive_service_unittest.cc b/chrome/browser/google_apis/fake_drive_service_unittest.cc
index 66e7bd5..676d1ad 100644
--- a/chrome/browser/google_apis/fake_drive_service_unittest.cc
+++ b/chrome/browser/google_apis/fake_drive_service_unittest.cc
@@ -577,11 +577,9 @@ TEST_F(FakeDriveServiceTest, DeleteResource_ExistingFile) {
ASSERT_TRUE(Exists("file:2_file_resource_id"));
GDataErrorCode error = GDATA_OTHER_ERROR;
- fake_service_.DeleteResource(
- "file:2_file_resource_id",
- "", // etag
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ fake_service_.DeleteResource("file:2_file_resource_id",
+ "", // etag
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_SUCCESS, error);
@@ -594,11 +592,9 @@ TEST_F(FakeDriveServiceTest, DeleteResource_NonexistingFile) {
"chromeos/gdata/root_feed.json"));
GDataErrorCode error = GDATA_OTHER_ERROR;
- fake_service_.DeleteResource(
- "file:nonexisting_resource_id",
- "", // etag
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ fake_service_.DeleteResource("file:nonexisting_resource_id",
+ "", // etag
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_NOT_FOUND, error);
@@ -610,11 +606,9 @@ TEST_F(FakeDriveServiceTest, DeleteResource_Offline) {
fake_service_.set_offline(true);
GDataErrorCode error = GDATA_OTHER_ERROR;
- fake_service_.DeleteResource(
- "file:2_file_resource_id",
- "", // etag
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ fake_service_.DeleteResource("file:2_file_resource_id",
+ "", // etag
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(GDATA_NO_CONNECTION, error);
@@ -799,11 +793,9 @@ TEST_F(FakeDriveServiceTest, RenameResource_ExistingFile) {
const std::string kResourceId = "file:2_file_resource_id";
GDataErrorCode error = GDATA_OTHER_ERROR;
- fake_service_.RenameResource(
- kResourceId,
- "new name",
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ fake_service_.RenameResource(kResourceId,
+ "new name",
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_SUCCESS, error);
@@ -823,11 +815,9 @@ TEST_F(FakeDriveServiceTest, RenameResource_NonexistingFile) {
const std::string kResourceId = "file:nonexisting_file";
GDataErrorCode error = GDATA_OTHER_ERROR;
- fake_service_.RenameResource(
- kResourceId,
- "new name",
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ fake_service_.RenameResource(kResourceId,
+ "new name",
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_NOT_FOUND, error);
@@ -841,11 +831,9 @@ TEST_F(FakeDriveServiceTest, RenameResource_Offline) {
const std::string kResourceId = "file:2_file_resource_id";
GDataErrorCode error = GDATA_OTHER_ERROR;
- fake_service_.RenameResource(
- kResourceId,
- "new name",
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ fake_service_.RenameResource(kResourceId,
+ "new name",
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(GDATA_NO_CONNECTION, error);
@@ -871,8 +859,7 @@ TEST_F(FakeDriveServiceTest, AddResourceToDirectory_FileInRootDirectory) {
fake_service_.AddResourceToDirectory(
kNewParentResourceId,
kResourceId,
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_SUCCESS, error);
@@ -905,8 +892,7 @@ TEST_F(FakeDriveServiceTest, AddResourceToDirectory_FileInNonRootDirectory) {
fake_service_.AddResourceToDirectory(
kNewParentResourceId,
kResourceId,
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_SUCCESS, error);
@@ -930,8 +916,7 @@ TEST_F(FakeDriveServiceTest, AddResourceToDirectory_NonexistingFile) {
fake_service_.AddResourceToDirectory(
kNewParentResourceId,
kResourceId,
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_NOT_FOUND, error);
@@ -956,8 +941,7 @@ TEST_F(FakeDriveServiceTest, AddResourceToDirectory_OrphanFile) {
fake_service_.AddResourceToDirectory(
kNewParentResourceId,
kResourceId,
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_SUCCESS, error);
@@ -982,8 +966,7 @@ TEST_F(FakeDriveServiceTest, AddResourceToDirectory_Offline) {
fake_service_.AddResourceToDirectory(
kNewParentResourceId,
kResourceId,
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(GDATA_NO_CONNECTION, error);
@@ -1011,8 +994,7 @@ TEST_F(FakeDriveServiceTest, RemoveResourceFromDirectory_ExistingFile) {
fake_service_.RemoveResourceFromDirectory(
kParentResourceId,
kResourceId,
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_SUCCESS, error);
@@ -1038,8 +1020,7 @@ TEST_F(FakeDriveServiceTest, RemoveResourceFromDirectory_NonexistingFile) {
fake_service_.RemoveResourceFromDirectory(
kParentResourceId,
kResourceId,
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_NOT_FOUND, error);
@@ -1056,8 +1037,7 @@ TEST_F(FakeDriveServiceTest, RemoveResourceFromDirectory_OrphanFile) {
fake_service_.RemoveResourceFromDirectory(
kParentResourceId,
kResourceId,
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(HTTP_NOT_FOUND, error);
@@ -1075,8 +1055,7 @@ TEST_F(FakeDriveServiceTest, RemoveResourceFromDirectory_Offline) {
fake_service_.RemoveResourceFromDirectory(
kParentResourceId,
kResourceId,
- base::Bind(&test_util::CopyResultsFromEntryActionCallback,
- &error));
+ test_util::CreateCopyResultCallback(&error));
message_loop_.RunUntilIdle();
EXPECT_EQ(GDATA_NO_CONNECTION, error);
diff --git a/chrome/browser/google_apis/test_util.cc b/chrome/browser/google_apis/test_util.cc
index 17fc23c..31be9a6 100644
--- a/chrome/browser/google_apis/test_util.cc
+++ b/chrome/browser/google_apis/test_util.cc
@@ -101,11 +101,6 @@ scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_path) {
return value.Pass();
}
-void CopyResultsFromEntryActionCallback(GDataErrorCode* error_out,
- GDataErrorCode error_in) {
- *error_out = error_in;
-}
-
void CopyResultFromEntryActionCallbackAndQuit(GDataErrorCode* error_out,
GDataErrorCode error_in) {
*error_out = error_in;
diff --git a/chrome/browser/google_apis/test_util.h b/chrome/browser/google_apis/test_util.h
index 8127dad..d6bddd5a 100644
--- a/chrome/browser/google_apis/test_util.h
+++ b/chrome/browser/google_apis/test_util.h
@@ -67,10 +67,6 @@ GURL GetBaseUrlForTesting(int port);
// chrome/test/data.
scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_path);
-// Copies the results from EntryActionCallback.
-void CopyResultsFromEntryActionCallback(GDataErrorCode* error_out,
- GDataErrorCode error_in);
-
// Copies the result from EntryActionCallback and quit the message loop.
void CopyResultFromEntryActionCallbackAndQuit(GDataErrorCode* error_out,
GDataErrorCode error_in);
generated by cgit v1.1 at 2025-02-28 22:33:09 +0000