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

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

Issue 9314046: Remove FLAKY modifier from CrossOriginXHRFileAccess, it hasn't failed in the past month. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "net/base/mock_host_resolver.h" 6 #include "net/base/mock_host_resolver.h"
7 7
8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRBackgroundPage) { 8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRBackgroundPage) {
9 host_resolver()->AddRule("*.com", "127.0.0.1"); 9 host_resolver()->AddRule("*.com", "127.0.0.1");
10 ASSERT_TRUE(StartTestServer()); 10 ASSERT_TRUE(StartTestServer());
11 ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/background_page")) << message_; 11 ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/background_page")) << message_;
12 } 12 }
13 13
14 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRAllURLs) { 14 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRAllURLs) {
15 host_resolver()->AddRule("*.com", "127.0.0.1"); 15 host_resolver()->AddRule("*.com", "127.0.0.1");
16 ASSERT_TRUE(StartTestServer()); 16 ASSERT_TRUE(StartTestServer());
17 ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/all_urls")) << message_; 17 ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/all_urls")) << message_;
18 } 18 }
19 19
20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRContentScript) { 20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRContentScript) {
21 host_resolver()->AddRule("*.com", "127.0.0.1"); 21 host_resolver()->AddRule("*.com", "127.0.0.1");
22 ASSERT_TRUE(StartTestServer()); 22 ASSERT_TRUE(StartTestServer());
23 ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/content_script")) << message_; 23 ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/content_script")) << message_;
24 } 24 }
25 25
26 // Flaky on Mac 10.5, crbug.com/105179. 26 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRFileAccess) {
27 #if defined(OS_MACOSX)
28 #define MAYBE_CrossOriginXHRFileAccess FLAKY_CrossOriginXHRFileAccess
29 #else
30 #define MAYBE_CrossOriginXHRFileAccess CrossOriginXHRFileAccess
31 #endif
32
33 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CrossOriginXHRFileAccess) {
34 ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/file_access")) << message_; 27 ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/file_access")) << message_;
35 } 28 }
36 29
37 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRNoFileAccess) { 30 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRNoFileAccess) {
38 ASSERT_TRUE(RunExtensionTestNoFileAccess( 31 ASSERT_TRUE(RunExtensionTestNoFileAccess(
39 "cross_origin_xhr/no_file_access")) << message_; 32 "cross_origin_xhr/no_file_access")) << message_;
40 } 33 }
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