| Index: chrome/browser/chromeos/drive/mock_drive_service.h
|
| diff --git a/chrome/browser/chromeos/drive/mock_drive_service.h b/chrome/browser/chromeos/drive/mock_drive_service.h
|
| index 32b91295c183c0a8153746309b3883854fabee16..6c31feea207b4f7e11f54c4f5b4695ea9a9d0dee 100644
|
| --- a/chrome/browser/chromeos/drive/mock_drive_service.h
|
| +++ b/chrome/browser/chromeos/drive/mock_drive_service.h
|
| @@ -44,14 +44,16 @@ class MockDriveService : public DriveServiceInterface {
|
| void(const gdata::GetDataCallback& callback));
|
| MOCK_METHOD1(GetApplicationInfo,
|
| void(const gdata::GetDataCallback& callback));
|
| - MOCK_METHOD2(DeleteDocument,
|
| + MOCK_METHOD3(DeleteDocument,
|
| void(const GURL& document_url,
|
| + const std::string& etag,
|
| const gdata::EntryActionCallback& callback));
|
| - MOCK_METHOD5(DownloadDocument,
|
| + MOCK_METHOD6(DownloadDocument,
|
| void(const FilePath& virtual_path,
|
| const FilePath& local_cache_path,
|
| const GURL& content_url,
|
| DocumentExportFormat format,
|
| + const std::string& etag,
|
| const gdata::DownloadActionCallback& callback));
|
| MOCK_METHOD3(CopyDocument, void(const std::string& resource_id,
|
| const FilePath::StringType& new_name,
|
| @@ -73,10 +75,11 @@ class MockDriveService : public DriveServiceInterface {
|
| void(const GURL& parent_content_url,
|
| const FilePath::StringType& directory_name,
|
| const gdata::GetDataCallback& callback));
|
| - MOCK_METHOD5(DownloadFile,
|
| + MOCK_METHOD6(DownloadFile,
|
| void(const FilePath& virtual_path,
|
| const FilePath& local_cache_path,
|
| const GURL& content_url,
|
| + const std::string& etag,
|
| const gdata::DownloadActionCallback&
|
| donwload_action_callback,
|
| const gdata::GetContentCallback& get_content_callback));
|
| @@ -132,6 +135,7 @@ class MockDriveService : public DriveServiceInterface {
|
|
|
| // Will call |callback| with HTTP_SUCCESS and the |document_url|.
|
| void DeleteDocumentStub(const GURL& document_url,
|
| + const std::string& etag,
|
| const gdata::EntryActionCallback& callback);
|
|
|
| // Will call |callback| with HTTP_SUCCESS, the given URL, and the host+path
|
| @@ -140,6 +144,7 @@ class MockDriveService : public DriveServiceInterface {
|
| const FilePath& local_tmp_path,
|
| const GURL& content_url,
|
| DocumentExportFormat format,
|
| + const std::string& etag,
|
| const gdata::DownloadActionCallback& callback);
|
|
|
| // Will call |callback| with HTTP_SUCCESS and the current value of
|
| @@ -178,6 +183,7 @@ class MockDriveService : public DriveServiceInterface {
|
| const FilePath& virtual_path,
|
| const FilePath& local_tmp_path,
|
| const GURL& content_url,
|
| + const std::string& etag,
|
| const gdata::DownloadActionCallback& download_action_callback,
|
| const gdata::GetContentCallback& get_content_callback);
|
|
|
|
|