diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 22:19:56 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 22:19:56 +0000 |
commit | 6d44a14e97a406f13598e7dcee08e978d36deaeb (patch) | |
tree | 508350a65fe750bf122775c096bc4747bfdebf67 /sync | |
parent | 393a331ee18d32236436805a3a41d786d39b1204 (diff) | |
download | chromium_src-6d44a14e97a406f13598e7dcee08e978d36deaeb.zip chromium_src-6d44a14e97a406f13598e7dcee08e978d36deaeb.tar.gz chromium_src-6d44a14e97a406f13598e7dcee08e978d36deaeb.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, sync/ edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
Review URL: https://chromiumcodereview.appspot.com/12209033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-rw-r--r-- | sync/engine/sync_scheduler_unittest.cc | 4 | ||||
-rw-r--r-- | sync/internal_api/http_bridge_unittest.cc | 4 | ||||
-rw-r--r-- | sync/notifier/non_blocking_invalidator.cc | 2 | ||||
-rw-r--r-- | sync/notifier/registration_manager_unittest.cc | 18 | ||||
-rw-r--r-- | sync/notifier/sync_invalidation_listener_unittest.cc | 2 | ||||
-rw-r--r-- | sync/sessions/sync_session_unittest.cc | 2 | ||||
-rw-r--r-- | sync/syncable/syncable_unittest.cc | 2 |
7 files changed, 18 insertions, 16 deletions
diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index b5b676c..4f7783a 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -876,14 +876,14 @@ TEST_F(SyncSchedulerTest, ConfigurationMode) { } class BackoffTriggersSyncSchedulerTest : public SyncSchedulerTest { - void SetUp() { + virtual void SetUp() { SyncSchedulerTest::SetUp(); UseMockDelayProvider(); EXPECT_CALL(*delay(), GetDelay(_)) .WillRepeatedly(Return(TimeDelta::FromMilliseconds(1))); } - void TearDown() { + virtual void TearDown() { StopSyncScheduler(); SyncSchedulerTest::TearDown(); } diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc index 71b4f41..a2ff680 100644 --- a/sync/internal_api/http_bridge_unittest.cc +++ b/sync/internal_api/http_bridge_unittest.cc @@ -123,7 +123,7 @@ class ShuntedHttpBridge : public HttpBridge { baseline_context_getter, "user agent")), test_(test), never_finishes_(never_finishes) { } protected: - virtual void MakeAsynchronousPost() { + virtual void MakeAsynchronousPost() OVERRIDE { ASSERT_TRUE(MessageLoop::current() == test_->GetIOThreadLoop()); if (never_finishes_) return; @@ -134,7 +134,7 @@ class ShuntedHttpBridge : public HttpBridge { base::Bind(&ShuntedHttpBridge::CallOnURLFetchComplete, this)); } private: - ~ShuntedHttpBridge() {} + virtual ~ShuntedHttpBridge() {} void CallOnURLFetchComplete() { ASSERT_TRUE(MessageLoop::current() == test_->GetIOThreadLoop()); diff --git a/sync/notifier/non_blocking_invalidator.cc b/sync/notifier/non_blocking_invalidator.cc index b197e72..a306aa3 100644 --- a/sync/notifier/non_blocking_invalidator.cc +++ b/sync/notifier/non_blocking_invalidator.cc @@ -49,7 +49,7 @@ class NonBlockingInvalidator::Core friend class base::RefCountedThreadSafe<NonBlockingInvalidator::Core>; // Called on parent or I/O thread. - ~Core(); + virtual ~Core(); // The variables below should be used only on the I/O thread. const WeakHandle<InvalidationHandler> delegate_observer_; diff --git a/sync/notifier/registration_manager_unittest.cc b/sync/notifier/registration_manager_unittest.cc index 1700000..edca2ad 100644 --- a/sync/notifier/registration_manager_unittest.cc +++ b/sync/notifier/registration_manager_unittest.cc @@ -35,7 +35,7 @@ class FakeRegistrationManager : public RegistrationManager { } protected: - virtual double GetJitter() { + virtual double GetJitter() OVERRIDE { return jitter_; } @@ -64,25 +64,27 @@ class FakeInvalidationClient : public invalidation::InvalidationClient { // invalidation::InvalidationClient implementation. - virtual void Start() {} - virtual void Stop() {} - virtual void Acknowledge(const invalidation::AckHandle& handle) {} + virtual void Start() OVERRIDE {} + virtual void Stop() OVERRIDE {} + virtual void Acknowledge(const invalidation::AckHandle& handle) OVERRIDE {} - virtual void Register(const invalidation::ObjectId& oid) { + virtual void Register(const invalidation::ObjectId& oid) OVERRIDE { EXPECT_FALSE(ContainsKey(registered_ids_, oid)); registered_ids_.insert(oid); } - virtual void Register(const std::vector<invalidation::ObjectId>& oids) { + virtual void Register( + const std::vector<invalidation::ObjectId>& oids) OVERRIDE { // Unused for now. } - virtual void Unregister(const invalidation::ObjectId& oid) { + virtual void Unregister(const invalidation::ObjectId& oid) OVERRIDE { EXPECT_TRUE(ContainsKey(registered_ids_, oid)); registered_ids_.erase(oid); } - virtual void Unregister(const std::vector<invalidation::ObjectId>& oids) { + virtual void Unregister( + const std::vector<invalidation::ObjectId>& oids) OVERRIDE { // Unused for now. } diff --git a/sync/notifier/sync_invalidation_listener_unittest.cc b/sync/notifier/sync_invalidation_listener_unittest.cc index 37016a8..41fc86d 100644 --- a/sync/notifier/sync_invalidation_listener_unittest.cc +++ b/sync/notifier/sync_invalidation_listener_unittest.cc @@ -159,7 +159,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate { } } - virtual void OnInvalidatorStateChange(InvalidatorState state) { + virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE { state_ = state; } diff --git a/sync/sessions/sync_session_unittest.cc b/sync/sessions/sync_session_unittest.cc index 6a32754..8044113 100644 --- a/sync/sessions/sync_session_unittest.cc +++ b/sync/sessions/sync_session_unittest.cc @@ -101,7 +101,7 @@ class SyncSessionTest : public testing::Test, FailControllerInvocationIfDisabled("OnShouldStopSyncingPermanently"); } virtual void OnSyncProtocolError( - const sessions::SyncSessionSnapshot& snapshot) { + const sessions::SyncSessionSnapshot& snapshot) OVERRIDE { FailControllerInvocationIfDisabled("SyncProtocolError"); } diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc index 7eb0adc..19023c4 100644 --- a/sync/syncable/syncable_unittest.cc +++ b/sync/syncable/syncable_unittest.cc @@ -2103,7 +2103,7 @@ class StressTransactionsDelegate : public base::PlatformThread::Delegate { const int thread_number_; // PlatformThread::Delegate methods: - virtual void ThreadMain() { + virtual void ThreadMain() OVERRIDE { int entry_count = 0; std::string path_name; |