Disable UI flags for non-desktop OSes

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 "chrome/browser/android/signin/signin_manager_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 214 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()) {
+  if (switches::IsEnableAccountConsistency()) {
     // New Mirror code path that just fires 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 {
@@ skipping 33 matching lines @@
 #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();
+  return switches::IsEnableAccountConsistency();

[aruslan, 2014/08/18 21:25:21]

This is a deadly way of dealing with flags.
It is really hard to tell if there is a difference between
"IsNewProfileManagementEnabled" and "IsNewProfileManagement".

[Mike Lerman, 2014/08/19 14:59:07]

I don't see a IsNewProfileManagementEnabled flag, except for this method here in
signin_manager_android. I assume this is the method that controls/passes the
relevant flag through to the Java-side of Clank? It should (I imagine) be called
IsAccountConsistencyEnabled, since NewProfileManagement has no meaning on
Android.

 }
 
 // static
 bool SigninManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }