Revert 277793 "Enable consistent identity on android platform by..."

chrome/browser/signin/account_reconcilor_unittest.cc

Index: chrome/browser/signin/account_reconcilor_unittest.cc
===================================================================
--- chrome/browser/signin/account_reconcilor_unittest.cc	(revision 277945)
+++ chrome/browser/signin/account_reconcilor_unittest.cc	(working copy)
@@ -7,7 +7,6 @@
 #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"
@@ -24,7 +23,7 @@
 #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/common/profile_management_switches.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"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ -136,8 +135,8 @@
   // If it's a non-parameterized test, or we have a parameter of true, set flag.
   if (!::testing::UnitTest::GetInstance()->current_test_info()->value_param() ||
       GetParam()) {
-    switches::EnableAccountConsistencyForTesting(
-        CommandLine::ForCurrentProcess());
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kNewProfileManagement);
   }
 
   testing_profile_manager_.reset(