Enable consistent identity on android platform by default.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 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/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 1411 matching lines @@
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions)
   },
   {
     "enable-web-midi",
     IDS_FLAGS_ENABLE_WEB_MIDI_NAME,
     IDS_FLAGS_ENABLE_WEB_MIDI_DESCRIPTION,
     kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
     SINGLE_VALUE_TYPE(switches::kEnableWebMIDI)
   },
+#if defined(OS_ANDROID)
+  {
+    "disable-new-profile-management",
+    IDS_FLAGS_DISABLE_NEW_PROFILE_MANAGEMENT_NAME,
+    IDS_FLAGS_DISABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION,
+    kOsAndroid,
+    SINGLE_VALUE_TYPE(switches::kDisableNewProfileManagement)
+  },
+  {
+    "disable-account-consistency",
+    IDS_FLAGS_DISABLE_ACCOUNT_CONSISTENCY_NAME,
+    IDS_FLAGS_DISABLE_ACCOUNT_CONSISTENCY_DESCRIPTION,
+    kOsAndroid,
+    SINGLE_VALUE_TYPE(switches::kDisableAccountConsistency)
+  },
+#else

[guohui, 2014/06/11 15:53:01]

i think an alternative to creating two sets of switches is to use one set of
switches that flips the default state, e.g. "flip-new-profile-management", where
the default state is defined differently based on platforms.

However, this may confuse finch, so not sure if it is better, +aleksei.

[Alexei Svitkine (slow), 2014/06/11 16:54:04]

I think it's better to use two sets of switches. That way, someone passing an
explicit --enable-new-profile-management or --disable-new-profile-management
will really be getting what they specify, instead of trying to guess the
default.

I also don't see the harm of just having a single block for these (i.e. no
ifdef) using the ENABLE_DISABLE_VALUE_TYPE() macro.

   {
     "enable-new-profile-management",
     IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME,
     IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION,
-    kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kNewProfileManagement)
+    kOsMac | kOsWin | kOsLinux | kOsCrOS,
+    SINGLE_VALUE_TYPE(switches::kEnableNewProfileManagement)
   },
   {
     "enable-account-consistency",
     IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME,
     IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION,
-    kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
+    kOsMac | kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kEnableAccountConsistency)
   },
+#endif
   {
     "enable-fast-user-switching",
     IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME,
     IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_DESCRIPTION,
     kOsMac | kOsWin | kOsLinux,
     SINGLE_VALUE_TYPE(switches::kFastUserSwitching)
   },
   {
     "enable-new-avatar-menu",
     IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME,
@@ skipping 995 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags