| 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 "base/macros.h" |    6 #include "base/macros.h" | 
|    7 #include "base/memory/ptr_util.h" |    7 #include "base/memory/ptr_util.h" | 
|    8 #include "base/strings/stringprintf.h" |    8 #include "base/strings/stringprintf.h" | 
|    9 #include "build/build_config.h" |    9 #include "build/build_config.h" | 
|   10 #include "chrome/browser/chrome_notification_types.h" |   10 #include "chrome/browser/chrome_notification_types.h" | 
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  225 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, |  225 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, | 
|  226                        DISABLED_WebRequestAuthRequired) { |  226                        DISABLED_WebRequestAuthRequired) { | 
|  227   CancelLoginDialog login_dialog_helper; |  227   CancelLoginDialog login_dialog_helper; | 
|  228  |  228  | 
|  229   ASSERT_TRUE(StartEmbeddedTestServer()); |  229   ASSERT_TRUE(StartEmbeddedTestServer()); | 
|  230   ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << |  230   ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << | 
|  231       message_; |  231       message_; | 
|  232 } |  232 } | 
|  233  |  233  | 
|  234 // This test times out regularly on win_rel trybots. See http://crbug.com/122178 |  234 // This test times out regularly on win_rel trybots. See http://crbug.com/122178 | 
|  235 #if defined(OS_WIN) |  235 // Also on Linux/ChromiumOS debug builds. https://crbug.com/670415 | 
 |  236 #if defined(OS_WIN) || !defined(NDEBUG) | 
|  236 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking |  237 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking | 
|  237 #else |  238 #else | 
|  238 #define MAYBE_WebRequestBlocking WebRequestBlocking |  239 #define MAYBE_WebRequestBlocking WebRequestBlocking | 
|  239 #endif |  240 #endif | 
|  240 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestBlocking) { |  241 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestBlocking) { | 
|  241   ASSERT_TRUE(StartEmbeddedTestServer()); |  242   ASSERT_TRUE(StartEmbeddedTestServer()); | 
|  242   ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) << |  243   ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) << | 
|  243       message_; |  244       message_; | 
|  244 } |  245 } | 
|  245  |  246  | 
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  643   ASSERT_TRUE(granter); |  644   ASSERT_TRUE(granter); | 
|  644   granter->RevokeForTesting(); |  645   granter->RevokeForTesting(); | 
|  645   base::RunLoop().RunUntilIdle(); |  646   base::RunLoop().RunUntilIdle(); | 
|  646   PerformXhrInFrame(main_frame, kHost, port, kXhrPath); |  647   PerformXhrInFrame(main_frame, kHost, port, kXhrPath); | 
|  647   EXPECT_EQ(xhr_count, |  648   EXPECT_EQ(xhr_count, | 
|  648             GetWebRequestCountFromBackgroundPage(extension, profile())); |  649             GetWebRequestCountFromBackgroundPage(extension, profile())); | 
|  649   EXPECT_EQ(BLOCKED_ACTION_WEB_REQUEST, runner->GetBlockedActions(extension)); |  650   EXPECT_EQ(BLOCKED_ACTION_WEB_REQUEST, runner->GetBlockedActions(extension)); | 
|  650 } |  651 } | 
|  651  |  652  | 
|  652 }  // namespace extensions |  653 }  // namespace extensions | 
| OLD | NEW |