Index: chrome/browser/android/signin/signin_manager_android.cc |
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc |
index 4e267df356ddcd4feedb0613a94b970962669085..c94d20340afa0343eec95660ee889ee42a663f06 100644 |
--- a/chrome/browser/android/signin/signin_manager_android.cc |
+++ b/chrome/browser/android/signin/signin_manager_android.cc |
@@ -270,29 +270,13 @@ void SigninManagerAndroid::MergeSessionCompleted( |
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, |
@@ -328,10 +312,6 @@ static jboolean ShouldLoadPolicyForUser(JNIEnv* env, |
#endif |
} |
-static jboolean IsNewProfileManagementEnabled(JNIEnv* env, jclass clazz) { |
- return switches::IsNewProfileManagement(); |
-} |
- |
// static |
bool SigninManagerAndroid::Register(JNIEnv* env) { |
return RegisterNativesImpl(env); |