| 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 "base/logging.h" | 5 #include "base/logging.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
| 10 #include "chrome/test/base/ui_test_utils.h" | 10 #include "chrome/test/base/ui_test_utils.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 } | 115 } |
| 116 | 116 |
| 117 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Audio) { | 117 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Audio) { |
| 118 EXPECT_TRUE(RunExtensionSubtest( | 118 EXPECT_TRUE(RunExtensionSubtest( |
| 119 "extension_resource_request_policy/extension2", | 119 "extension_resource_request_policy/extension2", |
| 120 "audio.html", | 120 "audio.html", |
| 121 // Tests manifest_version 1 behavior, so warnings are expected. | 121 // Tests manifest_version 1 behavior, so warnings are expected. |
| 122 ExtensionApiTest::kFlagIgnoreManifestWarnings)) << message_; | 122 ExtensionApiTest::kFlagIgnoreManifestWarnings)) << message_; |
| 123 } | 123 } |
| 124 | 124 |
| 125 #if defined(OS_MACOSX) | 125 #if defined(OS_MACOSX) || defined(OS_WIN) |
| 126 // http://crbug.com/95274 - Video is flaky on Mac. | 126 // http://crbug.com/238733 - Video is flaky on Mac and Win. |
| 127 #define MAYBE_Video DISABLED_Video | 127 #define MAYBE_Video DISABLED_Video |
| 128 #else | 128 #else |
| 129 #define MAYBE_Video Video | 129 #define MAYBE_Video Video |
| 130 #endif | 130 #endif |
| 131 | 131 |
| 132 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, MAYBE_Video) { | 132 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, MAYBE_Video) { |
| 133 EXPECT_TRUE(RunExtensionSubtest( | 133 EXPECT_TRUE(RunExtensionSubtest( |
| 134 "extension_resource_request_policy/extension2", | 134 "extension_resource_request_policy/extension2", |
| 135 "video.html", | 135 "video.html", |
| 136 // Tests manifest_version 1 behavior, so warnings are expected. | 136 // Tests manifest_version 1 behavior, so warnings are expected. |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 | 267 |
| 268 #if defined(OS_MACOSX) | 268 #if defined(OS_MACOSX) |
| 269 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources | 269 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources |
| 270 #else | 270 #else |
| 271 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources | 271 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources |
| 272 #endif | 272 #endif |
| 273 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 273 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| 274 MAYBE_ExtensionAccessibleResources) { | 274 MAYBE_ExtensionAccessibleResources) { |
| 275 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; | 275 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; |
| 276 } | 276 } |
| OLD | NEW |