| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 bool load_extension_with_incognito_permission, | 72 bool load_extension_with_incognito_permission, |
| 73 bool wait_for_extension_loaded_in_incognito, | 73 bool wait_for_extension_loaded_in_incognito, |
| 74 const char* expected_content_regular_window, | 74 const char* expected_content_regular_window, |
| 75 const char* exptected_content_incognito_window); | 75 const char* exptected_content_incognito_window); |
| 76 }; | 76 }; |
| 77 | 77 |
| 78 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestApi) { | 78 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestApi) { |
| 79 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_api.html")) << message_; | 79 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_api.html")) << message_; |
| 80 } | 80 } |
| 81 | 81 |
| 82 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestSimple) { | 82 // Fails often on Windows dbg bots. http://crbug.com/177163 |
| 83 #if defined(OS_WIN) |
| 84 #define MAYBE_WebRequestSimple DISABLED_WebRequestSimple |
| 85 #else |
| 86 #define MAYBE_WebRequestSimple WebRequestSimple |
| 87 #endif // defined(OS_WIN) |
| 88 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestSimple) { |
| 83 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_simple.html")) << | 89 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_simple.html")) << |
| 84 message_; | 90 message_; |
| 85 } | 91 } |
| 86 | 92 |
| 87 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestComplex) { | 93 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestComplex) { |
| 88 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) << | 94 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) << |
| 89 message_; | 95 message_; |
| 90 } | 96 } |
| 91 | 97 |
| 92 // Flaky (sometimes crash): http://crbug.com/140976 | 98 // Flaky (sometimes crash): http://crbug.com/140976 |
| 93 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, | 99 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, |
| 94 DISABLED_WebRequestAuthRequired) { | 100 DISABLED_WebRequestAuthRequired) { |
| 95 CancelLoginDialog login_dialog_helper; | 101 CancelLoginDialog login_dialog_helper; |
| 96 | 102 |
| 97 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << | 103 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << |
| 98 message_; | 104 message_; |
| 99 } | 105 } |
| 100 | 106 |
| 101 // This test times out regularly on win_rel trybots. See http://crbug.com/122178 | 107 // This test times out regularly on win_rel trybots. See http://crbug.com/122178 |
| 102 #if defined(OS_WIN) | 108 #if defined(OS_WIN) |
| 103 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking | 109 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking |
| 104 #else | 110 #else |
| 105 #define MAYBE_WebRequestBlocking WebRequestBlocking | 111 #define MAYBE_WebRequestBlocking WebRequestBlocking |
| 106 #endif | 112 #endif |
| 107 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestBlocking) { | 113 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestBlocking) { |
| 108 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) << | 114 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) << |
| 109 message_; | 115 message_; |
| 110 } | 116 } |
| 111 | 117 |
| 112 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) { | 118 // Fails often on Windows dbg bots. http://crbug.com/177163 |
| 119 #if defined(OS_WIN) |
| 120 #define MAYBE_WebRequestNewTab DISABLED_WebRequestNewTab |
| 121 #else |
| 122 #define MAYBE_WebRequestNewTab WebRequestNewTab |
| 123 #endif // defined(OS_WIN) |
| 124 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestNewTab) { |
| 113 // Wait for the extension to set itself up and return control to us. | 125 // Wait for the extension to set itself up and return control to us. |
| 114 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_newTab.html")) | 126 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_newTab.html")) |
| 115 << message_; | 127 << message_; |
| 116 | 128 |
| 117 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); | 129 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
| 118 content::WaitForLoadStop(tab); | 130 content::WaitForLoadStop(tab); |
| 119 | 131 |
| 120 ResultCatcher catcher; | 132 ResultCatcher catcher; |
| 121 | 133 |
| 122 ExtensionService* service = extensions::ExtensionSystem::Get( | 134 ExtensionService* service = extensions::ExtensionSystem::Get( |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 // Reload extension and wait for rules to be set up again. This should not | 302 // Reload extension and wait for rules to be set up again. This should not |
| 291 // crash the browser. | 303 // crash the browser. |
| 292 ExtensionTestMessageListener listener2("done", true); | 304 ExtensionTestMessageListener listener2("done", true); |
| 293 ExtensionTestMessageListener listener_incognito2("done_incognito", true); | 305 ExtensionTestMessageListener listener_incognito2("done_incognito", true); |
| 294 | 306 |
| 295 ReloadExtension(extension->id()); | 307 ReloadExtension(extension->id()); |
| 296 | 308 |
| 297 EXPECT_TRUE(listener2.WaitUntilSatisfied()); | 309 EXPECT_TRUE(listener2.WaitUntilSatisfied()); |
| 298 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); | 310 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); |
| 299 } | 311 } |
| OLD | NEW |