Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc

Issue 289013002: cros: Clean up screenlockPrivate plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_notification_types.h" 5 #include "chrome/browser/chrome_notification_types.h"
6 #include "chrome/browser/chromeos/login/auth/user_context.h" 6 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_ap i.h"
7 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
8 #include "chrome/browser/chromeos/login/users/user.h"
9 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
10 #include "chrome/browser/signin/signin_manager_factory.h" 8 #include "chrome/browser/signin/signin_manager_factory.h"
11 #include "components/signin/core/browser/signin_manager.h" 9 #include "components/signin/core/browser/signin_manager.h"
10 #include "components/signin/core/common/signin_switches.h"
12 #include "content/public/browser/notification_service.h" 11 #include "content/public/browser/notification_service.h"
13 #include "extensions/browser/api/test/test_api.h" 12 #include "extensions/browser/api/test/test_api.h"
14 13
15 namespace extensions { 14 namespace extensions {
16 15
17 namespace { 16 namespace {
18 17
18 const char kTestUser[] = "testuser@gmail.com";
19 const char kAttemptClickAuthMessage[] = "attemptClickAuth"; 19 const char kAttemptClickAuthMessage[] = "attemptClickAuth";
20 20
21 } // namespace 21 } // namespace
22 22
23 class ScreenlockPrivateApiTest : public ExtensionApiTest, 23 class ScreenlockPrivateApiTest : public ExtensionApiTest,
24 public content::NotificationObserver { 24 public content::NotificationObserver {
25 public: 25 public:
26 ScreenlockPrivateApiTest() {} 26 ScreenlockPrivateApiTest() {}
27 27
28 virtual ~ScreenlockPrivateApiTest() {} 28 virtual ~ScreenlockPrivateApiTest() {}
29 29
30 // ExtensionApiTest 30 // ExtensionApiTest
31 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
32 ExtensionApiTest::SetUpCommandLine(command_line);
33
34 #if !defined(OS_CHROMEOS)
35 // New profile management needs to be on for non-ChromeOS lock.
36 command_line->AppendSwitch(switches::kNewProfileManagement);
37 #endif
38 }
39
31 virtual void SetUpOnMainThread() OVERRIDE { 40 virtual void SetUpOnMainThread() OVERRIDE {
32 SigninManagerFactory::GetForProfile(profile()) 41 SigninManagerFactory::GetForProfile(profile())
33 ->SetAuthenticatedUsername("testuser@gmail.com"); 42 ->SetAuthenticatedUsername(kTestUser);
34 ExtensionApiTest::SetUpOnMainThread(); 43 ExtensionApiTest::SetUpOnMainThread();
35 } 44 }
36 45
37 protected: 46 protected:
38 chromeos::ScreenLocker* GetScreenLocker() {
39 chromeos::ScreenLocker* locker =
40 chromeos::ScreenLocker::default_screen_locker();
41 EXPECT_TRUE(locker);
42 return locker;
43 }
44
45 // ExtensionApiTest override: 47 // ExtensionApiTest override:
46 virtual void RunTestOnMainThreadLoop() OVERRIDE { 48 virtual void RunTestOnMainThreadLoop() OVERRIDE {
47 registrar_.Add(this, 49 registrar_.Add(this,
48 chrome::NOTIFICATION_EXTENSION_TEST_MESSAGE, 50 chrome::NOTIFICATION_EXTENSION_TEST_MESSAGE,
49 content::NotificationService::AllSources()); 51 content::NotificationService::AllSources());
50 ExtensionApiTest::RunTestOnMainThreadLoop(); 52 ExtensionApiTest::RunTestOnMainThreadLoop();
51 registrar_.RemoveAll(); 53 registrar_.RemoveAll();
52 } 54 }
53 55
54 // content::NotificationObserver override: 56 // content::NotificationObserver override:
55 virtual void Observe(int type, 57 virtual void Observe(int type,
56 const content::NotificationSource& source, 58 const content::NotificationSource& source,
57 const content::NotificationDetails& details) OVERRIDE { 59 const content::NotificationDetails& details) OVERRIDE {
58 const std::string& content = *content::Details<std::string>(details).ptr(); 60 const std::string& content = *content::Details<std::string>(details).ptr();
59 if (content == kAttemptClickAuthMessage) { 61 if (content == kAttemptClickAuthMessage) {
60 chromeos::ScreenLocker* locker = GetScreenLocker(); 62 extensions::ScreenlockPrivateEventRouter* router =
61 const chromeos::UserList& users = locker->users(); 63 extensions::ScreenlockPrivateEventRouter::GetFactoryInstance()->Get(
62 EXPECT_GE(1u, users.size()); 64 profile());
63 GetScreenLocker()->Authenticate(chromeos::UserContext(users[0]->email())); 65 router->OnAuthAttempted(
66 ScreenlockBridge::Get()->lock_handler()->GetAuthType(kTestUser), "");
64 } 67 }
65 } 68 }
66 69
70 private:
67 content::NotificationRegistrar registrar_; 71 content::NotificationRegistrar registrar_;
72
73 DISALLOW_COPY_AND_ASSIGN(ScreenlockPrivateApiTest);
68 }; 74 };
69 75
70 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, LockUnlock) { 76 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, LockUnlock) {
71 ASSERT_TRUE(RunExtensionTest("screenlock_private/lock_unlock")) << message_; 77 ASSERT_TRUE(RunExtensionTest("screenlock_private/lock_unlock")) << message_;
72 } 78 }
73 79
74 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, AuthType) { 80 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, AuthType) {
75 ASSERT_TRUE(RunExtensionTest("screenlock_private/auth_type")) << message_; 81 ASSERT_TRUE(RunExtensionTest("screenlock_private/auth_type")) << message_;
76 } 82 }
77 83
78 } // namespace extensions 84 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698