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 "chrome/app/chrome_command_ids.h" | 5 #include "chrome/app/chrome_command_ids.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_webnavigation_api.h" | 8 #include "chrome/browser/extensions/extension_webnavigation_api.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/tab_contents/render_view_context_menu.h" | 10 #include "chrome/browser/tab_contents/render_view_context_menu.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 FrameNavigationState::set_allow_extension_scheme(true); | 121 FrameNavigationState::set_allow_extension_scheme(true); |
122 | 122 |
123 CommandLine::ForCurrentProcess()->AppendSwitch( | 123 CommandLine::ForCurrentProcess()->AppendSwitch( |
124 switches::kAllowLegacyExtensionManifests); | 124 switches::kAllowLegacyExtensionManifests); |
125 | 125 |
126 ASSERT_TRUE( | 126 ASSERT_TRUE( |
127 RunExtensionSubtest("webnavigation", "test_referenceFragment.html")) | 127 RunExtensionSubtest("webnavigation", "test_referenceFragment.html")) |
128 << message_; | 128 << message_; |
129 } | 129 } |
130 | 130 |
131 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationSimpleLoad) { | 131 #if defined(OS_WIN) |
| 132 // Marking this test flaky on Windows: http://crbug.com/116842 |
| 133 #define MAYBE_WebNavigationSimpleLoad FLAKY_WebNavigationSimpleLoad |
| 134 #else |
| 135 #define MAYBE_WebNavigationSimpleLoad WebNavigationSimpleLoad |
| 136 #endif |
| 137 |
| 138 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_WebNavigationSimpleLoad) { |
132 FrameNavigationState::set_allow_extension_scheme(true); | 139 FrameNavigationState::set_allow_extension_scheme(true); |
133 | 140 |
134 CommandLine::ForCurrentProcess()->AppendSwitch( | 141 CommandLine::ForCurrentProcess()->AppendSwitch( |
135 switches::kAllowLegacyExtensionManifests); | 142 switches::kAllowLegacyExtensionManifests); |
136 | 143 |
137 ASSERT_TRUE( | 144 ASSERT_TRUE( |
138 RunExtensionSubtest("webnavigation", "test_simpleLoad.html")) << message_; | 145 RunExtensionSubtest("webnavigation", "test_simpleLoad.html")) << message_; |
139 } | 146 } |
140 | 147 |
141 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFailures) { | 148 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFailures) { |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; | 295 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; |
289 mouse_event.x = 7; | 296 mouse_event.x = 7; |
290 mouse_event.y = 7; | 297 mouse_event.y = 7; |
291 mouse_event.clickCount = 1; | 298 mouse_event.clickCount = 1; |
292 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 299 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
293 mouse_event.type = WebKit::WebInputEvent::MouseUp; | 300 mouse_event.type = WebKit::WebInputEvent::MouseUp; |
294 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 301 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
295 | 302 |
296 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 303 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
297 } | 304 } |
OLD | NEW |