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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 6 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
9 #include "chrome/browser/extensions/extension_test_message_listener.h" | 9 #include "chrome/browser/extensions/extension_test_message_listener.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestSimple) { | 79 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestSimple) { |
80 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_simple.html")) << | 80 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_simple.html")) << |
81 message_; | 81 message_; |
82 } | 82 } |
83 | 83 |
84 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestComplex) { | 84 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestComplex) { |
85 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) << | 85 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) << |
86 message_; | 86 message_; |
87 } | 87 } |
88 | 88 |
89 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestAuthRequired) { | 89 // Flaky (sometimes crash): http://crbug.com/140976 |
| 90 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, |
| 91 DISABLED_WebRequestAuthRequired) { |
90 CancelLoginDialog login_dialog_helper; | 92 CancelLoginDialog login_dialog_helper; |
91 | 93 |
92 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << | 94 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << |
93 message_; | 95 message_; |
94 } | 96 } |
95 | 97 |
96 // This test times out regularly on win_rel trybots. See http://crbug.com/122178 | 98 // This test times out regularly on win_rel trybots. See http://crbug.com/122178 |
97 #if defined(OS_WIN) | 99 #if defined(OS_WIN) |
98 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking | 100 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking |
99 #else | 101 #else |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 WebRequestDeclarativePermissionSplit1) { | 219 WebRequestDeclarativePermissionSplit1) { |
218 // Test split with incognito permission. | 220 // Test split with incognito permission. |
219 RunPermissionTest("split", true, true, "redirected1", "redirected2"); | 221 RunPermissionTest("split", true, true, "redirected1", "redirected2"); |
220 } | 222 } |
221 | 223 |
222 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, | 224 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, |
223 WebRequestDeclarativePermissionSplit2) { | 225 WebRequestDeclarativePermissionSplit2) { |
224 // Test split without incognito permission. | 226 // Test split without incognito permission. |
225 RunPermissionTest("split", false, false, "redirected1", ""); | 227 RunPermissionTest("split", false, false, "redirected1", ""); |
226 } | 228 } |
227 | |
OLD | NEW |