| OLD | NEW |
| 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_factory.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.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 #include "components/content_settings/core/browser/host_content_settings_map.h" | 11 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 12 | 12 |
| 13 // | 13 // |
| 14 // Interface tests. | 14 // Interface tests. |
| 15 // | 15 // |
| 16 | 16 |
| 17 // Disable tests under ASAN. http://crbug.com/104832. | 17 // Disable tests under ASAN. http://crbug.com/104832. |
| 18 // This is a bit heavy handed, but the majority of these tests fail under ASAN. | 18 // This is a bit heavy handed, but the majority of these tests fail under ASAN. |
| 19 // See bug for history. | 19 // See bug for history. |
| 20 #if !defined(ADDRESS_SANITIZER) && !defined(SYZYASAN) | 20 #if !defined(ADDRESS_SANITIZER) && !defined(SYZYASAN) |
| 21 | 21 |
| 22 // Disabled due to timeouts: http://crbug.com/136548 | 22 // Disabled due to timeouts: http://crbug.com/136548 |
| 23 IN_PROC_BROWSER_TEST_F( | 23 IN_PROC_BROWSER_TEST_F( |
| 24 OutOfProcessPPAPITest, DISABLED_MouseLock_SucceedWhenAllowed) { | 24 OutOfProcessPPAPITest, DISABLED_MouseLock_SucceedWhenAllowed) { |
| 25 HostContentSettingsMap* settings_map = | |
| 26 HostContentSettingsMapFactory::GetForProfile(browser()->profile()); | |
| 27 | |
| 28 settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_MOUSELOCK, | |
| 29 CONTENT_SETTING_ALLOW); | |
| 30 | |
| 31 RunTestViaHTTP("MouseLock_SucceedWhenAllowed"); | 25 RunTestViaHTTP("MouseLock_SucceedWhenAllowed"); |
| 32 } | 26 } |
| 33 | 27 |
| 34 // Disabled due to flaky timeouts: http://crbug.com/137421 | |
| 35 IN_PROC_BROWSER_TEST_F( | |
| 36 OutOfProcessPPAPITest, DISABLED_MouseLock_FailWhenBlocked) { | |
| 37 HostContentSettingsMap* settings_map = | |
| 38 HostContentSettingsMapFactory::GetForProfile(browser()->profile()); | |
| 39 | |
| 40 settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_MOUSELOCK, | |
| 41 CONTENT_SETTING_BLOCK); | |
| 42 | |
| 43 RunTestViaHTTP("MouseLock_FailWhenBlocked"); | |
| 44 } | |
| 45 | |
| 46 #endif // ADDRESS_SANITIZER | 28 #endif // ADDRESS_SANITIZER |
| OLD | NEW |