Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: chrome/browser/sync/test/integration/fake_server_invalidation_service.h

Issue 1146533005: [Sync] InvalidationService shouldn't CHECK when registering ObjectId for more than one handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments from Bartosz. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 13 matching lines...) Expand all
24 24
25 // An InvalidationService that is used in conjunction with FakeServer. 25 // An InvalidationService that is used in conjunction with FakeServer.
26 class FakeServerInvalidationService : public invalidation::InvalidationService, 26 class FakeServerInvalidationService : public invalidation::InvalidationService,
27 public FakeServer::Observer { 27 public FakeServer::Observer {
28 public: 28 public:
29 FakeServerInvalidationService(); 29 FakeServerInvalidationService();
30 ~FakeServerInvalidationService() override; 30 ~FakeServerInvalidationService() override;
31 31
32 void RegisterInvalidationHandler( 32 void RegisterInvalidationHandler(
33 syncer::InvalidationHandler* handler) override; 33 syncer::InvalidationHandler* handler) override;
34 void UpdateRegisteredInvalidationIds(syncer::InvalidationHandler* handler, 34 bool UpdateRegisteredInvalidationIds(syncer::InvalidationHandler* handler,
35 const syncer::ObjectIdSet& ids) override; 35 const syncer::ObjectIdSet& ids) override;
36 void UnregisterInvalidationHandler( 36 void UnregisterInvalidationHandler(
37 syncer::InvalidationHandler* handler) override; 37 syncer::InvalidationHandler* handler) override;
38 38
39 syncer::InvalidatorState GetInvalidatorState() const override; 39 syncer::InvalidatorState GetInvalidatorState() const override;
40 std::string GetInvalidatorClientId() const override; 40 std::string GetInvalidatorClientId() const override;
41 invalidation::InvalidationLogger* GetInvalidationLogger() override; 41 invalidation::InvalidationLogger* GetInvalidationLogger() override;
42 void RequestDetailedStatus( 42 void RequestDetailedStatus(
43 base::Callback<void(const base::DictionaryValue&)> caller) const override; 43 base::Callback<void(const base::DictionaryValue&)> caller) const override;
44 IdentityProvider* GetIdentityProvider() override; 44 IdentityProvider* GetIdentityProvider() override;
(...skipping 14 matching lines...) Expand all
59 syncer::InvalidatorRegistrar invalidator_registrar_; 59 syncer::InvalidatorRegistrar invalidator_registrar_;
60 FakeProfileOAuth2TokenService token_service_; 60 FakeProfileOAuth2TokenService token_service_;
61 FakeIdentityProvider identity_provider_; 61 FakeIdentityProvider identity_provider_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(FakeServerInvalidationService); 63 DISALLOW_COPY_AND_ASSIGN(FakeServerInvalidationService);
64 }; 64 };
65 65
66 } // namespace fake_server 66 } // namespace fake_server
67 67
68 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE _H_ 68 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698