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/api/web_navigation/web_navigation_api.h" | 6 #include "chrome/browser/extensions/api/web_navigation/web_navigation_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/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 13 matching lines...) Expand all Loading... | |
24 #if defined(OS_WIN) | 24 #if defined(OS_WIN) |
25 // http://crbug.com/118478 | 25 // http://crbug.com/118478 |
26 #define MAYBE_WebNavigationIFrame DISABLED_WebNavigationIFrame | 26 #define MAYBE_WebNavigationIFrame DISABLED_WebNavigationIFrame |
27 #define MAYBE_WebNavigationFailures DISABLED_WebNavigationFailures | 27 #define MAYBE_WebNavigationFailures DISABLED_WebNavigationFailures |
28 #define MAYBE_WebNavigationForwardBack DISABLED_WebNavigationForwardBack | 28 #define MAYBE_WebNavigationForwardBack DISABLED_WebNavigationForwardBack |
29 #define MAYBE_WebNavigationClientRedirect DISABLED_WebNavigationClientRedirect | 29 #define MAYBE_WebNavigationClientRedirect DISABLED_WebNavigationClientRedirect |
30 #define MAYBE_WebNavigationGetFrame DISABLED_WebNavigationGetFrame | 30 #define MAYBE_WebNavigationGetFrame DISABLED_WebNavigationGetFrame |
31 #define MAYBE_WebNavigationSimpleLoad DISABLED_WebNavigationSimpleLoad | 31 #define MAYBE_WebNavigationSimpleLoad DISABLED_WebNavigationSimpleLoad |
32 #define MAYBE_WebNavigationReferenceFragment \ | 32 #define MAYBE_WebNavigationReferenceFragment \ |
33 DISABLED_WebNavigationReferenceFragment | 33 DISABLED_WebNavigationReferenceFragment |
34 #define MAYBE_WebNavigationHistory DISABLED_WebNavigationHistory | |
Matt Perry
2012/07/16 20:42:50
Disabling a test before it's even checked in? That
jochen (gone - plz use gerrit)
2012/07/16 20:53:36
Well, it's an almost exact copy of the ReferenceFr
| |
34 #define MAYBE_WebNavigationOpenTab DISABLED_WebNavigationOpenTab | 35 #define MAYBE_WebNavigationOpenTab DISABLED_WebNavigationOpenTab |
35 #define MAYBE_WebNavigationFilteredTest DISABLED_WebNavigationFilteredTest | 36 #define MAYBE_WebNavigationFilteredTest DISABLED_WebNavigationFilteredTest |
36 #else | 37 #else |
37 #define MAYBE_WebNavigationIFrame WebNavigationIFrame | 38 #define MAYBE_WebNavigationIFrame WebNavigationIFrame |
38 #define MAYBE_WebNavigationFailures WebNavigationFailures | 39 #define MAYBE_WebNavigationFailures WebNavigationFailures |
39 #define MAYBE_WebNavigationForwardBack WebNavigationForwardBack | 40 #define MAYBE_WebNavigationForwardBack WebNavigationForwardBack |
40 #define MAYBE_WebNavigationClientRedirect WebNavigationClientRedirect | 41 #define MAYBE_WebNavigationClientRedirect WebNavigationClientRedirect |
41 #define MAYBE_WebNavigationGetFrame WebNavigationGetFrame | 42 #define MAYBE_WebNavigationGetFrame WebNavigationGetFrame |
42 #define MAYBE_WebNavigationSimpleLoad WebNavigationSimpleLoad | 43 #define MAYBE_WebNavigationSimpleLoad WebNavigationSimpleLoad |
43 #define MAYBE_WebNavigationReferenceFragment WebNavigationReferenceFragment | 44 #define MAYBE_WebNavigationReferenceFragment WebNavigationReferenceFragment |
45 #define MAYBE_WebNavigationHistory WebNavigationHistory | |
44 #define MAYBE_WebNavigationOpenTab WebNavigationOpenTab | 46 #define MAYBE_WebNavigationOpenTab WebNavigationOpenTab |
45 #define MAYBE_WebNavigationFilteredTest WebNavigationFilteredTest | 47 #define MAYBE_WebNavigationFilteredTest WebNavigationFilteredTest |
46 #endif | 48 #endif |
47 | 49 |
48 namespace extensions { | 50 namespace extensions { |
49 | 51 |
50 namespace { | 52 namespace { |
51 | 53 |
52 class TestRenderViewContextMenu : public RenderViewContextMenu { | 54 class TestRenderViewContextMenu : public RenderViewContextMenu { |
53 public: | 55 public: |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
325 mouse_event.x = 7; | 327 mouse_event.x = 7; |
326 mouse_event.y = 7; | 328 mouse_event.y = 7; |
327 mouse_event.clickCount = 1; | 329 mouse_event.clickCount = 1; |
328 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 330 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
329 mouse_event.type = WebKit::WebInputEvent::MouseUp; | 331 mouse_event.type = WebKit::WebInputEvent::MouseUp; |
330 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 332 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
331 | 333 |
332 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 334 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
333 } | 335 } |
334 | 336 |
337 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_WebNavigationHistory) { | |
338 FrameNavigationState::set_allow_extension_scheme(true); | |
339 | |
340 CommandLine::ForCurrentProcess()->AppendSwitch( | |
341 switches::kAllowLegacyExtensionManifests); | |
Matt Perry
2012/07/16 20:42:50
How hard is it to just fix the manifest?
jochen (gone - plz use gerrit)
2012/07/16 20:53:36
I'll prepare a CL for that
| |
342 | |
343 ASSERT_TRUE( | |
344 RunExtensionSubtest("webnavigation", "test_history.html")) | |
345 << message_; | |
346 } | |
347 | |
335 } // namespace extensions | 348 } // namespace extensions |
OLD | NEW |