| OLD | NEW |
| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/extensions/extension_webrequest_api.h" | 8 #include "chrome/browser/extensions/extension_webrequest_api.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestAuthRequired) { | 83 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestAuthRequired) { |
| 84 CommandLine::ForCurrentProcess()->AppendSwitch( | 84 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 85 switches::kEnableExperimentalExtensionApis); | 85 switches::kEnableExperimentalExtensionApis); |
| 86 | 86 |
| 87 CancelLoginDialog login_dialog_helper; | 87 CancelLoginDialog login_dialog_helper; |
| 88 | 88 |
| 89 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << | 89 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << |
| 90 message_; | 90 message_; |
| 91 } | 91 } |
| 92 | 92 |
| 93 // Hangs flakily: http://crbug.com/91715 | |
| 94 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, | 93 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, |
| 95 DISABLED_WebRequestBlocking) { | 94 WebRequestBlocking) { |
| 96 CommandLine::ForCurrentProcess()->AppendSwitch( | 95 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 97 switches::kEnableExperimentalExtensionApis); | 96 switches::kEnableExperimentalExtensionApis); |
| 98 | 97 |
| 99 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) << | 98 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) << |
| 100 message_; | 99 message_; |
| 101 } | 100 } |
| 102 | 101 |
| 103 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) { | 102 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) { |
| 104 CommandLine::ForCurrentProcess()->AppendSwitch( | 103 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 105 switches::kEnableExperimentalExtensionApis); | 104 switches::kEnableExperimentalExtensionApis); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 127 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; | 126 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; |
| 128 mouse_event.x = 7; | 127 mouse_event.x = 7; |
| 129 mouse_event.y = 7; | 128 mouse_event.y = 7; |
| 130 mouse_event.clickCount = 1; | 129 mouse_event.clickCount = 1; |
| 131 tab->render_view_host()->ForwardMouseEvent(mouse_event); | 130 tab->render_view_host()->ForwardMouseEvent(mouse_event); |
| 132 mouse_event.type = WebKit::WebInputEvent::MouseUp; | 131 mouse_event.type = WebKit::WebInputEvent::MouseUp; |
| 133 tab->render_view_host()->ForwardMouseEvent(mouse_event); | 132 tab->render_view_host()->ForwardMouseEvent(mouse_event); |
| 134 | 133 |
| 135 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 134 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 136 } | 135 } |
| OLD | NEW |