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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/drive/drive_uploader_unittest.cc

Issue 17948002: Update Linux to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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
« no previous file with comments | « chrome/browser/drive/drive_uploader.cc ('k') | chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/drive/drive_uploader_unittest.cc
diff --git a/chrome/browser/drive/drive_uploader_unittest.cc b/chrome/browser/drive/drive_uploader_unittest.cc
index d01d20f99282531ca2ea73e889d67db77b67bca1..1cb4b8310c83cbc49cbccc4ece85b38d7e84802b 100644
--- a/chrome/browser/drive/drive_uploader_unittest.cc
+++ b/chrome/browser/drive/drive_uploader_unittest.cc
@@ -314,7 +314,8 @@ TEST_F(DriveUploaderTest, UploadExisting0KB) {
scoped_ptr<ResourceEntry> resource_entry;
MockDriveServiceWithUploadExpectation mock_service(local_path, data.size());
- DriveUploader uploader(&mock_service, base::MessageLoopProxy::current());
+ DriveUploader uploader(&mock_service,
+ base::MessageLoopProxy::current().get());
std::vector<test_util::ProgressInfo> upload_progress_values;
uploader.UploadExistingFile(
kTestInitiateUploadResourceId,
@@ -348,7 +349,8 @@ TEST_F(DriveUploaderTest, UploadExisting512KB) {
scoped_ptr<ResourceEntry> resource_entry;
MockDriveServiceWithUploadExpectation mock_service(local_path, data.size());
- DriveUploader uploader(&mock_service, base::MessageLoopProxy::current());
+ DriveUploader uploader(&mock_service,
+ base::MessageLoopProxy::current().get());
std::vector<test_util::ProgressInfo> upload_progress_values;
uploader.UploadExistingFile(
kTestInitiateUploadResourceId,
@@ -384,15 +386,15 @@ TEST_F(DriveUploaderTest, InitiateUploadFail) {
scoped_ptr<ResourceEntry> resource_entry;
MockDriveServiceNoConnectionAtInitiate mock_service;
- DriveUploader uploader(&mock_service, base::MessageLoopProxy::current());
- uploader.UploadExistingFile(
- kTestInitiateUploadResourceId,
- local_path,
- kTestMimeType,
- std::string(), // etag
- test_util::CreateCopyResultCallback(
- &error, &upload_location, &resource_entry),
- google_apis::ProgressCallback());
+ DriveUploader uploader(&mock_service,
+ base::MessageLoopProxy::current().get());
+ uploader.UploadExistingFile(kTestInitiateUploadResourceId,
+ local_path,
+ kTestMimeType,
+ std::string(), // etag
+ test_util::CreateCopyResultCallback(
+ &error, &upload_location, &resource_entry),
+ google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
EXPECT_EQ(GDATA_NO_CONNECTION, error);
@@ -411,15 +413,15 @@ TEST_F(DriveUploaderTest, InitiateUploadNoConflict) {
scoped_ptr<ResourceEntry> resource_entry;
MockDriveServiceWithUploadExpectation mock_service(local_path, data.size());
- DriveUploader uploader(&mock_service, base::MessageLoopProxy::current());
- uploader.UploadExistingFile(
- kTestInitiateUploadResourceId,
- local_path,
- kTestMimeType,
- kTestETag,
- test_util::CreateCopyResultCallback(
- &error, &upload_location, &resource_entry),
- google_apis::ProgressCallback());
+ DriveUploader uploader(&mock_service,
+ base::MessageLoopProxy::current().get());
+ uploader.UploadExistingFile(kTestInitiateUploadResourceId,
+ local_path,
+ kTestMimeType,
+ kTestETag,
+ test_util::CreateCopyResultCallback(
+ &error, &upload_location, &resource_entry),
+ google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
EXPECT_EQ(HTTP_SUCCESS, error);
@@ -438,15 +440,15 @@ TEST_F(DriveUploaderTest, InitiateUploadConflict) {
scoped_ptr<ResourceEntry> resource_entry;
MockDriveServiceWithUploadExpectation mock_service(local_path, data.size());
- DriveUploader uploader(&mock_service, base::MessageLoopProxy::current());
- uploader.UploadExistingFile(
- kTestInitiateUploadResourceId,
- local_path,
- kTestMimeType,
- kDestinationETag,
- test_util::CreateCopyResultCallback(
- &error, &upload_location, &resource_entry),
- google_apis::ProgressCallback());
+ DriveUploader uploader(&mock_service,
+ base::MessageLoopProxy::current().get());
+ uploader.UploadExistingFile(kTestInitiateUploadResourceId,
+ local_path,
+ kTestMimeType,
+ kDestinationETag,
+ test_util::CreateCopyResultCallback(
+ &error, &upload_location, &resource_entry),
+ google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
EXPECT_EQ(HTTP_CONFLICT, error);
@@ -464,15 +466,15 @@ TEST_F(DriveUploaderTest, ResumeUploadFail) {
scoped_ptr<ResourceEntry> resource_entry;
MockDriveServiceNoConnectionAtResume mock_service;
- DriveUploader uploader(&mock_service, base::MessageLoopProxy::current());
- uploader.UploadExistingFile(
- kTestInitiateUploadResourceId,
- local_path,
- kTestMimeType,
- std::string(), // etag
- test_util::CreateCopyResultCallback(
- &error, &upload_location, &resource_entry),
- google_apis::ProgressCallback());
+ DriveUploader uploader(&mock_service,
+ base::MessageLoopProxy::current().get());
+ uploader.UploadExistingFile(kTestInitiateUploadResourceId,
+ local_path,
+ kTestMimeType,
+ std::string(), // etag
+ test_util::CreateCopyResultCallback(
+ &error, &upload_location, &resource_entry),
+ google_apis::ProgressCallback());
base::RunLoop().RunUntilIdle();
EXPECT_EQ(GDATA_NO_CONNECTION, error);
@@ -485,12 +487,12 @@ TEST_F(DriveUploaderTest, NonExistingSourceFile) {
scoped_ptr<ResourceEntry> resource_entry;
DriveUploader uploader(NULL, // NULL, the service won't be used.
- base::MessageLoopProxy::current());
+ base::MessageLoopProxy::current().get());
uploader.UploadExistingFile(
kTestInitiateUploadResourceId,
temp_dir_.path().AppendASCII("_this_path_should_not_exist_"),
kTestMimeType,
- std::string(), // etag
+ std::string(), // etag
test_util::CreateCopyResultCallback(
&error, &upload_location, &resource_entry),
google_apis::ProgressCallback());
@@ -512,7 +514,8 @@ TEST_F(DriveUploaderTest, ResumeUpload) {
scoped_ptr<ResourceEntry> resource_entry;
MockDriveServiceWithUploadExpectation mock_service(local_path, data.size());
- DriveUploader uploader(&mock_service, base::MessageLoopProxy::current());
+ DriveUploader uploader(&mock_service,
+ base::MessageLoopProxy::current().get());
// Emulate the situation that the only first part is successfully uploaded,
// but not the latter half.
mock_service.set_received_bytes(512 * 1024);
« no previous file with comments | « chrome/browser/drive/drive_uploader.cc ('k') | chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698