diff options
4 files changed, 7 insertions, 3 deletions
@@ -52,7 +52,7 @@ deps = { (Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@106", "src/third_party/cacheinvalidation/files": - (Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@51", + (Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@56", "src/tools/gyp": (Var("googlecode_url") % "gyp") + "/trunk@856", 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); } |