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

Unified Diff: chrome/browser/invalidation/ticl_invalidation_service_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
diff --git a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
index 64379ece0c2367f196cd4e054b7711692a305131..f86dc5a4f8e49cdef65f91937bf42a353ad0ad61 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
@@ -6,7 +6,10 @@
#include "chrome/browser/invalidation/invalidation_service_factory.h"
#include "chrome/browser/invalidation/invalidation_service_test_template.h"
+#include "chrome/browser/invalidation/profile_invalidation_auth_provider.h"
#include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
+#include "chrome/browser/signin/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/test/base/testing_profile.h"
#include "sync/notifier/fake_invalidation_handler.h"
#include "sync/notifier/fake_invalidator.h"
@@ -27,10 +30,13 @@ class TiclInvalidationServiceTestDelegate {
fake_invalidator_ = new syncer::FakeInvalidator();
profile_.reset(new TestingProfile());
token_service_.reset(new FakeProfileOAuth2TokenService);
- invalidation_service_.reset(
- new TiclInvalidationService(NULL,
- token_service_.get(),
- profile_.get()));
+ invalidation_service_.reset(new TiclInvalidationService(
+ scoped_ptr<InvalidationAuthProvider>(
+ new ProfileInvalidationAuthProvider(
+ SigninManagerFactory::GetForProfile(profile_.get()),
+ token_service_.get(),
+ NULL)),
+ profile_.get()));
invalidation_service_->InitForTest(fake_invalidator_);
}
@@ -52,9 +58,9 @@ class TiclInvalidationServiceTestDelegate {
}
syncer::FakeInvalidator* fake_invalidator_; // owned by the service.
- scoped_ptr<TiclInvalidationService> invalidation_service_;
scoped_ptr<TestingProfile> profile_;
scoped_ptr<FakeProfileOAuth2TokenService> token_service_;
+ scoped_ptr<TiclInvalidationService> invalidation_service_;
};
INSTANTIATE_TYPED_TEST_CASE_P(
« no previous file with comments | « chrome/browser/invalidation/ticl_invalidation_service.cc ('k') | chrome/browser/sync/test/integration/sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698