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

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

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 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
« no previous file with comments | « chrome/browser/drive/drive_uploader.h ('k') | chrome/browser/drive/dummy_drive_service.h » ('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 1f1b36f0c98c99254508628ace038927b8bd17e1..b05bfc214c4e34553dbf835cbbdbb20324841ff2 100644
--- a/chrome/browser/drive/drive_uploader_unittest.cc
+++ b/chrome/browser/drive/drive_uploader_unittest.cc
@@ -81,7 +81,7 @@ class MockDriveServiceWithUploadExpectation : public DummyDriveService {
const std::string& parent_resource_id,
const std::string& title,
const InitiateUploadNewFileOptions& options,
- const InitiateUploadCallback& callback) OVERRIDE {
+ const InitiateUploadCallback& callback) override {
EXPECT_EQ(kTestDocumentTitle, title);
EXPECT_EQ(kTestMimeType, content_type);
EXPECT_EQ(expected_content_length_, content_length);
@@ -99,7 +99,7 @@ class MockDriveServiceWithUploadExpectation : public DummyDriveService {
int64 content_length,
const std::string& resource_id,
const InitiateUploadExistingFileOptions& options,
- const InitiateUploadCallback& callback) OVERRIDE {
+ const InitiateUploadCallback& callback) override {
EXPECT_EQ(kTestMimeType, content_type);
EXPECT_EQ(expected_content_length_, content_length);
EXPECT_EQ(kTestInitiateUploadResourceId, resource_id);
@@ -126,7 +126,7 @@ class MockDriveServiceWithUploadExpectation : public DummyDriveService {
const std::string& content_type,
const base::FilePath& local_file_path,
const UploadRangeCallback& callback,
- const ProgressCallback& progress_callback) OVERRIDE {
+ const ProgressCallback& progress_callback) override {
// The upload range should start from the current first unreceived byte.
EXPECT_EQ(received_bytes_, start_position);
EXPECT_EQ(expected_upload_file_, local_file_path);
@@ -165,7 +165,7 @@ class MockDriveServiceWithUploadExpectation : public DummyDriveService {
virtual CancelCallback GetUploadStatus(
const GURL& upload_location,
int64 content_length,
- const UploadRangeCallback& callback) OVERRIDE {
+ const UploadRangeCallback& callback) override {
EXPECT_EQ(expected_content_length_, content_length);
// The upload URL returned by InitiateUpload() must be used.
EXPECT_TRUE(GURL(kTestUploadNewFileURL) == upload_location ||
@@ -213,7 +213,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
const std::string& parent_resource_id,
const std::string& title,
const InitiateUploadNewFileOptions& options,
- const InitiateUploadCallback& callback) OVERRIDE {
+ const InitiateUploadCallback& callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
return CancelCallback();
@@ -224,7 +224,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
int64 content_length,
const std::string& resource_id,
const InitiateUploadExistingFileOptions& options,
- const InitiateUploadCallback& callback) OVERRIDE {
+ const InitiateUploadCallback& callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
return CancelCallback();
@@ -239,7 +239,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
const std::string& content_type,
const base::FilePath& local_file_path,
const UploadRangeCallback& callback,
- const ProgressCallback& progress_callback) OVERRIDE {
+ const ProgressCallback& progress_callback) override {
NOTREACHED();
return CancelCallback();
}
@@ -254,7 +254,7 @@ class MockDriveServiceNoConnectionAtResume : public DummyDriveService {
const std::string& parent_resource_id,
const std::string& title,
const InitiateUploadNewFileOptions& options,
- const InitiateUploadCallback& callback) OVERRIDE {
+ const InitiateUploadCallback& callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback, HTTP_SUCCESS, GURL(kTestUploadNewFileURL)));
return CancelCallback();
@@ -265,7 +265,7 @@ class MockDriveServiceNoConnectionAtResume : public DummyDriveService {
int64 content_length,
const std::string& resource_id,
const InitiateUploadExistingFileOptions& options,
- const InitiateUploadCallback& callback) OVERRIDE {
+ const InitiateUploadCallback& callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback, HTTP_SUCCESS, GURL(kTestUploadExistingFileURL)));
return CancelCallback();
@@ -280,7 +280,7 @@ class MockDriveServiceNoConnectionAtResume : public DummyDriveService {
const std::string& content_type,
const base::FilePath& local_file_path,
const UploadRangeCallback& callback,
- const ProgressCallback& progress_callback) OVERRIDE {
+ const ProgressCallback& progress_callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback,
UploadRangeResponse(GDATA_NO_CONNECTION, -1, -1),
@@ -295,7 +295,7 @@ class MockDriveServiceNoConnectionAtGetUploadStatus : public DummyDriveService {
virtual CancelCallback GetUploadStatus(
const GURL& upload_url,
int64 content_length,
- const UploadRangeCallback& callback) OVERRIDE {
+ const UploadRangeCallback& callback) override {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback,
UploadRangeResponse(GDATA_NO_CONNECTION, -1, -1),
@@ -306,7 +306,7 @@ class MockDriveServiceNoConnectionAtGetUploadStatus : public DummyDriveService {
class DriveUploaderTest : public testing::Test {
public:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
« no previous file with comments | « chrome/browser/drive/drive_uploader.h ('k') | chrome/browser/drive/dummy_drive_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698