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

Unified Diff: chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc

Issue 2694503002: [USS] Fix USS in sync_integration_tests in chromeos (Closed)
Patch Set: do not enable on bot Created 3 years, 10 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/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..4be7b4a0eca59d814cd62229432726547817cda0 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,11 @@ class SingleClientSessionsSyncTest : public SyncTest {
if (!cl->HasSwitch(switches::kSyncShortInitialRetryOverride))
cl->AppendSwitch(switches::kSyncShortInitialRetryOverride);
+
+#if defined(OS_CHROMEOS)
skym 2017/02/21 23:06:54 Can you add some comments explaining why we need t
Gang Wu 2017/02/22 00:50:08 Done. I change the way to set. I called base clas
+ if (!cl->HasSwitch(chromeos::switches::kIgnoreUserProfileMappingForTests))
+ cl->AppendSwitch(chromeos::switches::kIgnoreUserProfileMappingForTests);
+#endif
}
private:

Powered by Google App Engine
This is Rietveld 408576698