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

chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.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/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/signin/core/browser/signin_manager.h"
-#include "components/signin/core/common/profile_management_switches.h"
+#include "components/signin/core/common/signin_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/api/test/test_api.h"
 
 namespace extensions {
 
 namespace {
 
 const char kTestUser[] = "testuser@gmail.com";
 const char kAttemptClickAuthMessage[] = "attemptClickAuth";
 
 }  // namespace
 
 class ScreenlockPrivateApiTest : public ExtensionApiTest,
                                  public content::NotificationObserver {
  public:
   ScreenlockPrivateApiTest() {}
 
   virtual ~ScreenlockPrivateApiTest() {}
 
   // ExtensionApiTest
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
 
 #if !defined(OS_CHROMEOS)
     // New profile management needs to be on for non-ChromeOS lock.
-    switches::EnableNewProfileManagementForTesting(command_line);
+    command_line->AppendSwitch(switches::kNewProfileManagement);
 #endif
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     SigninManagerFactory::GetForProfile(profile())
         ->SetAuthenticatedUsername(kTestUser);
     ExtensionApiTest::SetUpOnMainThread();
   }
 
  protected:
@@ skipping 28 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, LockUnlock) {
   ASSERT_TRUE(RunExtensionTest("screenlock_private/lock_unlock")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, AuthType) {
   ASSERT_TRUE(RunExtensionTest("screenlock_private/auth_type")) << message_;
 }
 
 }  // namespace extensions