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

Unified Diff: chrome/browser/sync/profile_sync_service_unittest.cc

Issue 14630003: signin: move SigninManagerBase::Signout to SigninManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: apocalypse Created 7 years, 7 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/sync/profile_sync_service_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 15ccc3b3fb86d2f0df9d441ac7212b234a2b56be..0c8d0b95a380a9550842e6d1d789e6fb29616761 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -282,8 +282,12 @@ TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {
harness_.profile->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart));
}
+// Certain ProfileSyncService tests don't apply to Chrome OS, for example
+// things that deal with concepts like "signing out" and policy.
+#if !defined (OS_CHROMEOS)
+
TEST_F(ProfileSyncServiceTest, EnableSyncAndSignOut) {
- SigninManagerBase* signin =
+ SigninManager* signin =
SigninManagerFactory::GetForProfile(harness_.profile.get());
signin->SetAuthenticatedUsername("test@test.com");
ProfileSyncComponentsFactoryMock* factory =
@@ -310,6 +314,8 @@ TEST_F(ProfileSyncServiceTest, EnableSyncAndSignOut) {
EXPECT_FALSE(harness_.service->sync_initialized());
}
+#endif // !defined(OS_CHROMEOS)
+
TEST_F(ProfileSyncServiceTest, JsControllerHandlersBasic) {
harness_.StartSyncService();
EXPECT_TRUE(harness_.service->sync_initialized());
« no previous file with comments | « chrome/browser/sync/profile_sync_service_startup_unittest.cc ('k') | chrome/browser/sync/sync_ui_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698