Remove references to IsNewAvatarMenu since the flag was removed.

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"
 
 namespace {
 
 const char kNewProfileManagementFieldTrialName[] = "NewProfileManagement";
 
 // Different state of new profile management/identity consistency.  The code
 // below assumes the order of the values in this enum.  That is, new profile
 // management is included in consistent identity.
 enum State {
   STATE_OLD_AVATAR_MENU,

[Mike Lerman, 2015/09/28 15:23:01]

I think we can remove this state now?

[anthonyvd, 2015/09/29 20:23:16]

Done.

   STATE_NEW_AVATAR_MENU,
   STATE_NEW_PROFILE_MANAGEMENT,
   STATE_ACCOUNT_CONSISTENCY,
 };
 
 State GetProcessState() {
   // Find the state of both command line args.
   bool is_new_avatar_menu = base::CommandLine::ForCurrentProcess()->HasSwitch(

[Mike Lerman, 2015/09/28 15:23:01]

remove this bool... and remove switches::kEnableNewAvatarMenu?

[anthonyvd, 2015/09/29 20:23:16]

Done.

       switches::kEnableNewAvatarMenu);
   bool is_new_profile_management =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableNewProfileManagement);
   bool is_consistent_identity =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableAccountConsistency);
   bool not_new_avatar_menu = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableNewAvatarMenu);
   bool not_new_profile_management =
@@ skipping 100 matching lines @@
 
 bool IsGoogleProfileInfo() {
   return CheckFlag(switches::kGoogleProfileInfo, STATE_NEW_AVATAR_MENU);
 }
 
 bool IsNewAvatarMenu() {
   // NewAvatarMenu is only available on desktop.
 #if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_CHROMEOS)
   return false;
 #else
-  return GetProcessState() >= STATE_NEW_AVATAR_MENU;
+  return true;
 #endif
 }
 
 bool IsNewProfileManagement() {
   return GetProcessState() >= STATE_NEW_PROFILE_MANAGEMENT;
 }
 
 bool IsNewProfileManagementPreviewEnabled() {
   // No promotion to Enable Account Consistency.
   return false;
@@ skipping 13 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