| 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 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 601 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 601 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
| 602 | 602 |
| 603 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 603 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 604 } | 604 } |
| 605 | 605 |
| 606 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { | 606 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { |
| 607 ASSERT_TRUE(StartEmbeddedTestServer()); | 607 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 608 ASSERT_TRUE(RunExtensionTest("webnavigation/history")) << message_; | 608 ASSERT_TRUE(RunExtensionTest("webnavigation/history")) << message_; |
| 609 } | 609 } |
| 610 | 610 |
| 611 // Disabled because of http://crbug.com/467483 | 611 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcess) { |
| 612 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_CrossProcess) { | |
| 613 ASSERT_TRUE(StartEmbeddedTestServer()); | 612 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 614 | 613 |
| 615 LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app")); | 614 LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app")); |
| 616 | 615 |
| 617 // See crossProcess/d.html. | 616 // See crossProcess/d.html. |
| 618 DelayLoadStartAndExecuteJavascript call_script( | 617 DelayLoadStartAndExecuteJavascript call_script( |
| 619 test_navigation_listener(), | 618 test_navigation_listener(), |
| 620 embedded_test_server()->GetURL("/test1"), | 619 embedded_test_server()->GetURL("/test1"), |
| 621 "navigate2()", | 620 "navigate2()", |
| 622 "empty.html"); | 621 "empty.html"); |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 "extensions/api_test/webnavigation/crash/b.html", | 753 "extensions/api_test/webnavigation/crash/b.html", |
| 755 embedded_test_server()->port())); | 754 embedded_test_server()->port())); |
| 756 ui_test_utils::NavigateToURL(browser(), url); | 755 ui_test_utils::NavigateToURL(browser(), url); |
| 757 | 756 |
| 758 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 757 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 759 } | 758 } |
| 760 | 759 |
| 761 #endif | 760 #endif |
| 762 | 761 |
| 763 } // namespace extensions | 762 } // namespace extensions |
| OLD | NEW |