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

chrome/browser/app_controller_mac_browsertest.mm

 // 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.
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <Foundation/Foundation.h>
 #import <Foundation/NSAppleEventDescriptor.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace {
 
 GURL g_open_shortcut_url = GURL::EmptyGURL();
 
 }  // namespace
 
@@ skipping 154 matching lines @@
 
 class AppControllerNewProfileManagementBrowserTest
     : public InProcessBrowserTest {
  protected:
   AppControllerNewProfileManagementBrowserTest()
       : active_browser_list_(BrowserList::GetInstance(
                                 chrome::GetActiveDesktop())) {
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    switches::EnableNewProfileManagementForTesting(command_line);
+    command_line->AppendSwitch(switches::kNewProfileManagement);
   }
 
   const BrowserList* active_browser_list_;
 };
 
 // Test that for a regular last profile, a reopen event opens a browser.
 IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
                        RegularProfileReopenWithNoWindows) {
   base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
   EXPECT_EQ(1u, active_browser_list_->size());
@@ skipping 103 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(AppControllerOpenShortcutBrowserTest,
                        OpenShortcutOnStartup) {
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_EQ(g_open_shortcut_url,
       browser()->tab_strip_model()->GetActiveWebContents()
           ->GetLastCommittedURL());
 }
 
 }  // namespace