| 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 6b6a14672e8932e8ffef69231f89a637b4a97003..010065e59ca1199d60c31ab241761ed29ddcfe64 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());
|
|
|