| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 } | 64 } |
| 65 | 65 |
| 66 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestSimple) { | 66 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestSimple) { |
| 67 CommandLine::ForCurrentProcess()->AppendSwitch( | 67 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 68 switches::kEnableExperimentalExtensionApis); | 68 switches::kEnableExperimentalExtensionApis); |
| 69 | 69 |
| 70 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_simple.html")) << | 70 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_simple.html")) << |
| 71 message_; | 71 message_; |
| 72 } | 72 } |
| 73 | 73 |
| 74 // Broken, http://crbug.com/101651 | 74 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestComplex) { |
| 75 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, DISABLED_WebRequestComplex) { | |
| 76 CommandLine::ForCurrentProcess()->AppendSwitch( | 75 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 77 switches::kEnableExperimentalExtensionApis); | 76 switches::kEnableExperimentalExtensionApis); |
| 78 | 77 |
| 79 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) << | 78 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) << |
| 80 message_; | 79 message_; |
| 81 } | 80 } |
| 82 | 81 |
| 83 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestAuthRequired) { | 82 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestAuthRequired) { |
| 84 CommandLine::ForCurrentProcess()->AppendSwitch( | 83 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 85 switches::kEnableExperimentalExtensionApis); | 84 switches::kEnableExperimentalExtensionApis); |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after 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 |