| 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_system.h" | 9 #include "chrome/browser/extensions/extension_system.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 // Test split with incognito permission. | 238 // Test split with incognito permission. |
| 239 RunPermissionTest("split", true, true, "redirected1", "redirected2"); | 239 RunPermissionTest("split", true, true, "redirected1", "redirected2"); |
| 240 } | 240 } |
| 241 | 241 |
| 242 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, | 242 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, |
| 243 WebRequestDeclarativePermissionSplit2) { | 243 WebRequestDeclarativePermissionSplit2) { |
| 244 // Test split without incognito permission. | 244 // Test split without incognito permission. |
| 245 RunPermissionTest("split", false, false, "redirected1", ""); | 245 RunPermissionTest("split", false, false, "redirected1", ""); |
| 246 } | 246 } |
| 247 | 247 |
| 248 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, PostData1) { | 248 // TODO(vabr): Cure these flaky tests, http://crbug.com/238179. |
| 249 #if defined(OS_WIN) && !defined(NDEBUG) |
| 250 #define MAYBE_PostData1 DISABLED_PostData1 |
| 251 #define MAYBE_PostData2 DISABLED_PostData2 |
| 252 #else |
| 253 #define MAYBE_PostData1 PostData1 |
| 254 #define MAYBE_PostData2 PostData2 |
| 255 #endif |
| 256 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_PostData1) { |
| 249 // Test HTML form POST data access with the default and "url" encoding. | 257 // Test HTML form POST data access with the default and "url" encoding. |
| 250 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_post1.html")) << | 258 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_post1.html")) << |
| 251 message_; | 259 message_; |
| 252 } | 260 } |
| 253 | 261 |
| 254 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, PostData2) { | 262 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_PostData2) { |
| 255 // Test HTML form POST data access with the multipart and plaintext encoding. | 263 // Test HTML form POST data access with the multipart and plaintext encoding. |
| 256 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_post2.html")) << | 264 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_post2.html")) << |
| 257 message_; | 265 message_; |
| 258 } | 266 } |
| 259 | 267 |
| 260 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, | 268 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, |
| 261 DeclarativeSendMessage) { | 269 DeclarativeSendMessage) { |
| 262 ASSERT_TRUE(RunExtensionTest("webrequest_sendmessage")) << message_; | 270 ASSERT_TRUE(RunExtensionTest("webrequest_sendmessage")) << message_; |
| 263 } | 271 } |
| 264 | 272 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 282 // Reload extension and wait for rules to be set up again. This should not | 290 // Reload extension and wait for rules to be set up again. This should not |
| 283 // crash the browser. | 291 // crash the browser. |
| 284 ExtensionTestMessageListener listener2("done", true); | 292 ExtensionTestMessageListener listener2("done", true); |
| 285 ExtensionTestMessageListener listener_incognito2("done_incognito", true); | 293 ExtensionTestMessageListener listener_incognito2("done_incognito", true); |
| 286 | 294 |
| 287 ReloadExtension(extension->id()); | 295 ReloadExtension(extension->id()); |
| 288 | 296 |
| 289 EXPECT_TRUE(listener2.WaitUntilSatisfied()); | 297 EXPECT_TRUE(listener2.WaitUntilSatisfied()); |
| 290 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); | 298 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); |
| 291 } | 299 } |
| OLD | NEW |