Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / invalidation / sync_invalidation_listener_unittest.cc

diff --git a/src/components/invalidation/sync_invalidation_listener_unittest.cc b/src/components/invalidation/sync_invalidation_listener_unittest.cc
index 141dec5..29fd0b2 100644 (file)
--- a/src/components/invalidation/sync_invalidation_listener_unittest.cc
+++ b/src/components/invalidation/sync_invalidation_listener_unittest.cc
@@ -56,7 +56,7 @@ typedef std::set<AckHandle, AckHandleLessThan> AckHandleSet;
 class FakeInvalidationClient : public invalidation::InvalidationClient {
  public:
   FakeInvalidationClient() : started_(false) {}
-  virtual ~FakeInvalidationClient() {}
+  ~FakeInvalidationClient() override {}
 
   const ObjectIdSet& GetRegisteredIds() const {
     return registered_ids_;
@@ -72,15 +72,11 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
 
   // invalidation::InvalidationClient implementation.
 
-  virtual void Start() OVERRIDE {
-    started_ = true;
-  }
+  void Start() override { started_ = true; }
 
-  virtual void Stop() OVERRIDE {
-    started_ = false;
-  }
+  void Stop() override { started_ = false; }
 
-  virtual void Register(const ObjectId& object_id) OVERRIDE {
+  void Register(const ObjectId& object_id) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -88,8 +84,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     registered_ids_.insert(object_id);
   }
 
-  virtual void Register(
-      const invalidation::vector<ObjectId>& object_ids) OVERRIDE {
+  void Register(const invalidation::vector<ObjectId>& object_ids) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -97,7 +92,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     registered_ids_.insert(object_ids.begin(), object_ids.end());
   }
 
-  virtual void Unregister(const ObjectId& object_id) OVERRIDE {
+  void Unregister(const ObjectId& object_id) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -105,8 +100,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     registered_ids_.erase(object_id);
   }
 
-  virtual void Unregister(
-      const invalidation::vector<ObjectId>& object_ids) OVERRIDE {
+  void Unregister(const invalidation::vector<ObjectId>& object_ids) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -117,7 +111,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     }
   }
 
-  virtual void Acknowledge(const AckHandle& ack_handle) OVERRIDE {
+  void Acknowledge(const AckHandle& ack_handle) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -137,7 +131,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
  public:
   explicit FakeDelegate(SyncInvalidationListener* listener)
       : state_(TRANSIENT_INVALIDATION_ERROR) {}
-  virtual ~FakeDelegate() {}
+  ~FakeDelegate() override {}
 
   size_t GetInvalidationCount(const ObjectId& id) const {
     Map::const_iterator it = invalidations_.find(id);
@@ -222,8 +216,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
   }
 
   // SyncInvalidationListener::Delegate implementation.
-  virtual void OnInvalidate(
-      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
+  void OnInvalidate(const ObjectIdInvalidationMap& invalidation_map) override {
     ObjectIdSet ids = invalidation_map.GetObjectIds();
     for (ObjectIdSet::iterator it = ids.begin(); it != ids.end(); ++it) {
       const SingleObjectInvalidationSet& incoming =
@@ -233,7 +226,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
     }
   }
 
-  virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE {
+  void OnInvalidatorStateChange(InvalidatorState state) override {
     state_ = state;
   }
 
@@ -271,7 +264,7 @@ class SyncInvalidationListenerTest : public testing::Test {
             scoped_ptr<notifier::PushClient>(fake_push_client_)))),
         fake_delegate_(&listener_) {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     StartClient();
 
     registered_ids_.insert(kBookmarksId_);
@@ -279,9 +272,7 @@ class SyncInvalidationListenerTest : public testing::Test {
     listener_.UpdateRegisteredIds(registered_ids_);
   }
 
-  virtual void TearDown() {
-    StopClient();
-  }
+  void TearDown() override { StopClient(); }
 
   // Restart client without re-registering IDs.
   void RestartClient() {
@@ -1069,7 +1060,7 @@ TEST_F(SyncInvalidationListenerTest, InvalidationClientAuthError) {
 class SyncInvalidationListenerTest_WithInitialState
     : public SyncInvalidationListenerTest {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     UnackedInvalidationSet bm_state(kBookmarksId_);
     UnackedInvalidationSet ext_state(kExtensionsId_);