[USS] Fix USS in sync_integration_tests in chromeos

chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc

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..463aec0cd14cf6b631a6042b1417dac173ff6030 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);
+
+// kIgnoreUserProfileMappingForTests will let UserManager always return active

[skym, 2017/02/22 15:45:40]

This indentation is wrong now.

[Gang Wu, 2017/02/22 16:02:08]

Done.

+// user. If not set this switch, sync test's profile will not match

[skym, 2017/02/22 15:45:40]

If this switch is not set,

[Gang Wu, 2017/02/22 16:02:08]

Done.

+// UserManager's active user, then UserManager won't return active user to our
+// tests.
+#if defined(OS_CHROMEOS)
+    if (!cl->HasSwitch(chromeos::switches::kIgnoreUserProfileMappingForTests))
+      cl->AppendSwitch(chromeos::switches::kIgnoreUserProfileMappingForTests);
+#endif
   }
 
  private: