| 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 a3f6e211db41bd91a2cf42dc70c1372aecb36795..a368f23e3aff8eada9aca16e10b474e2af1b6b9a 100644
|
| --- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h
|
| +++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
|
| @@ -56,16 +56,13 @@ class OperationTestBase : public testing::Test {
|
| ~LoggingDelegate();
|
|
|
| // OperationDelegate overrides.
|
| - virtual void OnFileChangedByOperation(
|
| - const FileChange& changed_files) override;
|
| - virtual void OnEntryUpdatedByOperation(
|
| - const ClientContext& context,
|
| - const std::string& local_id) override;
|
| - virtual void OnDriveSyncError(DriveSyncErrorType type,
|
| - const std::string& local_id) override;
|
| - virtual bool WaitForSyncComplete(
|
| - const std::string& local_id,
|
| - const FileOperationCallback& callback) override;
|
| + void OnFileChangedByOperation(const FileChange& changed_files) override;
|
| + void OnEntryUpdatedByOperation(const ClientContext& context,
|
| + const std::string& local_id) override;
|
| + void OnDriveSyncError(DriveSyncErrorType type,
|
| + const std::string& local_id) override;
|
| + bool WaitForSyncComplete(const std::string& local_id,
|
| + const FileOperationCallback& callback) override;
|
|
|
| // Gets the set of changed paths.
|
| const FileChange& get_changed_files() { return changed_files_; }
|
| @@ -95,10 +92,10 @@ class OperationTestBase : public testing::Test {
|
|
|
| OperationTestBase();
|
| explicit OperationTestBase(int test_thread_bundle_options);
|
| - virtual ~OperationTestBase();
|
| + ~OperationTestBase() override;
|
|
|
| // testing::Test overrides.
|
| - virtual void SetUp() override;
|
| + void SetUp() override;
|
|
|
| // Returns the path of the temporary directory for putting test files.
|
| base::FilePath temp_dir() const { return temp_dir_.path(); }
|
|
|