Reland of: Change default code flag to NewAvatarMenu.

components/signin/core/common/profile_management_switches.cc

 // Copyright 2014 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 "components/signin/core/common/profile_management_switches.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
 #include "components/signin/core/common/signin_switches.h"
@@ skipping 61 matching lines @@
   // Consistent identity args take precedent over new profile management args.
   if (not_new_avatar_menu) {
     return STATE_OLD_AVATAR_MENU;
   } else if (is_consistent_identity) {
     return STATE_ACCOUNT_CONSISTENCY;
   } else if (is_new_profile_management) {
     return STATE_NEW_PROFILE_MANAGEMENT;
   } else if (is_new_avatar_menu) {
     return STATE_NEW_AVATAR_MENU;
   } else if (not_new_profile_management) {
-    return STATE_OLD_AVATAR_MENU;
+    return STATE_NEW_AVATAR_MENU;
   } else if (not_consistent_identity) {
-    return STATE_OLD_AVATAR_MENU;
+    return STATE_NEW_AVATAR_MENU;
   }
 
   // Set the default state
 #if defined(OS_ANDROID) || defined(OS_IOS)
   State state = STATE_ACCOUNT_CONSISTENCY;
 #else
-  State state = STATE_OLD_AVATAR_MENU;
+  State state = STATE_NEW_AVATAR_MENU;
 #endif
 
   if (!trial_type.empty()) {
     if (trial_type == "Enabled") {
       state = STATE_NEW_PROFILE_MANAGEMENT;
     } else if (trial_type == "AccountConsistency") {
       state = STATE_ACCOUNT_CONSISTENCY;
     } else if (trial_type == "NewAvatarMenu") {
       state = STATE_NEW_AVATAR_MENU;
     } else {
-      state = STATE_OLD_AVATAR_MENU;
+      state = STATE_NEW_AVATAR_MENU;
     }
   }
 
   return state;
 }
 
 bool CheckFlag(std::string command_switch, State min_state) {
   // Individiual flag settings take precedence.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(command_switch))
     return true;
@@ skipping 65 matching lines @@
   command_line->AppendSwitch(switches::kEnableNewProfileManagement);
   DCHECK(!command_line->HasSwitch(switches::kDisableNewProfileManagement));
 }
 
 void EnableAccountConsistencyForTesting(base::CommandLine* command_line) {
   command_line->AppendSwitch(switches::kEnableAccountConsistency);
   DCHECK(!command_line->HasSwitch(switches::kDisableAccountConsistency));
 }
 
 }  // namespace switches