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

Side by Side Diff: chrome/test/ppapi/ppapi_interactive_browsertest.cc

Issue 10695127: More correct disabling of SucceedWhenAllowed due to timeouts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ppapi/tests/test_mouse_lock.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 11
12 // 12 //
13 // Interface tests. 13 // Interface tests.
14 // 14 //
15 15
16 // Disable tests under ASAN. http://crbug.com/104832. 16 // Disable tests under ASAN. http://crbug.com/104832.
17 // This is a bit heavy handed, but the majority of these tests fail under ASAN. 17 // This is a bit heavy handed, but the majority of these tests fail under ASAN.
18 // See bug for history. 18 // See bug for history.
19 #if !defined(ADDRESS_SANITIZER) 19 #if !defined(ADDRESS_SANITIZER)
20 20
21 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MouseLock_SucceedWhenAllowed) { 21 // Disabled due to timeouts: http://crbug.com/136548
22 IN_PROC_BROWSER_TEST_F(
23 OutOfProcessPPAPITest, DISABLED_MouseLock_SucceedWhenAllowed) {
22 HostContentSettingsMap* settings_map = 24 HostContentSettingsMap* settings_map =
23 browser()->profile()->GetHostContentSettingsMap(); 25 browser()->profile()->GetHostContentSettingsMap();
24 26
25 settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_MOUSELOCK, 27 settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_MOUSELOCK,
26 CONTENT_SETTING_ALLOW); 28 CONTENT_SETTING_ALLOW);
27 29
28 RunTestViaHTTP("MouseLock_SucceedWhenAllowed"); 30 RunTestViaHTTP("MouseLock_SucceedWhenAllowed");
29 } 31 }
30 32
31 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MouseLock_FailWhenBlocked) { 33 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MouseLock_FailWhenBlocked) {
32 HostContentSettingsMap* settings_map = 34 HostContentSettingsMap* settings_map =
33 browser()->profile()->GetHostContentSettingsMap(); 35 browser()->profile()->GetHostContentSettingsMap();
34 36
35 settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_MOUSELOCK, 37 settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_MOUSELOCK,
36 CONTENT_SETTING_BLOCK); 38 CONTENT_SETTING_BLOCK);
37 39
38 RunTestViaHTTP("MouseLock_FailWhenBlocked"); 40 RunTestViaHTTP("MouseLock_FailWhenBlocked");
39 } 41 }
40 42
41 #endif // ADDRESS_SANITIZER 43 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « no previous file | ppapi/tests/test_mouse_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698