Revert 277793 "Enable consistent identity on android platform by..."

chrome/browser/chromeos/profiles/profile_list_chromeos.cc

 // Copyright 2013 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/chromeos/profiles/profile_list_chromeos.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/signin/core/common/profile_management_switches.h"
 
 // static
 ProfileList* ProfileList::Create(ProfileInfoInterface* profile_cache) {
   return new chromeos::ProfileListChromeOS(profile_cache);
 }
 
 namespace chromeos {
 
 ProfileListChromeOS::ProfileListChromeOS(ProfileInfoInterface* profile_cache)
     : profile_info_(profile_cache) {
@@ skipping 18 matching lines @@
   // Filter for profiles associated with logged-in users.
   UserList users = UserManager::Get()->GetLoggedInUsers();
 
   // Add corresponding profiles.
   for (UserList::const_iterator it = users.begin();
        it != users.end(); ++it) {
     size_t i = profile_info_->GetIndexOfProfileWithPath(
         ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash()));
 
     gfx::Image icon = gfx::Image((*it)->GetImage());
-    if (!switches::IsNewProfileManagement() && !icon.IsEmpty()) {
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kNewProfileManagement) && !icon.IsEmpty()) {
       // old avatar menu uses resized-small images
       icon = profiles::GetAvatarIconForMenu(icon, true);
     }
 
     AvatarMenu::Item* item = new AvatarMenu::Item(i, i, icon);
     item->name = (*it)->GetDisplayName();
     item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i);
     item->profile_path = profile_info_->GetPathOfProfileAtIndex(i);
     item->supervised = false;
     item->signed_in = true;
@@ skipping 32 matching lines @@
 void ProfileListChromeOS::ClearMenu() {
   STLDeleteElements(&items_);
 }
 
 void ProfileListChromeOS::SortMenu() {
   // Sort list of items by name.
   std::sort(items_.begin(), items_.end(), &AvatarMenu::CompareItems);
 }
 
 }  // namespace chromeos