Change new-avatar-menu to an enable-disable flag.

components/signin/core/browser/about_signin_internals.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 "components/signin/core/browser/about_signin_internals.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/hash.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 347 matching lines @@
   // A summary of signin related info first.
   base::ListValue* basic_info = AddSection(signin_info, "Basic Information");
   const std::string signin_status_string =
       untimed_signin_fields[USERNAME - UNTIMED_FIELDS_BEGIN].empty()
           ? "Not Signed In"
           : "Signed In";
   AddSectionEntry(basic_info, "Chrome Version", product_version);
   AddSectionEntry(basic_info, "Signin Status", signin_status_string);
   AddSectionEntry(basic_info, "Web Based Signin Enabled?",
       switches::IsEnableWebBasedSignin() == true ? "True" : "False");
+  AddSectionEntry(basic_info, "New Avatar Menu Enabled?",
+      switches::IsNewAvatarMenu() == true ? "True" : "False");
   AddSectionEntry(basic_info, "New Profile Management Enabled?",
       switches::IsNewProfileManagement() == true ? "True" : "False");
-  AddSectionEntry(basic_info, "New Avatar Menu Enabled?",
-      switches::IsNewAvatarMenu() == true ? "True" : "False");
-  bool new_avatar_menu_flag =
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewAvatarMenu);
-  AddSectionEntry(basic_info, "New Avatar Menu Flag Set?",
-      new_avatar_menu_flag ? "True" : "False");
   AddSectionEntry(basic_info, "Account Consistency Enabled?",
       switches::IsEnableAccountConsistency() == true ? "True" : "False");
 
   // Only add username.  SID and LSID have moved to tokens section.
   const std::string field =
       SigninStatusFieldToLabel(static_cast<UntimedSigninStatusField>(USERNAME));
   AddSectionEntry(basic_info,
                   field,
                   untimed_signin_fields[USERNAME - UNTIMED_FIELDS_BEGIN]);
 
@@ skipping 23 matching lines @@
     std::sort(it->second.begin(), it->second.end(), TokenInfo::LessThan);
     const std::vector<TokenInfo*>& tokens = it->second;
     for (size_t i = 0; i < tokens.size(); ++i) {
       base::DictionaryValue* token_info = tokens[i]->ToValue();
       token_details->Append(token_info);
     }
   }
 
   return signin_status.Pass();
 }