| Index: sync/internal_api/sync_manager_impl_unittest.cc
|
| diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
|
| index a2829a40998e012a0975463a8abd8b112b1e4b3a..0f58bb93ecea86c94bc9f28c0975f6fce7727d12 100644
|
| --- a/sync/internal_api/sync_manager_impl_unittest.cc
|
| +++ b/sync/internal_api/sync_manager_impl_unittest.cc
|
| @@ -691,38 +691,33 @@ namespace {
|
|
|
| class TestHttpPostProviderInterface : public HttpPostProviderInterface {
|
| public:
|
| - virtual ~TestHttpPostProviderInterface() {}
|
| -
|
| - virtual void SetExtraRequestHeaders(const char* headers) override {}
|
| - virtual void SetURL(const char* url, int port) override {}
|
| - virtual void SetPostPayload(const char* content_type,
|
| - int content_length,
|
| - const char* content) override {}
|
| - virtual bool MakeSynchronousPost(int* error_code, int* response_code)
|
| - override {
|
| + ~TestHttpPostProviderInterface() override {}
|
| +
|
| + void SetExtraRequestHeaders(const char* headers) override {}
|
| + void SetURL(const char* url, int port) override {}
|
| + void SetPostPayload(const char* content_type,
|
| + int content_length,
|
| + const char* content) override {}
|
| + bool MakeSynchronousPost(int* error_code, int* response_code) override {
|
| return false;
|
| }
|
| - virtual int GetResponseContentLength() const override {
|
| - return 0;
|
| - }
|
| - virtual const char* GetResponseContent() const override {
|
| - return "";
|
| - }
|
| - virtual const std::string GetResponseHeaderValue(
|
| + int GetResponseContentLength() const override { return 0; }
|
| + const char* GetResponseContent() const override { return ""; }
|
| + const std::string GetResponseHeaderValue(
|
| const std::string& name) const override {
|
| return std::string();
|
| }
|
| - virtual void Abort() override {}
|
| + void Abort() override {}
|
| };
|
|
|
| class TestHttpPostProviderFactory : public HttpPostProviderFactory {
|
| public:
|
| - virtual ~TestHttpPostProviderFactory() {}
|
| - virtual void Init(const std::string& user_agent) override { }
|
| - virtual HttpPostProviderInterface* Create() override {
|
| + ~TestHttpPostProviderFactory() override {}
|
| + void Init(const std::string& user_agent) override {}
|
| + HttpPostProviderInterface* Create() override {
|
| return new TestHttpPostProviderInterface();
|
| }
|
| - virtual void Destroy(HttpPostProviderInterface* http) override {
|
| + void Destroy(HttpPostProviderInterface* http) override {
|
| delete static_cast<TestHttpPostProviderInterface*>(http);
|
| }
|
| };
|
| @@ -2406,9 +2401,9 @@ class ComponentsFactory : public TestInternalComponentsFactory {
|
| switches, InternalComponentsFactory::STORAGE_IN_MEMORY, storage_used),
|
| scheduler_to_use_(scheduler_to_use),
|
| session_context_(session_context) {}
|
| - virtual ~ComponentsFactory() {}
|
| + ~ComponentsFactory() override {}
|
|
|
| - virtual scoped_ptr<SyncScheduler> BuildScheduler(
|
| + scoped_ptr<SyncScheduler> BuildScheduler(
|
| const std::string& name,
|
| sessions::SyncSessionContext* context,
|
| CancelationSignal* stop_handle) override {
|
| @@ -2424,7 +2419,7 @@ class ComponentsFactory : public TestInternalComponentsFactory {
|
| class SyncManagerTestWithMockScheduler : public SyncManagerTest {
|
| public:
|
| SyncManagerTestWithMockScheduler() : scheduler_(NULL) {}
|
| - virtual InternalComponentsFactory* GetFactory() override {
|
| + InternalComponentsFactory* GetFactory() override {
|
| scheduler_ = new MockSyncScheduler();
|
| return new ComponentsFactory(GetSwitches(), scheduler_, &session_context_,
|
| &storage_used_);
|
| @@ -2811,15 +2806,14 @@ TEST_F(SyncManagerTest, PurgeUnappliedTypes) {
|
| // ChangeProcessor.
|
| class SyncManagerChangeProcessingTest : public SyncManagerTest {
|
| public:
|
| - virtual void OnChangesApplied(
|
| - ModelType model_type,
|
| - int64 model_version,
|
| - const BaseTransaction* trans,
|
| - const ImmutableChangeRecordList& changes) override {
|
| + void OnChangesApplied(ModelType model_type,
|
| + int64 model_version,
|
| + const BaseTransaction* trans,
|
| + const ImmutableChangeRecordList& changes) override {
|
| last_changes_ = changes;
|
| }
|
|
|
| - virtual void OnChangesComplete(ModelType model_type) override {}
|
| + void OnChangesComplete(ModelType model_type) override {}
|
|
|
| const ImmutableChangeRecordList& GetRecentChangeList() {
|
| return last_changes_;
|
| @@ -3170,7 +3164,7 @@ class SyncManagerInitInvalidStorageTest : public SyncManagerTest {
|
| SyncManagerInitInvalidStorageTest() {
|
| }
|
|
|
| - virtual InternalComponentsFactory* GetFactory() override {
|
| + InternalComponentsFactory* GetFactory() override {
|
| return new TestInternalComponentsFactory(
|
| GetSwitches(), InternalComponentsFactory::STORAGE_INVALID,
|
| &storage_used_);
|
|
|