Add callback for upload progress in Drive service and operation layer.

chrome/browser/google_apis/drive_uploader_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/google_apis/drive_uploader.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <string>
 
@@ skipping 104 matching lines @@
   // Handles a request for uploading a chunk of bytes.
   virtual void ResumeUpload(
       UploadMode upload_mode,
       const base::FilePath& drive_file_path,
       const GURL& upload_url,
       int64 start_position,
       int64 end_position,
       int64 content_length,
       const std::string& content_type,
       const scoped_refptr<net::IOBuffer>& buf,
-      const UploadRangeCallback& callback) OVERRIDE {
+      const UploadRangeCallback& callback,
+      const ProgressCallback& progress_callback) OVERRIDE {
     const int64 expected_size = expected_upload_content_.size();
 
     // The upload range should start from the current first unreceived byte.
     EXPECT_EQ(received_bytes_, start_position);
 
     // The upload data must be split into 512KB chunks.
     const int64 expected_chunk_end =
         std::min(received_bytes_ + kUploadChunkSize, expected_size);
     EXPECT_EQ(expected_chunk_end, end_position);
 
@@ skipping 67 matching lines @@
   // Should not be used.
   virtual void ResumeUpload(
       UploadMode upload_mode,
       const base::FilePath& drive_file_path,
       const GURL& upload_url,
       int64 start_position,
       int64 end_position,
       int64 content_length,
       const std::string& content_type,
       const scoped_refptr<net::IOBuffer>& buf,
-      const UploadRangeCallback& callback) OVERRIDE {
+      const UploadRangeCallback& callback,
+      const ProgressCallback& progress_callback) OVERRIDE {
     NOTREACHED();
   }
 };
 
 // Mock DriveService that returns a failure at ResumeUpload().
 class MockDriveServiceNoConnectionAtResume : public DummyDriveService {
   // Succeeds and returns an upload location URL.
   virtual void InitiateUploadNewFile(
       const base::FilePath& drive_file_path,
       const std::string& content_type,
@@ skipping 19 matching lines @@
   // Returns error.
   virtual void ResumeUpload(
       UploadMode upload_mode,
       const base::FilePath& drive_file_path,
       const GURL& upload_url,
       int64 start_position,
       int64 end_position,
       int64 content_length,
       const std::string& content_type,
       const scoped_refptr<net::IOBuffer>& buf,
-      const UploadRangeCallback& callback) OVERRIDE {
+      const UploadRangeCallback& callback,
+      const ProgressCallback& progress_callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(callback,
                    UploadRangeResponse(GDATA_NO_CONNECTION, -1, -1),
                    base::Passed(scoped_ptr<ResourceEntry>())));
   }
 };
 
 class DriveUploaderTest : public testing::Test {
  public:
   DriveUploaderTest()
@@ skipping 267 matching lines @@
       "",  // etag
       test_util::CreateCopyResultCallback(
           &error, &drive_path, &file_path, &resource_entry));
   test_util::RunBlockingPoolTask();
 
   // Should return failure without doing any attempt to connect to the server.
   EXPECT_EQ(DRIVE_UPLOAD_ERROR_NOT_FOUND, error);
 }
 
 }  // namespace google_apis