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

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

Issue 1209193003: [Proximity Auth] Create one ProximityAuthClient per profile, rather than one global one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable tests on non-ChromeOS, since there's nothing left to test on the other platforms Created 5 years, 5 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
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 "base/strings/string16.h" 5 #include "base/strings/string16.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_ap i.h" 8 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_ap i.h"
9 #include "chrome/browser/extensions/extension_apitest.h" 9 #include "chrome/browser/extensions/extension_apitest.h"
10 #include "chrome/browser/profiles/profile_info_cache.h" 10 #include "chrome/browser/profiles/profile_info_cache.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 void RunTest(const std::string& extension_name) { 88 void RunTest(const std::string& extension_name) {
89 ASSERT_TRUE(RunComponentExtensionTest(extension_name)) << message_; 89 ASSERT_TRUE(RunComponentExtensionTest(extension_name)) << message_;
90 } 90 }
91 91
92 private: 92 private:
93 content::NotificationRegistrar registrar_; 93 content::NotificationRegistrar registrar_;
94 94
95 DISALLOW_COPY_AND_ASSIGN(ScreenlockPrivateApiTest); 95 DISALLOW_COPY_AND_ASSIGN(ScreenlockPrivateApiTest);
96 }; 96 };
97 97
98 // Locking is currently implemented only on ChromeOS.
99 #if defined(OS_CHROMEOS)
100
98 // Time out under MSan. http://crbug.com/478091 101 // Time out under MSan. http://crbug.com/478091
99 // Flaky under LSan on ChromeOS. http://crbug.com/482002 102 // Flaky under LSan on ChromeOS. http://crbug.com/482002
100 #if defined(MEMORY_SANITIZER) || defined(LEAK_SANITIZER) && defined(OS_CHROMEOS) 103 #if defined(MEMORY_SANITIZER) || defined(LEAK_SANITIZER) && defined(OS_CHROMEOS)
101 #define MAYBE_LockUnlock DISABLED_LockUnlock 104 #define MAYBE_LockUnlock DISABLED_LockUnlock
102 #define MAYBE_AuthType DISABLED_AuthType 105 #define MAYBE_AuthType DISABLED_AuthType
103 #else 106 #else
104 #define MAYBE_LockUnlock LockUnlock 107 #define MAYBE_LockUnlock LockUnlock
105 #define MAYBE_AuthType AuthType 108 #define MAYBE_AuthType AuthType
106 #endif 109 #endif
107 110
108 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, MAYBE_LockUnlock) { 111 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, MAYBE_LockUnlock) {
109 RunTest("screenlock_private/lock_unlock"); 112 RunTest("screenlock_private/lock_unlock");
110 } 113 }
111 114
112 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, MAYBE_AuthType) { 115 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, MAYBE_AuthType) {
113 RunTest("screenlock_private/auth_type"); 116 RunTest("screenlock_private/auth_type");
114 } 117 }
115 118
119 #endif // defined(OS_CHROMEOS)
120
116 } // namespace extensions 121 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc ('k') | chrome/browser/signin/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698