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

Side by Side Diff: chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc

Issue 179843002: Make invalidations work for Chrome OS Kiosk Apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error leading to uninitialized memory access. Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_handler.h" 5 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_handler.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_handler_delegate.h" 9 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_handler_delegate.h"
10 #include "chrome/browser/invalidation/invalidation_logger.h" 10 #include "chrome/browser/invalidation/invalidation_logger.h"
11 #include "chrome/browser/invalidation/invalidation_service.h" 11 #include "chrome/browser/invalidation/invalidation_service.h"
12 #include "google/cacheinvalidation/types.pb.h" 12 #include "google/cacheinvalidation/types.pb.h"
13 #include "sync/notifier/object_id_invalidation_map.h" 13 #include "sync/notifier/object_id_invalidation_map.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using ::testing::_;
18 using ::testing::NotNull; 17 using ::testing::NotNull;
19 using ::testing::SaveArg; 18 using ::testing::SaveArg;
20 using ::testing::StrictMock; 19 using ::testing::StrictMock;
20 using ::testing::_;
21 21
22 namespace extensions { 22 namespace extensions {
23 23
24 namespace { 24 namespace {
25 25
26 class MockInvalidationService : public invalidation::InvalidationService { 26 class MockInvalidationService : public invalidation::InvalidationService {
27 public: 27 public:
28 MockInvalidationService(); 28 MockInvalidationService();
29 ~MockInvalidationService(); 29 ~MockInvalidationService();
30 MOCK_METHOD1(RegisterInvalidationHandler, 30 MOCK_METHOD1(RegisterInvalidationHandler,
31 void(syncer::InvalidationHandler*)); 31 void(syncer::InvalidationHandler*));
32 MOCK_METHOD2(UpdateRegisteredInvalidationIds, 32 MOCK_METHOD2(UpdateRegisteredInvalidationIds,
33 void(syncer::InvalidationHandler*, const syncer::ObjectIdSet&)); 33 void(syncer::InvalidationHandler*, const syncer::ObjectIdSet&));
34 MOCK_METHOD1(UnregisterInvalidationHandler, 34 MOCK_METHOD1(UnregisterInvalidationHandler,
35 void(syncer::InvalidationHandler*)); 35 void(syncer::InvalidationHandler*));
36 MOCK_CONST_METHOD0(GetInvalidatorState, syncer::InvalidatorState()); 36 MOCK_CONST_METHOD0(GetInvalidatorState, syncer::InvalidatorState());
37 MOCK_CONST_METHOD0(GetInvalidatorClientId, std::string()); 37 MOCK_CONST_METHOD0(GetInvalidatorClientId, std::string());
38 MOCK_METHOD0(GetInvalidationLogger, invalidation::InvalidationLogger*()); 38 MOCK_METHOD0(GetInvalidationLogger, invalidation::InvalidationLogger*());
39 MOCK_METHOD1(RequestDetailedStatus, 39 MOCK_METHOD1(RequestDetailedStatus,
40 void(base::Callback<void(const base::DictionaryValue&)>)); 40 void(base::Callback<void(const base::DictionaryValue&)>));
41 MOCK_METHOD0(GetInvalidationAuthProvider,
42 invalidation::InvalidationAuthProvider*());
41 43
42 private: 44 private:
43 DISALLOW_COPY_AND_ASSIGN(MockInvalidationService); 45 DISALLOW_COPY_AND_ASSIGN(MockInvalidationService);
44 }; 46 };
45 47
46 MockInvalidationService::MockInvalidationService() {} 48 MockInvalidationService::MockInvalidationService() {}
47 MockInvalidationService::~MockInvalidationService() {} 49 MockInvalidationService::~MockInvalidationService() {}
48 50
49 class MockInvalidationHandlerDelegate 51 class MockInvalidationHandlerDelegate
50 : public PushMessagingInvalidationHandlerDelegate { 52 : public PushMessagingInvalidationHandlerDelegate {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 204
203 // An unrelated object should be unaffected by all the above. 205 // An unrelated object should be unaffected by all the above.
204 syncer::ObjectIdInvalidationMap map5; 206 syncer::ObjectIdInvalidationMap map5;
205 map5.Insert(syncer::Invalidation::Init(id3, 1, "1")); 207 map5.Insert(syncer::Invalidation::Init(id3, 1, "1"));
206 EXPECT_CALL(delegate_, OnMessage("dddddddddddddddddddddddddddddddd", 3, "1")); 208 EXPECT_CALL(delegate_, OnMessage("dddddddddddddddddddddddddddddddd", 3, "1"));
207 handler_->OnIncomingInvalidation(map5); 209 handler_->OnIncomingInvalidation(map5);
208 testing::Mock::VerifyAndClearExpectations(&delegate_); 210 testing::Mock::VerifyAndClearExpectations(&delegate_);
209 } 211 }
210 212
211 } // namespace extensions 213 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698