Remove SigninManager.isNewProfileManagementEnabled().

chrome/browser/android/signin/signin_manager_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "chrome/browser/android/signin/signin_manager_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 252 matching lines @@
 void SigninManagerAndroid::MergeSessionCompleted(
     const std::string& account_id,
     const GoogleServiceAuthError& error) {
   merge_session_helper_->RemoveObserver(this);
   merge_session_helper_.reset();
 }
 
 void SigninManagerAndroid::LogInSignedInUser(JNIEnv* env, jobject obj) {
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile_);
-  if (switches::IsNewProfileManagement()) {
-    // New Mirror code path that just fires the events and let the
-    // Account Reconcilor handles everything.
+    // Just fire the events and let the Account Reconcilor handles everything.
     AndroidProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetPlatformSpecificForProfile(
             profile_);
     const std::string& primary_acct =
         signin_manager->GetAuthenticatedAccountId();
     token_service->ValidateAccounts(primary_acct, true);
-
-  } else {
-    DVLOG(1) << "SigninManagerAndroid::LogInSignedInUser "
-        " Manually calling MergeSessionHelper";
-    // Old code path that doesn't depend on the new Account Reconcilor.
-    // We manually login.
-
-    ProfileOAuth2TokenService* token_service =
-        ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
-    merge_session_helper_.reset(new MergeSessionHelper(
-        token_service, GaiaConstants::kChromeSource,
-        profile_->GetRequestContext(), this));
-    merge_session_helper_->LogIn(signin_manager->GetAuthenticatedAccountId());
-  }
 }
 
 jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env,
                                                        jobject obj) {
   return SigninManagerFactory::GetForProfile(profile_)->IsSigninAllowed();
 }
 
 jboolean SigninManagerAndroid::IsSignedInOnNative(JNIEnv* env, jobject obj) {
   return SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated();
 }
@@ skipping 15 matching lines @@
                                         jstring j_username) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   std::string username =
       base::android::ConvertJavaStringToUTF8(env, j_username);
   return !policy::BrowserPolicyConnector::IsNonEnterpriseUser(username);
 #else
   return false;
 #endif
 }
 
-static jboolean IsNewProfileManagementEnabled(JNIEnv* env, jclass clazz) {
-  return switches::IsNewProfileManagement();
-}
-
 // static
 bool SigninManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }