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

Side by Side Diff: chrome/browser/extensions/extension_resource_request_policy_apitest.cc

Issue 15044002: Disable ExtensionResourceRequestPolicyTest.Video on Win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« 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 (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
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
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 }
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