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

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

Issue 1103143004: Disable ScreenlockPrivateApiTest.* on ChromeOS under LSan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ASSERT_TRUE(RunComponentExtensionTest(extension_name)) << message_; 88 ASSERT_TRUE(RunComponentExtensionTest(extension_name)) << message_;
89 } 89 }
90 90
91 private: 91 private:
92 content::NotificationRegistrar registrar_; 92 content::NotificationRegistrar registrar_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(ScreenlockPrivateApiTest); 94 DISALLOW_COPY_AND_ASSIGN(ScreenlockPrivateApiTest);
95 }; 95 };
96 96
97 // Time out under MSan. http://crbug.com/478091 97 // Time out under MSan. http://crbug.com/478091
98 #if defined(MEMORY_SANITIZER) 98 // Flaky under LSan on ChromeOS. http://crbug.com/482002
99 #if defined(MEMORY_SANITIZER) || defined(LEAK_SANITIZER) && defined(OS_CHROMEOS)
99 #define MAYBE_LockUnlock DISABLED_LockUnlock 100 #define MAYBE_LockUnlock DISABLED_LockUnlock
100 #define MAYBE_AuthType DISABLED_AuthType 101 #define MAYBE_AuthType DISABLED_AuthType
101 #else 102 #else
102 #define MAYBE_LockUnlock LockUnlock 103 #define MAYBE_LockUnlock LockUnlock
103 #define MAYBE_AuthType AuthType 104 #define MAYBE_AuthType AuthType
104 #endif 105 #endif
105 106
106 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, MAYBE_LockUnlock) { 107 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, MAYBE_LockUnlock) {
107 RunTest("screenlock_private/lock_unlock"); 108 RunTest("screenlock_private/lock_unlock");
108 } 109 }
109 110
110 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, MAYBE_AuthType) { 111 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, MAYBE_AuthType) {
111 RunTest("screenlock_private/auth_type"); 112 RunTest("screenlock_private/auth_type");
112 } 113 }
113 114
114 } // namespace extensions 115 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698