Add ProgressCallback to DriveServiceInterface::DownloadFile.

chrome/browser/google_apis/fake_drive_service.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/fake_drive_service.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 469 matching lines @@
   // changelists from GetResourceList().
   MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND));
 }
 
 void FakeDriveService::DownloadFile(
     const base::FilePath& virtual_path,
     const base::FilePath& local_cache_path,
     const GURL& download_url,
     const DownloadActionCallback& download_action_callback,
-    const GetContentCallback& get_content_callback) {
+    const GetContentCallback& get_content_callback,
+    const ProgressCallback& progress_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!download_action_callback.is_null());
 
   if (offline_) {
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(download_action_callback,
                    GDATA_NO_CONNECTION,
                    base::FilePath()));
     return;
   }
 
-  // The field content.src is the URL to donwload the file.
+  // The field content.src is the URL to download the file.
   base::DictionaryValue* entry = FindEntryByContentUrl(download_url);
   if (!entry) {
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(download_action_callback, HTTP_NOT_FOUND, base::FilePath()));
     return;
   }
 
   // Write "x"s of the file size specified in the entry.
   std::string file_size_string;
   entry->GetString("docs$size.$t", &file_size_string);
   // TODO(satorux): To be correct, we should update docs$md5Checksum.$t here.
   int64 file_size = 0;
   if (base::StringToInt64(file_size_string, &file_size)) {
     std::string content(file_size, 'x');
     DCHECK_EQ(static_cast<size_t>(file_size), content.size());
 
     if (static_cast<int>(content.size()) ==
         file_util::WriteFile(local_cache_path,
                              content.data(),
                              content.size())) {
+      if (!progress_callback.is_null()) {
+        // See also the comment in ResumeUpload(). For testing that clients
+        // can handle the case progress_callback is called multiple times,
+        // here we invoke the callback twice.
+        base::MessageLoopProxy::current()->PostTask(
+            FROM_HERE,
+            base::Bind(progress_callback, file_size / 2, file_size));
+        base::MessageLoopProxy::current()->PostTask(
+            FROM_HERE,
+            base::Bind(progress_callback, file_size, file_size));
+      }
       base::MessageLoopProxy::current()->PostTask(
           FROM_HERE,
           base::Bind(download_action_callback,
                      HTTP_SUCCESS,
                      local_cache_path));
       return;
     }
   }
 
   // Failed to write the content.
@@ skipping 776 matching lines @@
 
   ++resource_list_load_count_;
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(callback,
                  HTTP_SUCCESS,
                  base::Passed(&resource_list)));
 }
 
 }  // namespace google_apis