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

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

Issue 14630003: signin: move SigninManagerBase::Signout to SigninManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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_startup_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index f6b335374d613e6a4ea56eb1e064a0984a525720..0e1775709f0c3eb577a2459f03197f7452e9beb3 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -173,6 +173,13 @@ class ProfileSyncServiceStartupCrosTest : public ProfileSyncServiceStartupTest {
}
};
+ProfileKeyedService* BuildFakeTokenService(Profile* profile) {
+ return new FakeTokenService();
+}
+
+#if !defined(OS_CHROMEOS) // See ProfileSyncServiceCrosTest for Chrome OS.
+// TODO(tim): Bug 237866, split these into two files, one per platform.
+
TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(0);
@@ -213,10 +220,6 @@ TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
EXPECT_TRUE(sync_->ShouldPushChanges());
}
-ProfileKeyedService* BuildFakeTokenService(Profile* profile) {
- return new FakeTokenService();
-}
-
TEST_F(ProfileSyncServiceStartupTest, StartNoCredentials) {
DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(0);
@@ -258,6 +261,8 @@ TEST_F(ProfileSyncServiceStartupTest, StartNoCredentials) {
EXPECT_TRUE(sync_->ShouldPushChanges());
}
+#endif // !defined (OS_CHROMEOS)
+
TEST_F(ProfileSyncServiceStartupTest, StartInvalidCredentials) {
DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(0);

Powered by Google App Engine
This is Rietveld 408576698