| 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/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 529 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
| 530 | 530 |
| 531 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 531 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 532 } | 532 } |
| 533 | 533 |
| 534 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { | 534 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { |
| 535 ASSERT_TRUE(StartEmbeddedTestServer()); | 535 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 536 ASSERT_TRUE(RunExtensionTest("webnavigation/history")) << message_; | 536 ASSERT_TRUE(RunExtensionTest("webnavigation/history")) << message_; |
| 537 } | 537 } |
| 538 | 538 |
| 539 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcess) { | 539 // Disabled because of http://crbug.com/444717 |
| 540 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_CrossProcess) { |
| 540 ASSERT_TRUE(StartEmbeddedTestServer()); | 541 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 541 | 542 |
| 542 LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app")); | 543 LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app")); |
| 543 | 544 |
| 544 // See crossProcess/d.html. | 545 // See crossProcess/d.html. |
| 545 DelayLoadStartAndExecuteJavascript call_script( | 546 DelayLoadStartAndExecuteJavascript call_script( |
| 546 test_navigation_listener(), | 547 test_navigation_listener(), |
| 547 embedded_test_server()->GetURL("/test1"), | 548 embedded_test_server()->GetURL("/test1"), |
| 548 "navigate2()", | 549 "navigate2()", |
| 549 "empty.html"); | 550 "empty.html"); |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 "extensions/api_test/webnavigation/crash/b.html", | 627 "extensions/api_test/webnavigation/crash/b.html", |
| 627 embedded_test_server()->port())); | 628 embedded_test_server()->port())); |
| 628 ui_test_utils::NavigateToURL(browser(), url); | 629 ui_test_utils::NavigateToURL(browser(), url); |
| 629 | 630 |
| 630 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 631 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 631 } | 632 } |
| 632 | 633 |
| 633 #endif | 634 #endif |
| 634 | 635 |
| 635 } // namespace extensions | 636 } // namespace extensions |
| OLD | NEW |