Random clean up in c/b/cros/drive.

chrome/browser/chromeos/drive/file_system_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/chromeos/drive/file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 84 matching lines @@
     // value of |counter| is different from the expected one.
     message_loop->Quit();
     return;
   }
 
   (*counter)++;
   if (*counter >= expected_counter)
     message_loop->Quit();
 }
 
-void AppendContent(std::vector<std::string>* buffer,
-                   google_apis::GDataErrorCode error,
-                   scoped_ptr<std::string> content) {
-  DCHECK_EQ(error, google_apis::HTTP_SUCCESS);
-  buffer->push_back(*content);
-}
-
 }  // namespace
 
 class FileSystemTest : public testing::Test {
  protected:
   FileSystemTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         // |root_feed_changestamp_| should be set to the largest changestamp in
         // about resource feed. But we fake it by some non-zero positive
         // increasing value.  See |LoadFeed()|.
         root_feed_changestamp_(1) {
@@ skipping 1425 matching lines @@
 
   ASSERT_TRUE(LoadRootFeedDocument());
 
   base::FilePath file_in_root(FILE_PATH_LITERAL("drive/root/File 1.txt"));
 
   {
     FileError initialized_error = FILE_ERROR_FAILED;
     scoped_ptr<ResourceEntry> entry;
     base::FilePath local_path;
     base::Closure cancel_download;
-
-    std::vector<std::string> content_buffer;
+    google_apis::test_util::TestGetContentCallback get_content_callback;
 
     FileError completion_error = FILE_ERROR_FAILED;
 
     file_system_->GetFileContentByPath(
         file_in_root,
         google_apis::test_util::CreateCopyResultCallback(
             &initialized_error, &entry, &local_path, &cancel_download),
-        base::Bind(&AppendContent, &content_buffer),
+        get_content_callback.callback(),
         google_apis::test_util::CreateCopyResultCallback(&completion_error));
     google_apis::test_util::RunBlockingPoolTask();
 
     // For the first time, file is downloaded from the remote server.
     // In this case, |local_path| is empty while |cancel_download| is not.
     EXPECT_EQ(FILE_ERROR_OK, initialized_error);
     ASSERT_TRUE(entry);
     ASSERT_TRUE(local_path.empty());
     EXPECT_TRUE(!cancel_download.is_null());
-    // Content is available through the second callback arguemnt.
-    size_t content_size = 0;
-    for (size_t i = 0; i < content_buffer.size(); ++i) {
-      content_size += content_buffer[i].size();
-    }
+    // Content is available through the second callback argument.
     EXPECT_EQ(static_cast<size_t>(entry->file_info().size()),
-              content_size);
+              get_content_callback.GetConcatenatedData().size());
     EXPECT_EQ(FILE_ERROR_OK, completion_error);
   }
 
   {
     FileError initialized_error = FILE_ERROR_FAILED;
     scoped_ptr<ResourceEntry> entry;
     base::FilePath local_path;
     base::Closure cancel_download;
-
-    std::vector<std::string> content_buffer;
+    google_apis::test_util::TestGetContentCallback get_content_callback;
 
     FileError completion_error = FILE_ERROR_FAILED;
 
     file_system_->GetFileContentByPath(
         file_in_root,
         google_apis::test_util::CreateCopyResultCallback(
             &initialized_error, &entry, &local_path, &cancel_download),
-        base::Bind(&AppendContent, &content_buffer),
+        get_content_callback.callback(),
         google_apis::test_util::CreateCopyResultCallback(&completion_error));
     google_apis::test_util::RunBlockingPoolTask();
 
     // Try second download. In this case, the file should be cached, so
     // |local_path| should not be empty while |cancel_download| is empty.
     EXPECT_EQ(FILE_ERROR_OK, initialized_error);
     ASSERT_TRUE(entry);
     ASSERT_TRUE(!local_path.empty());
     EXPECT_TRUE(cancel_download.is_null());
     // The content is available from the cache file.
-    EXPECT_TRUE(content_buffer.empty());
+    EXPECT_TRUE(get_content_callback.data().empty());
     int64 local_file_size = 0;
     file_util::GetFileSize(local_path, &local_file_size);
     EXPECT_EQ(entry->file_info().size(), local_file_size);
     EXPECT_EQ(FILE_ERROR_OK, completion_error);
   }
 }
 
 TEST_F(FileSystemTest, GetFileByResourceId_FromCache) {
   fake_free_disk_space_getter_->set_fake_free_disk_space(kLotsOfSpace);
 
@@ skipping 364 matching lines @@
       entry->resource_id(),
       entry->file_specific_info().file_md5(),
       google_apis::test_util::CreateCopyResultCallback(&success, &cache_entry));
   google_apis::test_util::RunBlockingPoolTask();
 
   EXPECT_TRUE(success);
   EXPECT_FALSE(cache_entry.is_mounted());
 }
 
 }   // namespace drive