cros: Clean up screenlockPrivate plumbing.

chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc

Index: chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/screenlock_private_apitest.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc
similarity index 70%
rename from chrome/browser/chromeos/extensions/screenlock_private_apitest.cc
rename to chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc
index 50a7fda05d91a5277cdba697cba248de84f0cf6e..0b150303f9a32b326439fa576f9fa1127906f641 100644
--- a/chrome/browser/chromeos/extensions/screenlock_private_apitest.cc
+++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc
@@ -3,12 +3,11 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/auth/user_context.h"
-#include "chrome/browser/chromeos/login/lock/screen_locker.h"
-#include "chrome/browser/chromeos/login/users/user.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/signin_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/api/test/test_api.h"
 
@@ -16,6 +15,7 @@ namespace extensions {
 
 namespace {
 
+const char kTestUser[] = "testuser@gmail.com";
 const char kAttemptClickAuthMessage[] = "attemptClickAuth";
 
 }  // namespace
@@ -28,20 +28,22 @@ class ScreenlockPrivateApiTest : public ExtensionApiTest,
   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.
+    command_line->AppendSwitch(switches::kNewProfileManagement);
+#endif
+  }
+
   virtual void SetUpOnMainThread() OVERRIDE {
     SigninManagerFactory::GetForProfile(profile())
-        ->SetAuthenticatedUsername("testuser@gmail.com");
+        ->SetAuthenticatedUsername(kTestUser);
     ExtensionApiTest::SetUpOnMainThread();
   }
 
  protected:
-  chromeos::ScreenLocker* GetScreenLocker() {
-    chromeos::ScreenLocker* locker =
-        chromeos::ScreenLocker::default_screen_locker();
-    EXPECT_TRUE(locker);
-    return locker;
-  }
-
   // ExtensionApiTest override:
   virtual void RunTestOnMainThreadLoop() OVERRIDE {
     registrar_.Add(this,
@@ -57,14 +59,18 @@ class ScreenlockPrivateApiTest : public ExtensionApiTest,
                        const content::NotificationDetails& details) OVERRIDE {
     const std::string& content = *content::Details<std::string>(details).ptr();
     if (content == kAttemptClickAuthMessage) {
-      chromeos::ScreenLocker* locker = GetScreenLocker();
-      const chromeos::UserList& users = locker->users();
-      EXPECT_GE(1u, users.size());
-      GetScreenLocker()->Authenticate(chromeos::UserContext(users[0]->email()));
+      extensions::ScreenlockPrivateEventRouter* router =
+          extensions::ScreenlockPrivateEventRouter::GetFactoryInstance()->Get(
+              profile());
+      router->OnAuthAttempted(
+          ScreenlockBridge::Get()->lock_handler()->GetAuthType(kTestUser), "");
     }
   }
 
+ private:
   content::NotificationRegistrar registrar_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScreenlockPrivateApiTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, LockUnlock) {