Bring back Gaia avatars if --new-avatar-menu is turned on.

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 104 matching lines @@
   return CheckFlag(switches::kExtensionsMultiAccount,
                    STATE_NEW_PROFILE_MANAGEMENT);
 }
 
 bool IsFastUserSwitching() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kFastUserSwitching);
 }
 
 bool IsGoogleProfileInfo() {
-  return CheckFlag(switches::kGoogleProfileInfo,
-                   STATE_NEW_PROFILE_MANAGEMENT);
+  return IsNewAvatarMenu() ||
+      CheckFlag(switches::kGoogleProfileInfo,STATE_NONE);

[Roger Tawa OOO till Jul 10th, 2014/08/04 15:31:25]

nit: space after ,

[noms (inactive), 2014/08/04 17:27:43]

Done.

 }
 
 bool IsNewAvatarMenu() {
   bool is_new_avatar_menu =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewAvatarMenu);
   return is_new_avatar_menu || IsNewProfileManagement();
 }
 
 bool IsNewProfileManagement() {
   return GetProcessState() >= STATE_NEW_PROFILE_MANAGEMENT;
@@ skipping 12 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