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

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

Issue 11143014: Add request header on gdata operation for testing ETag match. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: +comment Created 8 years, 2 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
Index: chrome/browser/chromeos/drive/drive_file_system_unittest.cc
diff --git a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
index 415379784f156c7bde13aaf7d95c862ee6625304..fe0b2cad04885a6b1a668162d03b6735e99a0249 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
@@ -269,7 +269,8 @@ class DriveFileSystemTest : public testing::Test {
bool RemoveEntry(const FilePath& file_path) {
DriveFileError error;
- EXPECT_CALL(*mock_drive_service_, DeleteDocument(_, _)).Times(AnyNumber());
+ EXPECT_CALL(*mock_drive_service_,
+ DeleteDocument(_, _, _)).Times(AnyNumber());
file_system_->Remove(
file_path, false,
base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
@@ -1329,7 +1330,7 @@ TEST_F(DriveFileSystemTest, TransferFileFromRemoteToLocal_RegularFile) {
DownloadFile(remote_src_file_path,
cache_file,
GURL("https://file_content_url_changed/"),
- _, _))
+ _, _, _))
.Times(1);
file_system_->TransferFileFromRemoteToLocal(
@@ -1947,7 +1948,7 @@ TEST_F(DriveFileSystemTest, GetFileByPath_FromGData_EnoughSpace) {
DownloadFile(file_in_root,
downloaded_file,
GURL("https://file_content_url_changed/"),
- _, _))
+ _, _, _))
.Times(1);
file_system_->GetFileByPath(file_in_root, callback,
@@ -1988,7 +1989,7 @@ TEST_F(DriveFileSystemTest, GetFileByPath_FromGData_NoSpaceAtAll) {
DownloadFile(file_in_root,
downloaded_file,
GURL("https://file_content_url_changed/"),
- _, _))
+ _, _, _))
.Times(0);
file_system_->GetFileByPath(file_in_root, callback,
@@ -2044,7 +2045,7 @@ TEST_F(DriveFileSystemTest, GetFileByPath_FromGData_NoEnoughSpaceButCanFreeUp) {
DownloadFile(file_in_root,
downloaded_file,
GURL("https://file_content_url_changed/"),
- _, _))
+ _, _, _))
.Times(1);
file_system_->GetFileByPath(file_in_root, callback,
@@ -2096,7 +2097,7 @@ TEST_F(DriveFileSystemTest, GetFileByPath_FromGData_EnoughSpaceButBecomeFull) {
DownloadFile(file_in_root,
downloaded_file,
GURL("https://file_content_url_changed/"),
- _, _))
+ _, _, _))
.Times(1);
file_system_->GetFileByPath(file_in_root, callback,
@@ -2139,7 +2140,7 @@ TEST_F(DriveFileSystemTest, GetFileByPath_FromCache) {
DownloadFile(file_in_root,
downloaded_file,
GURL("https://file_content_url_changed/"),
- _, _))
+ _, _, _))
.Times(0);
file_system_->GetFileByPath(file_in_root, callback,
@@ -2203,7 +2204,7 @@ TEST_F(DriveFileSystemTest, GetFileByResourceId) {
DownloadFile(file_in_root,
downloaded_file,
GURL("https://file_content_url_changed/"),
- _, _))
+ _, _, _))
.Times(1);
file_system_->GetFileByResourceId(entry_proto->resource_id(),
@@ -2242,7 +2243,7 @@ TEST_F(DriveFileSystemTest, GetFileByResourceId_FromCache) {
// The file is obtained from the cache.
// Make sure we don't call downloads at all.
- EXPECT_CALL(*mock_drive_service_, DownloadFile(_, _, _, _, _))
+ EXPECT_CALL(*mock_drive_service_, DownloadFile(_, _, _, _, _, _))
.Times(0);
file_system_->GetFileByResourceId(entry_proto->resource_id(),
@@ -2561,7 +2562,7 @@ TEST_F(DriveFileSystemTest, OpenAndCloseFile) {
DownloadFile(kFileInRoot,
downloaded_file,
GURL("https://file_content_url_changed/"),
- _, _))
+ _, _, _))
.Times(1);
// Open kFileInRoot ("drive/File 1.txt").

Powered by Google App Engine
This is Rietveld 408576698