chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc - Issue 10855034: Drive: Remove gdata_params.h

Unified Diff: chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

Issue 10855034: Drive: Remove gdata_params.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review (#16) fix & rebase Created 8 years, 4 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

Index: chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

diff --git a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

index ada502e64974a07f37bf830803121ad41f572ee6..9f029c5cb600bc7c770cc32636619d5ddd3c395d 100644

--- a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

+++ b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc

@@ -1982,7 +1982,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromGData_EnoughSpace) {

.Times(1);

file_system_->GetFileByPath(file_in_root, callback,

- GetDownloadDataCallback());

+ GetContentCallback());

test_util::RunBlockingPoolTask();

EXPECT_EQ(GDATA_FILE_OK, callback_helper_->last_error_);

@@ -2023,7 +2023,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromGData_NoSpaceAtAll) {

.Times(0);

file_system_->GetFileByPath(file_in_root, callback,

- GetDownloadDataCallback());

+ GetContentCallback());

test_util::RunBlockingPoolTask();

EXPECT_EQ(GDATA_FILE_ERROR_NO_SPACE,

@@ -2077,7 +2077,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromGData_NoEnoughSpaceButCanFreeUp) {

.Times(1);

file_system_->GetFileByPath(file_in_root, callback,

- GetDownloadDataCallback());

+ GetContentCallback());

test_util::RunBlockingPoolTask();

EXPECT_EQ(GDATA_FILE_OK, callback_helper_->last_error_);

@@ -2128,7 +2128,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromGData_EnoughSpaceButBecomeFull) {

.Times(1);

file_system_->GetFileByPath(file_in_root, callback,

- GetDownloadDataCallback());

+ GetContentCallback());

test_util::RunBlockingPoolTask();

EXPECT_EQ(GDATA_FILE_ERROR_NO_SPACE,

@@ -2168,7 +2168,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_FromCache) {

.Times(0);

file_system_->GetFileByPath(file_in_root, callback,

- GetDownloadDataCallback());

+ GetContentCallback());

test_util::RunBlockingPoolTask();

EXPECT_EQ(REGULAR_FILE, callback_helper_->file_type_);

@@ -2189,7 +2189,7 @@ TEST_F(GDataFileSystemTest, GetFileByPath_HostedDocument) {

ASSERT_TRUE(src_entry_proto.get());

file_system_->GetFileByPath(file_in_root, callback,

- GetDownloadDataCallback());

+ GetContentCallback());

test_util::RunBlockingPoolTask();

EXPECT_EQ(HOSTED_DOCUMENT, callback_helper_->file_type_);

@@ -2232,7 +2232,7 @@ TEST_F(GDataFileSystemTest, GetFileByResourceId) {

file_system_->GetFileByResourceId(entry_proto->resource_id(),

callback,

- GetDownloadDataCallback());

+ GetContentCallback());

test_util::RunBlockingPoolTask();

EXPECT_EQ(REGULAR_FILE, callback_helper_->file_type_);

@@ -2268,7 +2268,7 @@ TEST_F(GDataFileSystemTest, GetFileByResourceId_FromCache) {

file_system_->GetFileByResourceId(entry_proto->resource_id(),

callback,

- GetDownloadDataCallback());

+ GetContentCallback());

test_util::RunBlockingPoolTask();

EXPECT_EQ(REGULAR_FILE, callback_helper_->file_type_);

« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc ('k') | chrome/browser/chromeos/gdata/gdata_files.h » ('j') | no next file with comments »