| Index: chrome/browser/chromeos/drive/file_system/operation_test_base.h
|
| diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
|
| index 445be1a13e71e4d8ec16a168e2d4655456f32176..e034245a54acde140c9006142186dc33a19c9c19 100644
|
| --- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h
|
| +++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
|
| @@ -57,14 +57,14 @@ class OperationTestBase : public testing::Test {
|
|
|
| // OperationDelegate overrides.
|
| virtual void OnFileChangedByOperation(
|
| - const FileChange& changed_files) OVERRIDE;
|
| + const FileChange& changed_files) override;
|
| virtual void OnEntryUpdatedByOperation(
|
| - const std::string& local_id) OVERRIDE;
|
| + const std::string& local_id) override;
|
| virtual void OnDriveSyncError(DriveSyncErrorType type,
|
| - const std::string& local_id) OVERRIDE;
|
| + const std::string& local_id) override;
|
| virtual bool WaitForSyncComplete(
|
| const std::string& local_id,
|
| - const FileOperationCallback& callback) OVERRIDE;
|
| + const FileOperationCallback& callback) override;
|
|
|
| // Gets the set of changed paths.
|
| const FileChange& get_changed_files() { return changed_files_; }
|
| @@ -97,7 +97,7 @@ class OperationTestBase : public testing::Test {
|
| virtual ~OperationTestBase();
|
|
|
| // testing::Test overrides.
|
| - virtual void SetUp() OVERRIDE;
|
| + virtual void SetUp() override;
|
|
|
| // Returns the path of the temporary directory for putting test files.
|
| base::FilePath temp_dir() const { return temp_dir_.path(); }
|
|
|