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

Side by Side Diff: chrome/browser/chromeos/extensions/screenlock_private_apitest.cc

Issue 290123004: Canonicalize user ID passed via chromeos::switches::kLoginUser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ExtensionNetworkingPrivateApiTestInstantiation tests. 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/lock/screen_locker.h" 6 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
7 #include "chrome/browser/chromeos/login/users/user.h" 7 #include "chrome/browser/chromeos/login/users/user.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/signin/signin_manager_factory.h" 9 #include "chrome/browser/signin/signin_manager_factory.h"
10 #include "components/signin/core/browser/signin_manager.h" 10 #include "components/signin/core/browser/signin_manager.h"
(...skipping 11 matching lines...) Expand all
22 class ScreenlockPrivateApiTest : public ExtensionApiTest, 22 class ScreenlockPrivateApiTest : public ExtensionApiTest,
23 public content::NotificationObserver { 23 public content::NotificationObserver {
24 public: 24 public:
25 ScreenlockPrivateApiTest() {} 25 ScreenlockPrivateApiTest() {}
26 26
27 virtual ~ScreenlockPrivateApiTest() {} 27 virtual ~ScreenlockPrivateApiTest() {}
28 28
29 // ExtensionApiTest 29 // ExtensionApiTest
30 virtual void SetUpOnMainThread() OVERRIDE { 30 virtual void SetUpOnMainThread() OVERRIDE {
31 SigninManagerFactory::GetForProfile(profile()) 31 SigninManagerFactory::GetForProfile(profile())
32 ->SetAuthenticatedUsername("TestUser@gmail.com"); 32 ->SetAuthenticatedUsername("testuser@gmail.com");
33 ExtensionApiTest::SetUpOnMainThread(); 33 ExtensionApiTest::SetUpOnMainThread();
34 } 34 }
35 35
36 protected: 36 protected:
37 chromeos::ScreenLocker* GetScreenLocker() { 37 chromeos::ScreenLocker* GetScreenLocker() {
38 chromeos::ScreenLocker* locker = 38 chromeos::ScreenLocker* locker =
39 chromeos::ScreenLocker::default_screen_locker(); 39 chromeos::ScreenLocker::default_screen_locker();
40 EXPECT_TRUE(locker); 40 EXPECT_TRUE(locker);
41 return locker; 41 return locker;
42 } 42 }
(...skipping 26 matching lines...) Expand all
69 69
70 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, LockUnlock) { 70 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, LockUnlock) {
71 ASSERT_TRUE(RunExtensionTest("screenlock_private/lock_unlock")) << message_; 71 ASSERT_TRUE(RunExtensionTest("screenlock_private/lock_unlock")) << message_;
72 } 72 }
73 73
74 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, AuthType) { 74 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, AuthType) {
75 ASSERT_TRUE(RunExtensionTest("screenlock_private/auth_type")) << message_; 75 ASSERT_TRUE(RunExtensionTest("screenlock_private/auth_type")) << message_;
76 } 76 }
77 77
78 } // namespace extensions 78 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/login/helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698