Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Unified Diff: chrome/browser/chromeos/drive/search_metadata_unittest.cc

Issue 12833019: Eliminate small CopyResultFromXxxCallback families in drive_test_util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/drive/drive_test_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/search_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
index e457df67209be7a11220e36eb2d67fed96860b1c..03b24c6e332650cfe512c7dabe350b8388f8a348 100644
--- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
@@ -107,10 +107,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_ZeroMatches) {
SearchMetadata(file_system_.get(),
"NonExistent",
kDefaultAtMostNumMatches,
- base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
- &error,
- &result));
-
+ google_apis::test_util::CreateCopyResultCallback(
+ &error, &result));
google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(0U, result->size());
@@ -123,10 +121,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFile) {
SearchMetadata(file_system_.get(),
"SubDirectory File 1.txt",
kDefaultAtMostNumMatches,
- base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
- &error,
- &result));
-
+ google_apis::test_util::CreateCopyResultCallback(
+ &error, &result));
google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size());
@@ -144,10 +140,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_CaseInsensitiveSearch) {
SearchMetadata(file_system_.get(),
"subdirectory file 1.txt",
kDefaultAtMostNumMatches,
- base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
- &error,
- &result));
-
+ google_apis::test_util::CreateCopyResultCallback(
+ &error, &result));
google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size());
@@ -162,10 +156,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFiles) {
SearchMetadata(file_system_.get(),
"SubDir",
kDefaultAtMostNumMatches,
- base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
- &error,
- &result));
-
+ google_apis::test_util::CreateCopyResultCallback(
+ &error, &result));
google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(2U, result->size());
@@ -194,10 +186,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_AtMostOneFile) {
SearchMetadata(file_system_.get(),
"SubDir",
1, // at_most_num_matches
- base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
- &error,
- &result));
-
+ google_apis::test_util::CreateCopyResultCallback(
+ &error, &result));
google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size());
@@ -214,10 +204,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_Directory) {
SearchMetadata(file_system_.get(),
"Directory 1",
kDefaultAtMostNumMatches,
- base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
- &error,
- &result));
-
+ google_apis::test_util::CreateCopyResultCallback(
+ &error, &result));
google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size());
@@ -233,10 +221,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_HostedDocument) {
SearchMetadata(file_system_.get(),
"Document",
kDefaultAtMostNumMatches,
- base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
- &error,
- &result));
-
+ google_apis::test_util::CreateCopyResultCallback(
+ &error, &result));
google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size());
@@ -257,10 +243,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_HideHostedDocument) {
SearchMetadata(file_system_.get(),
"Document",
kDefaultAtMostNumMatches,
- base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
- &error,
- &result));
-
+ google_apis::test_util::CreateCopyResultCallback(
+ &error, &result));
google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(0U, result->size());
« no previous file with comments | « chrome/browser/chromeos/drive/drive_test_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698