Enable consistent identity on android platform by default.

chrome/browser/signin/account_reconcilor_unittest.cc

Index: chrome/browser/signin/account_reconcilor_unittest.cc
diff --git a/chrome/browser/signin/account_reconcilor_unittest.cc b/chrome/browser/signin/account_reconcilor_unittest.cc
index 26bdac96f60c15fe2d5926664cb46da48ace2bd0..b564cbaaea87ea6abae0de3754cc2045d05813d6 100644
--- a/chrome/browser/signin/account_reconcilor_unittest.cc
+++ b/chrome/browser/signin/account_reconcilor_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/signin/account_reconcilor_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
@@ -22,7 +23,6 @@
 #include "components/signin/core/browser/account_reconcilor.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
-//#include "components/signin/core/browser/test_signin_client.h"
 #include "components/signin/core/common/signin_switches.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_urls.h"
@@ -121,8 +121,13 @@ AccountReconcilorTest::AccountReconcilorTest()
       url_fetcher_factory_(NULL) {}
 
 void AccountReconcilorTest::SetUp() {
+#if defined(OS_ANDROID)
+  DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableNewProfileManagement));
+#else
   CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kNewProfileManagement);
+      switches::kEnableNewProfileManagement);
+#endif
 
   testing_profile_manager_.reset(
       new TestingProfileManager(TestingBrowserProcess::GetGlobal()));