| Index: chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
|
| index 08ec1b58b4e52f573fe012366fe260853bc193ec..69c51bc0f108aa593ab06e87307ff52c5bd97e41 100644
|
| --- a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
|
| +++ b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
|
| @@ -20,6 +20,10 @@
|
| #include "components/sync/test/fake_server/fake_server_verifier.h"
|
| #include "components/sync/test/fake_server/sessions_hierarchy.h"
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "chromeos/chromeos_switches.h"
|
| +#endif
|
| +
|
| using base::HistogramBase;
|
| using base::HistogramSamples;
|
| using base::HistogramTester;
|
| @@ -66,6 +70,15 @@ class SingleClientSessionsSyncTest : public SyncTest {
|
|
|
| if (!cl->HasSwitch(switches::kSyncShortInitialRetryOverride))
|
| cl->AppendSwitch(switches::kSyncShortInitialRetryOverride);
|
| +
|
| +#if defined(OS_CHROMEOS)
|
| + // kIgnoreUserProfileMappingForTests will let UserManager always return
|
| + // active user. If this switch is not set, sync test's profile will not
|
| + // match UserManager's active user, then UserManager won't return active
|
| + // user to our tests.
|
| + if (!cl->HasSwitch(chromeos::switches::kIgnoreUserProfileMappingForTests))
|
| + cl->AppendSwitch(chromeos::switches::kIgnoreUserProfileMappingForTests);
|
| +#endif
|
| }
|
|
|
| private:
|
|
|