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

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

Issue 271533004: Turning on MultiProfile by default for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index e3355f50dbb0f3854362193f6a26ed685c619744..9f79709747d0b0a977b9657ea15c5bcab960b0df 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -75,6 +75,10 @@
#include "sync/test/fake_server/fake_server_network_resources.h"
#include "url/gurl.h"
+#if defined(OS_CHROMEOS)
+#include "chromeos/chromeos_switches.h"
+#endif
+
using content::BrowserThread;
using invalidation::InvalidationServiceFactory;
@@ -242,6 +246,10 @@ void SyncTest::TearDown() {
void SyncTest::SetUpCommandLine(base::CommandLine* cl) {
AddTestSwitches(cl);
AddOptionalTypesToCommandLine(cl);
+
+#if defined(OS_CHROMEOS)
+ cl->AppendSwitch(chromeos::switches::kIgnoreUserProfileMappingForTests);
+#endif
}
void SyncTest::AddTestSwitches(base::CommandLine* cl) {
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698