chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc - Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService""

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc

Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService"" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/

Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc ('k') | chrome/browser/extensions/api/push_messaging/sync_setup_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc

===================================================================

--- chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc (revision 208727)

+++ chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc (working copy)

@@ -7,7 +7,7 @@

#include "base/basictypes.h"

#include "base/memory/scoped_ptr.h"

#include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"

-#include "chrome/browser/invalidation/invalidation_service.h"

+#include "chrome/browser/invalidation/invalidation_frontend.h"

#include "google/cacheinvalidation/types.pb.h"

#include "sync/internal_api/public/base/invalidation_test_util.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -22,10 +22,10 @@

namespace {

-class MockInvalidationService : public invalidation::InvalidationService {

+class MockInvalidationFrontend : public invalidation::InvalidationFrontend {

public:

- MockInvalidationService();

- ~MockInvalidationService();

+ MockInvalidationFrontend();

+ ~MockInvalidationFrontend();

MOCK_METHOD1(RegisterInvalidationHandler,

void(syncer::InvalidationHandler*));

MOCK_METHOD2(UpdateRegisteredInvalidationIds,

@@ -35,14 +35,13 @@

MOCK_METHOD2(AcknowledgeInvalidation, void(const invalidation::ObjectId&,

const syncer::AckHandle&));

MOCK_CONST_METHOD0(GetInvalidatorState, syncer::InvalidatorState());

- MOCK_CONST_METHOD0(GetInvalidatorClientId, std::string());

private:

- DISALLOW_COPY_AND_ASSIGN(MockInvalidationService);

+ DISALLOW_COPY_AND_ASSIGN(MockInvalidationFrontend);

};

-MockInvalidationService::MockInvalidationService() {}

-MockInvalidationService::~MockInvalidationService() {}

+MockInvalidationFrontend::MockInvalidationFrontend() {}

+MockInvalidationFrontend::~MockInvalidationFrontend() {}

class MockInvalidationHandlerDelegate

: public PushMessagingInvalidationHandlerDelegate {

@@ -75,7 +74,7 @@

EXPECT_CALL(service_, UnregisterInvalidationHandler(handler_.get()));

handler_.reset();

}

- StrictMock<MockInvalidationService> service_;

+ StrictMock<MockInvalidationFrontend> service_;

StrictMock<MockInvalidationHandlerDelegate> delegate_;

scoped_ptr<PushMessagingInvalidationHandler> handler_;

};