Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(480)

Side by Side Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 14900006: Disables WebNavigationApiTests that keep timing out. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MAYBE Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Api) { 383 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Api) {
384 ASSERT_TRUE( 384 ASSERT_TRUE(
385 RunExtensionSubtest("webnavigation", "test_api.html")) << message_; 385 RunExtensionSubtest("webnavigation", "test_api.html")) << message_;
386 } 386 }
387 387
388 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, GetFrame) { 388 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, GetFrame) {
389 ASSERT_TRUE( 389 ASSERT_TRUE(
390 RunExtensionSubtest("webnavigation", "test_getFrame.html")) << message_; 390 RunExtensionSubtest("webnavigation", "test_getFrame.html")) << message_;
391 } 391 }
392 392
393 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ClientRedirect) { 393 // http://crbug.com/238737
394 #if defined(OS_WIN)
395 #define MAYBE_ClientRedirect DISABLED_ClientRedirect
396 #else
397 #define MAYBE_ClientRedirect ClientRedirect
398 #endif
399 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_ClientRedirect) {
394 ASSERT_TRUE( 400 ASSERT_TRUE(
395 RunExtensionSubtest("webnavigation", "test_clientRedirect.html")) 401 RunExtensionSubtest("webnavigation", "test_clientRedirect.html"))
396 << message_; 402 << message_;
397 } 403 }
398 404
399 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ServerRedirect) { 405 // http://crbug.com/238737
406 #if defined(OS_WIN)
407 #define MAYBE_ServerRedirect DISABLED_ServerRedirect
408 #else
409 #define MAYBE_ServerRedirect ServerRedirect
410 #endif
411 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_ServerRedirect) {
400 ASSERT_TRUE( 412 ASSERT_TRUE(
401 RunExtensionSubtest("webnavigation", "test_serverRedirect.html")) 413 RunExtensionSubtest("webnavigation", "test_serverRedirect.html"))
402 << message_; 414 << message_;
403 } 415 }
404 416
405 // http://crbug.com/235171 417 // http://crbug.com/235171 and http://crbug.com/238737 for windows.
406 #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_AURA)) 418 #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_AURA)) || \
419 defined(OS_WIN)
407 #define MAYBE_ServerRedirectSingleProcess DISABLED_ServerRedirectSingleProcess 420 #define MAYBE_ServerRedirectSingleProcess DISABLED_ServerRedirectSingleProcess
408 #else 421 #else
409 #define MAYBE_ServerRedirectSingleProcess ServerRedirectSingleProcess 422 #define MAYBE_ServerRedirectSingleProcess ServerRedirectSingleProcess
410 #endif 423 #endif
411 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, 424 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest,
412 MAYBE_ServerRedirectSingleProcess) { 425 MAYBE_ServerRedirectSingleProcess) {
413 // Set max renderers to 1 to force running out of processes. 426 // Set max renderers to 1 to force running out of processes.
414 content::RenderProcessHost::SetMaxRendererProcessCount(1); 427 content::RenderProcessHost::SetMaxRendererProcessCount(1);
415 428
416 // Wait for the extension to set itself up and return control to us. 429 // Wait for the extension to set itself up and return control to us.
(...skipping 15 matching lines...) Expand all
432 url = GURL(base::StringPrintf( 445 url = GURL(base::StringPrintf(
433 "http://www.b.com:%d/server-redirect?http://www.b.com:%d/", 446 "http://www.b.com:%d/server-redirect?http://www.b.com:%d/",
434 test_server()->host_port_pair().port(), 447 test_server()->host_port_pair().port(),
435 test_server()->host_port_pair().port())); 448 test_server()->host_port_pair().port()));
436 449
437 ui_test_utils::NavigateToURL(browser(), url); 450 ui_test_utils::NavigateToURL(browser(), url);
438 451
439 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 452 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
440 } 453 }
441 454
442 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ForwardBack) { 455 // http://crbug.com/238737
456 #if defined(OS_WIN)
457 #define MAYBE_ForwardBack DISABLED_ForwardBack
458 #else
459 #define MAYBE_ForwardBack ForwardBack
460 #endif
461 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_ForwardBack) {
443 ASSERT_TRUE( 462 ASSERT_TRUE(
444 RunExtensionSubtest("webnavigation", "test_forwardBack.html")) 463 RunExtensionSubtest("webnavigation", "test_forwardBack.html"))
445 << message_; 464 << message_;
446 } 465 }
447 466
448 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, IFrame) { 467 // http://crbug.com/238737
468 #if defined(OS_WIN)
469 #define MAYBE_IFrame DISABLED_IFrame
470 #else
471 #define MAYBE_IFrame IFrame
472 #endif
473 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_IFrame) {
449 ASSERT_TRUE( 474 ASSERT_TRUE(
450 RunExtensionSubtest("webnavigation", "test_iframe.html")) << message_; 475 RunExtensionSubtest("webnavigation", "test_iframe.html")) << message_;
451 } 476 }
452 477
453 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, SrcDoc) { 478 // http://crbug.com/238737
479 #if defined(OS_WIN)
480 #define MAYBE_SrcDoc DISABLED_SrcDoc
481 #else
482 #define MAYBE_SrcDoc SrcDoc
483 #endif
484 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_SrcDoc) {
454 ASSERT_TRUE( 485 ASSERT_TRUE(
455 RunExtensionSubtest("webnavigation", "test_srcdoc.html")) << message_; 486 RunExtensionSubtest("webnavigation", "test_srcdoc.html")) << message_;
456 } 487 }
457 488
458 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, OpenTab) { 489 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, OpenTab) {
459 ASSERT_TRUE( 490 ASSERT_TRUE(
460 RunExtensionSubtest("webnavigation", "test_openTab.html")) << message_; 491 RunExtensionSubtest("webnavigation", "test_openTab.html")) << message_;
461 } 492 }
462 493
463 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ReferenceFragment) { 494 // http://crbug.com/238737
495 #if defined(OS_WIN)
496 #define MAYBE_ReferenceFragment DISABLED_ReferenceFragment
497 #else
498 #define MAYBE_ReferenceFragment ReferenceFragment
499 #endif
500 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_ReferenceFragment) {
464 ASSERT_TRUE( 501 ASSERT_TRUE(
465 RunExtensionSubtest("webnavigation", "test_referenceFragment.html")) 502 RunExtensionSubtest("webnavigation", "test_referenceFragment.html"))
466 << message_; 503 << message_;
467 } 504 }
468 505
469 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, SimpleLoad) { 506 // http://crbug.com/238737
507 #if defined(OS_WIN)
508 #define MAYBE_SimpleLoad DISABLED_SimpleLoad
509 #else
510 #define MAYBE_SimpleLoad SimpleLoad
511 #endif
512 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_SimpleLoad) {
470 ASSERT_TRUE( 513 ASSERT_TRUE(
471 RunExtensionSubtest("webnavigation", "test_simpleLoad.html")) << message_; 514 RunExtensionSubtest("webnavigation", "test_simpleLoad.html")) << message_;
472 } 515 }
473 516
474 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Failures) { 517 // http://crbug.com/238737
518 #if defined(OS_WIN)
519 #define MAYBE_Failures DISABLED_Failures
520 #else
521 #define MAYBE_Failures Failures
522 #endif
523 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_Failures) {
475 ASSERT_TRUE( 524 ASSERT_TRUE(
476 RunExtensionSubtest("webnavigation", "test_failures.html")) << message_; 525 RunExtensionSubtest("webnavigation", "test_failures.html")) << message_;
477 } 526 }
478 527
479 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, FilteredTest) { 528 // http://crbug.com/238737
529 #if defined(OS_WIN)
530 #define MAYBE_FilteredTest DISABLED_FilteredTest
531 #else
532 #define MAYBE_FilteredTest FilteredTest
533 #endif
534 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_FilteredTest) {
480 ASSERT_TRUE( 535 ASSERT_TRUE(
481 RunExtensionSubtest("webnavigation", "test_filtered.html")) << message_; 536 RunExtensionSubtest("webnavigation", "test_filtered.html")) << message_;
482 } 537 }
483 538
484 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, UserAction) { 539 // http://crbug.com/238737
540 #if defined(OS_WIN)
541 #define MAYBE_UserAction DISABLED_UserAction
542 #else
543 #define MAYBE_UserAction UserAction
544 #endif
545 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_UserAction) {
485 // Wait for the extension to set itself up and return control to us. 546 // Wait for the extension to set itself up and return control to us.
486 ASSERT_TRUE( 547 ASSERT_TRUE(
487 RunExtensionSubtest("webnavigation", "test_userAction.html")) << message_; 548 RunExtensionSubtest("webnavigation", "test_userAction.html")) << message_;
488 549
489 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 550 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
490 content::WaitForLoadStop(tab); 551 content::WaitForLoadStop(tab);
491 552
492 ResultCatcher catcher; 553 ResultCatcher catcher;
493 554
494 ExtensionService* service = extensions::ExtensionSystem::Get( 555 ExtensionService* service = extensions::ExtensionSystem::Get(
(...skipping 13 matching lines...) Expand all
508 frame_navigation_state().GetMainFrameID().frame_num; 569 frame_navigation_state().GetMainFrameID().frame_num;
509 params.link_url = extension->GetResourceURL("userAction/b.html"); 570 params.link_url = extension->GetResourceURL("userAction/b.html");
510 571
511 TestRenderViewContextMenu menu(tab, params); 572 TestRenderViewContextMenu menu(tab, params);
512 menu.Init(); 573 menu.Init();
513 menu.ExecuteCommand(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB, 0); 574 menu.ExecuteCommand(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB, 0);
514 575
515 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 576 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
516 } 577 }
517 578
518 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, RequestOpenTab) { 579 // http://crbug.com/238737
580 #if defined(OS_WIN)
581 #define MAYBE_RequestOpenTab DISABLED_RequestOpenTab
582 #else
583 #define MAYBE_RequestOpenTab RequestOpenTab
584 #endif
585 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_RequestOpenTab) {
519 // Wait for the extension to set itself up and return control to us. 586 // Wait for the extension to set itself up and return control to us.
520 ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_requestOpenTab.html")) 587 ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_requestOpenTab.html"))
521 << message_; 588 << message_;
522 589
523 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 590 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
524 content::WaitForLoadStop(tab); 591 content::WaitForLoadStop(tab);
525 592
526 ResultCatcher catcher; 593 ResultCatcher catcher;
527 594
528 ExtensionService* service = extensions::ExtensionSystem::Get( 595 ExtensionService* service = extensions::ExtensionSystem::Get(
(...skipping 11 matching lines...) Expand all
540 mouse_event.x = 7; 607 mouse_event.x = 7;
541 mouse_event.y = 7; 608 mouse_event.y = 7;
542 mouse_event.clickCount = 1; 609 mouse_event.clickCount = 1;
543 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); 610 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
544 mouse_event.type = WebKit::WebInputEvent::MouseUp; 611 mouse_event.type = WebKit::WebInputEvent::MouseUp;
545 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); 612 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
546 613
547 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 614 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
548 } 615 }
549 616
550 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlank) { 617 // http://crbug.com/238737
618 #if defined(OS_WIN)
619 #define MAYBE_TargetBlank DISABLED_TargetBlank
620 #else
621 #define MAYBE_TargetBlank TargetBlank
622 #endif
623 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_TargetBlank) {
551 // Wait for the extension to set itself up and return control to us. 624 // Wait for the extension to set itself up and return control to us.
552 ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_targetBlank.html")) 625 ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_targetBlank.html"))
553 << message_; 626 << message_;
554 627
555 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 628 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
556 content::WaitForLoadStop(tab); 629 content::WaitForLoadStop(tab);
557 630
558 ResultCatcher catcher; 631 ResultCatcher catcher;
559 632
560 GURL url = test_server()->GetURL( 633 GURL url = test_server()->GetURL(
(...skipping 10 matching lines...) Expand all
571 mouse_event.x = 7; 644 mouse_event.x = 7;
572 mouse_event.y = 7; 645 mouse_event.y = 7;
573 mouse_event.clickCount = 1; 646 mouse_event.clickCount = 1;
574 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); 647 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
575 mouse_event.type = WebKit::WebInputEvent::MouseUp; 648 mouse_event.type = WebKit::WebInputEvent::MouseUp;
576 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); 649 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
577 650
578 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 651 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
579 } 652 }
580 653
581 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlankIncognito) { 654 // http://crbug.com/238737
655 #if defined(OS_WIN)
656 #define MAYBE_TargetBlankIncognito DISABLED_TargetBlankIncognito
657 #else
658 #define MAYBE_TargetBlankIncognito TargetBlankIncognito
659 #endif
660 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_TargetBlankIncognito) {
582 // Wait for the extension to set itself up and return control to us. 661 // Wait for the extension to set itself up and return control to us.
583 ASSERT_TRUE(RunExtensionSubtest( 662 ASSERT_TRUE(RunExtensionSubtest(
584 "webnavigation", "test_targetBlank.html", 663 "webnavigation", "test_targetBlank.html",
585 ExtensionApiTest::kFlagEnableIncognito)) << message_; 664 ExtensionApiTest::kFlagEnableIncognito)) << message_;
586 665
587 ResultCatcher catcher; 666 ResultCatcher catcher;
588 667
589 GURL url = test_server()->GetURL( 668 GURL url = test_server()->GetURL(
590 "files/extensions/api_test/webnavigation/targetBlank/a.html"); 669 "files/extensions/api_test/webnavigation/targetBlank/a.html");
591 670
592 Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord( 671 Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
593 browser()->profile(), url); 672 browser()->profile(), url);
594 WebContents* tab = otr_browser->tab_strip_model()->GetActiveWebContents(); 673 WebContents* tab = otr_browser->tab_strip_model()->GetActiveWebContents();
595 674
596 // There's a link with target=_blank on a.html. Click on it to open it in a 675 // There's a link with target=_blank on a.html. Click on it to open it in a
597 // new tab. 676 // new tab.
598 WebKit::WebMouseEvent mouse_event; 677 WebKit::WebMouseEvent mouse_event;
599 mouse_event.type = WebKit::WebInputEvent::MouseDown; 678 mouse_event.type = WebKit::WebInputEvent::MouseDown;
600 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; 679 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft;
601 mouse_event.x = 7; 680 mouse_event.x = 7;
602 mouse_event.y = 7; 681 mouse_event.y = 7;
603 mouse_event.clickCount = 1; 682 mouse_event.clickCount = 1;
604 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); 683 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
605 mouse_event.type = WebKit::WebInputEvent::MouseUp; 684 mouse_event.type = WebKit::WebInputEvent::MouseUp;
606 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); 685 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
607 686
608 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 687 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
609 } 688 }
610 689
611 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { 690 // http://crbug.com/238737
691 #if defined(OS_WIN)
692 #define MAYBE_History DISABLED_History
693 #else
694 #define MAYBE_History History
695 #endif
696 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_History) {
612 ASSERT_TRUE( 697 ASSERT_TRUE(
613 RunExtensionSubtest("webnavigation", "test_history.html")) 698 RunExtensionSubtest("webnavigation", "test_history.html"))
614 << message_; 699 << message_;
615 } 700 }
616 701
617 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcess) { 702 // http://crbug.com/238737
703 #if defined(OS_WIN)
704 #define MAYBE_CrossProcess DISABLED_CrossProcess
705 #else
706 #define MAYBE_CrossProcess CrossProcess
707 #endif
708 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_CrossProcess) {
618 LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app")); 709 LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app"));
619 LoadExtension(test_data_dir_.AppendASCII("webnavigation")); 710 LoadExtension(test_data_dir_.AppendASCII("webnavigation"));
620 711
621 ExtensionService* service = extensions::ExtensionSystem::Get( 712 ExtensionService* service = extensions::ExtensionSystem::Get(
622 browser()->profile())->extension_service(); 713 browser()->profile())->extension_service();
623 const extensions::Extension* extension = 714 const extensions::Extension* extension =
624 service->GetExtensionById(last_loaded_extension_id_, false); 715 service->GetExtensionById(last_loaded_extension_id_, false);
625 716
626 // See crossProcess/d.html. 717 // See crossProcess/d.html.
627 DelayLoadStartAndExecuteJavascript call_script( 718 DelayLoadStartAndExecuteJavascript call_script(
628 test_navigation_listener(), 719 test_navigation_listener(),
629 test_server()->GetURL("test1"), 720 test_server()->GetURL("test1"),
630 "navigate2()", 721 "navigate2()",
631 extension->GetResourceURL("crossProcess/empty.html")); 722 extension->GetResourceURL("crossProcess/empty.html"));
632 723
633 ASSERT_TRUE(RunPageTest( 724 ASSERT_TRUE(RunPageTest(
634 extension->GetResourceURL("test_crossProcess.html").spec())) 725 extension->GetResourceURL("test_crossProcess.html").spec()))
635 << message_; 726 << message_;
636 } 727 }
637 728
638 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessFragment) { 729 // http://crbug.com/238737
730 #if defined(OS_WIN)
731 #define MAYBE_CrossProcessFragment DISABLED_CrossProcessFragment
732 #else
733 #define MAYBE_CrossProcessFragment CrossProcessFragment
734 #endif
735 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_CrossProcessFragment) {
639 LoadExtension(test_data_dir_.AppendASCII("webnavigation")); 736 LoadExtension(test_data_dir_.AppendASCII("webnavigation"));
640 737
641 ExtensionService* service = extensions::ExtensionSystem::Get( 738 ExtensionService* service = extensions::ExtensionSystem::Get(
642 browser()->profile())->extension_service(); 739 browser()->profile())->extension_service();
643 const extensions::Extension* extension = 740 const extensions::Extension* extension =
644 service->GetExtensionById(last_loaded_extension_id_, false); 741 service->GetExtensionById(last_loaded_extension_id_, false);
645 742
646 // See crossProcess/f.html. 743 // See crossProcess/f.html.
647 DelayLoadStartAndExecuteJavascript call_script3( 744 DelayLoadStartAndExecuteJavascript call_script3(
648 test_navigation_listener(), 745 test_navigation_listener(),
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 url = GURL(base::StringPrintf( 818 url = GURL(base::StringPrintf(
722 "http://www.a.com:%d/" 819 "http://www.a.com:%d/"
723 "files/extensions/api_test/webnavigation/crash/b.html", 820 "files/extensions/api_test/webnavigation/crash/b.html",
724 test_server()->host_port_pair().port())); 821 test_server()->host_port_pair().port()));
725 ui_test_utils::NavigateToURL(browser(), url); 822 ui_test_utils::NavigateToURL(browser(), url);
726 823
727 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 824 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
728 } 825 }
729 826
730 } // namespace extensions 827 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698