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

Side by Side Diff: chrome/browser/invalidation/ticl_invalidation_service_unittest.cc

Issue 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing CR for patch 12 and one more Android issue Created 7 years, 3 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/invalidation/ticl_invalidation_service.h" 5 #include "chrome/browser/invalidation/ticl_invalidation_service.h"
6 6
7 #include "chrome/browser/invalidation/invalidation_service_factory.h" 7 #include "chrome/browser/invalidation/invalidation_service_factory.h"
8 #include "chrome/browser/invalidation/invalidation_service_test_template.h" 8 #include "chrome/browser/invalidation/invalidation_service_test_template.h"
9 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
9 #include "chrome/test/base/testing_profile.h" 10 #include "chrome/test/base/testing_profile.h"
10 #include "sync/notifier/fake_invalidation_handler.h" 11 #include "sync/notifier/fake_invalidation_handler.h"
11 #include "sync/notifier/fake_invalidator.h" 12 #include "sync/notifier/fake_invalidator.h"
12 #include "sync/notifier/invalidation_util.h" 13 #include "sync/notifier/invalidation_util.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 15
15 namespace invalidation { 16 namespace invalidation {
16 17
17 class TiclInvalidationServiceTestDelegate { 18 class TiclInvalidationServiceTestDelegate {
18 public: 19 public:
19 TiclInvalidationServiceTestDelegate() { } 20 TiclInvalidationServiceTestDelegate() { }
20 21
21 ~TiclInvalidationServiceTestDelegate() { 22 ~TiclInvalidationServiceTestDelegate() {
22 DestroyInvalidationService(); 23 DestroyInvalidationService();
23 } 24 }
24 25
25 void CreateInvalidationService() { 26 void CreateInvalidationService() {
26 fake_invalidator_ = new syncer::FakeInvalidator(); 27 fake_invalidator_ = new syncer::FakeInvalidator();
27 profile_.reset(new TestingProfile()); 28 profile_.reset(new TestingProfile());
28 invalidation_service_.reset( 29 invalidation_service_.reset(
29 new TiclInvalidationService(NULL, NULL, NULL, profile_.get())); 30 new TiclInvalidationService(NULL,
31 new FakeProfileOAuth2TokenService(),
32 profile_.get()));
30 invalidation_service_->InitForTest(fake_invalidator_); 33 invalidation_service_->InitForTest(fake_invalidator_);
31 } 34 }
32 35
33 InvalidationService* GetInvalidationService() { 36 InvalidationService* GetInvalidationService() {
34 return invalidation_service_.get(); 37 return invalidation_service_.get();
35 } 38 }
36 39
37 void DestroyInvalidationService() { 40 void DestroyInvalidationService() {
38 invalidation_service_->Shutdown(); 41 invalidation_service_->Shutdown();
39 } 42 }
(...skipping 10 matching lines...) Expand all
50 syncer::FakeInvalidator* fake_invalidator_; // owned by the service. 53 syncer::FakeInvalidator* fake_invalidator_; // owned by the service.
51 scoped_ptr<TiclInvalidationService> invalidation_service_; 54 scoped_ptr<TiclInvalidationService> invalidation_service_;
52 scoped_ptr<TestingProfile> profile_; 55 scoped_ptr<TestingProfile> profile_;
53 }; 56 };
54 57
55 INSTANTIATE_TYPED_TEST_CASE_P( 58 INSTANTIATE_TYPED_TEST_CASE_P(
56 TiclInvalidationServiceTest, InvalidationServiceTest, 59 TiclInvalidationServiceTest, InvalidationServiceTest,
57 TiclInvalidationServiceTestDelegate); 60 TiclInvalidationServiceTestDelegate);
58 61
59 } // namespace invalidation 62 } // namespace invalidation
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698