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

chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #include "chrome/browser/ui/views/profiles/user_manager_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/test/test_utils.h"
 #include "grit/generated_resources.h"
 #include "ui/views/controls/button/label_button.h"
 
 class NewAvatarMenuButtonTest : public InProcessBrowserTest {
  public:
   NewAvatarMenuButtonTest();
   virtual ~NewAvatarMenuButtonTest();
 
  protected:
   virtual void SetUp() OVERRIDE;
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
   void CreateTestingProfile();
   void StartAvatarMenu();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NewAvatarMenuButtonTest);
 };
 
 NewAvatarMenuButtonTest::NewAvatarMenuButtonTest() {
 }
 
 NewAvatarMenuButtonTest::~NewAvatarMenuButtonTest() {
 }
 
 void NewAvatarMenuButtonTest::SetUp() {
   InProcessBrowserTest::SetUp();
-  DCHECK(switches::IsNewProfileManagement());
+  DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kNewProfileManagement));
 }
 
 void NewAvatarMenuButtonTest::SetUpCommandLine(CommandLine* command_line) {
-  switches::EnableNewProfileManagementForTesting(command_line);
+  command_line->AppendSwitch(switches::kNewProfileManagement);
 }
 
 void NewAvatarMenuButtonTest::CreateTestingProfile() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   EXPECT_EQ(1u, profile_manager->GetNumberOfProfiles());
 
   // Sign in the default profile
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   cache.SetUserNameOfProfileAtIndex(0, base::UTF8ToUTF16("user_name"));
 
@@ skipping 66 matching lines @@
   window_close_observer.Wait();  // Rely on test timeout for failure indication.
   EXPECT_TRUE(browser_list->empty());
 
   // If the User Manager hasn't shown yet, wait for it to show up.
   if (!UserManagerView::IsShowing())
     base::MessageLoop::current()->RunUntilIdle();
 
   // We need to hide the User Manager or else the process can't die.
   chrome::HideUserManager();
 }