diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 20:08:49 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 20:08:49 +0000 |
| commit | 044f1235658e02ce8de72c8941c4e603fbd4be4e (patch) | |
| tree | 693f48b5603b0421505112b7df0be352d7997bcb /chrome/browser/sync | |
| parent | 3ecda25370679e59f6bc5a05181d9698b3d10182 (diff) | |
| download | chromium_src-044f1235658e02ce8de72c8941c4e603fbd4be4e.zip chromium_src-044f1235658e02ce8de72c8941c4e603fbd4be4e.tar.gz chromium_src-044f1235658e02ce8de72c8941c4e603fbd4be4e.tar.bz2 | |
roll cacheinvalidation to @56 (adds Start() method to InvalidationClient)
original patch from ghc@google.com ( http://codereview.chromium.org/5111003/ )
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/5143005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
3 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc b/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc index 31b7f0a..6bd1f02 100644 --- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc +++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc @@ -32,6 +32,7 @@ class MockNetworkEndpoint : public invalidation::NetworkEndpoint { class MockInvalidationClient : public invalidation::InvalidationClient { public: + MOCK_METHOD1(Start, void(const std::string& str)); MOCK_METHOD1(Register, void(const invalidation::ObjectId&)); MOCK_METHOD1(Unregister, void(const invalidation::ObjectId&)); MOCK_METHOD0(network_endpoint, invalidation::NetworkEndpoint*()); diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.cc b/chrome/browser/sync/notifier/chrome_invalidation_client.cc index 563b132..48cf3f4 100644 --- a/chrome/browser/sync/notifier/chrome_invalidation_client.cc +++ b/chrome/browser/sync/notifier/chrome_invalidation_client.cc @@ -61,8 +61,9 @@ void ChromeInvalidationClient::Start( client_config.max_ops_per_message = 40; invalidation_client_.reset( new invalidation::InvalidationClientImpl( - &chrome_system_resources_, client_type, client_id, - state, client_config, this)); + &chrome_system_resources_, client_type, client_id, client_config, + this)); + invalidation_client_->Start(state); cache_invalidation_packet_handler_.reset( new CacheInvalidationPacketHandler(base_task, invalidation_client_.get())); diff --git a/chrome/browser/sync/notifier/registration_manager_unittest.cc b/chrome/browser/sync/notifier/registration_manager_unittest.cc index 2f2e4eb..da93ac8 100644 --- a/chrome/browser/sync/notifier/registration_manager_unittest.cc +++ b/chrome/browser/sync/notifier/registration_manager_unittest.cc @@ -25,6 +25,8 @@ class FakeInvalidationClient : public invalidation::InvalidationClient { virtual ~FakeInvalidationClient() {} + virtual void Start(const std::string& state) {} + virtual void Register(const invalidation::ObjectId& oid) { registered_oids.push_back(oid); } |