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 <list> | 5 #include <list> |
6 #include <set> | 6 #include <set> |
7 | 7 |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
565 | 565 |
566 ExtensionService* service = extensions::ExtensionSystem::Get( | 566 ExtensionService* service = extensions::ExtensionSystem::Get( |
567 browser()->profile())->extension_service(); | 567 browser()->profile())->extension_service(); |
568 const extensions::Extension* extension = | 568 const extensions::Extension* extension = |
569 service->GetExtensionById(last_loaded_extension_id(), false); | 569 service->GetExtensionById(last_loaded_extension_id(), false); |
570 GURL url = extension->GetResourceURL("a.html"); | 570 GURL url = extension->GetResourceURL("a.html"); |
571 | 571 |
572 ui_test_utils::NavigateToURL(browser(), url); | 572 ui_test_utils::NavigateToURL(browser(), url); |
573 | 573 |
574 // There's a link on a.html. Middle-click on it to open it in a new tab. | 574 // There's a link on a.html. Middle-click on it to open it in a new tab. |
575 blink::WebMouseEvent mouse_event; | 575 blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseDown, |
576 mouse_event.type = blink::WebInputEvent::MouseDown; | 576 blink::WebInputEvent::NoModifiers, |
| 577 blink::WebInputEvent::TimeStampForTesting); |
577 mouse_event.button = blink::WebMouseEvent::Button::Middle; | 578 mouse_event.button = blink::WebMouseEvent::Button::Middle; |
578 mouse_event.x = 7; | 579 mouse_event.x = 7; |
579 mouse_event.y = 7; | 580 mouse_event.y = 7; |
580 mouse_event.clickCount = 1; | 581 mouse_event.clickCount = 1; |
581 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); | 582 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); |
582 mouse_event.type = blink::WebInputEvent::MouseUp; | 583 mouse_event.setType(blink::WebInputEvent::MouseUp); |
583 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); | 584 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); |
584 | 585 |
585 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 586 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
586 } | 587 } |
587 | 588 |
588 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlank) { | 589 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlank) { |
589 ASSERT_TRUE(StartEmbeddedTestServer()); | 590 ASSERT_TRUE(StartEmbeddedTestServer()); |
590 | 591 |
591 // Wait for the extension to set itself up and return control to us. | 592 // Wait for the extension to set itself up and return control to us. |
592 ASSERT_TRUE(RunExtensionTest("webnavigation/targetBlank")) << message_; | 593 ASSERT_TRUE(RunExtensionTest("webnavigation/targetBlank")) << message_; |
593 | 594 |
594 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); | 595 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
595 content::WaitForLoadStop(tab); | 596 content::WaitForLoadStop(tab); |
596 | 597 |
597 ResultCatcher catcher; | 598 ResultCatcher catcher; |
598 | 599 |
599 GURL url = embedded_test_server()->GetURL( | 600 GURL url = embedded_test_server()->GetURL( |
600 "/extensions/api_test/webnavigation/targetBlank/a.html"); | 601 "/extensions/api_test/webnavigation/targetBlank/a.html"); |
601 | 602 |
602 chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK); | 603 chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK); |
603 ui_test_utils::NavigateToURL(¶ms); | 604 ui_test_utils::NavigateToURL(¶ms); |
604 | 605 |
605 // There's a link with target=_blank on a.html. Click on it to open it in a | 606 // There's a link with target=_blank on a.html. Click on it to open it in a |
606 // new tab. | 607 // new tab. |
607 blink::WebMouseEvent mouse_event; | 608 blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseDown, |
608 mouse_event.type = blink::WebInputEvent::MouseDown; | 609 blink::WebInputEvent::NoModifiers, |
| 610 blink::WebInputEvent::TimeStampForTesting); |
609 mouse_event.button = blink::WebMouseEvent::Button::Left; | 611 mouse_event.button = blink::WebMouseEvent::Button::Left; |
610 mouse_event.x = 7; | 612 mouse_event.x = 7; |
611 mouse_event.y = 7; | 613 mouse_event.y = 7; |
612 mouse_event.clickCount = 1; | 614 mouse_event.clickCount = 1; |
613 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); | 615 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); |
614 mouse_event.type = blink::WebInputEvent::MouseUp; | 616 mouse_event.setType(blink::WebInputEvent::MouseUp); |
615 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); | 617 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); |
616 | 618 |
617 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 619 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
618 } | 620 } |
619 | 621 |
620 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlankIncognito) { | 622 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlankIncognito) { |
621 ASSERT_TRUE(StartEmbeddedTestServer()); | 623 ASSERT_TRUE(StartEmbeddedTestServer()); |
622 | 624 |
623 // Wait for the extension to set itself up and return control to us. | 625 // Wait for the extension to set itself up and return control to us. |
624 ASSERT_TRUE(RunExtensionTestIncognito("webnavigation/targetBlank")) | 626 ASSERT_TRUE(RunExtensionTestIncognito("webnavigation/targetBlank")) |
625 << message_; | 627 << message_; |
626 | 628 |
627 ResultCatcher catcher; | 629 ResultCatcher catcher; |
628 | 630 |
629 GURL url = embedded_test_server()->GetURL( | 631 GURL url = embedded_test_server()->GetURL( |
630 "/extensions/api_test/webnavigation/targetBlank/a.html"); | 632 "/extensions/api_test/webnavigation/targetBlank/a.html"); |
631 | 633 |
632 Browser* otr_browser = OpenURLOffTheRecord(browser()->profile(), url); | 634 Browser* otr_browser = OpenURLOffTheRecord(browser()->profile(), url); |
633 WebContents* tab = otr_browser->tab_strip_model()->GetActiveWebContents(); | 635 WebContents* tab = otr_browser->tab_strip_model()->GetActiveWebContents(); |
634 | 636 |
635 // There's a link with target=_blank on a.html. Click on it to open it in a | 637 // There's a link with target=_blank on a.html. Click on it to open it in a |
636 // new tab. | 638 // new tab. |
637 blink::WebMouseEvent mouse_event; | 639 blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseDown, |
638 mouse_event.type = blink::WebInputEvent::MouseDown; | 640 blink::WebInputEvent::NoModifiers, |
| 641 blink::WebInputEvent::TimeStampForTesting); |
639 mouse_event.button = blink::WebMouseEvent::Button::Left; | 642 mouse_event.button = blink::WebMouseEvent::Button::Left; |
640 mouse_event.x = 7; | 643 mouse_event.x = 7; |
641 mouse_event.y = 7; | 644 mouse_event.y = 7; |
642 mouse_event.clickCount = 1; | 645 mouse_event.clickCount = 1; |
643 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); | 646 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); |
644 mouse_event.type = blink::WebInputEvent::MouseUp; | 647 mouse_event.setType(blink::WebInputEvent::MouseUp); |
645 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); | 648 tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event); |
646 | 649 |
647 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 650 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
648 } | 651 } |
649 | 652 |
650 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { | 653 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { |
651 ASSERT_TRUE(StartEmbeddedTestServer()); | 654 ASSERT_TRUE(StartEmbeddedTestServer()); |
652 ASSERT_TRUE(RunExtensionTest("webnavigation/history")) << message_; | 655 ASSERT_TRUE(RunExtensionTest("webnavigation/history")) << message_; |
653 } | 656 } |
654 | 657 |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
809 "extensions/api_test/webnavigation/crash/b.html", | 812 "extensions/api_test/webnavigation/crash/b.html", |
810 embedded_test_server()->port())); | 813 embedded_test_server()->port())); |
811 ui_test_utils::NavigateToURL(browser(), url); | 814 ui_test_utils::NavigateToURL(browser(), url); |
812 | 815 |
813 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 816 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
814 } | 817 } |
815 | 818 |
816 #endif | 819 #endif |
817 | 820 |
818 } // namespace extensions | 821 } // namespace extensions |
OLD | NEW |