| 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/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/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 | 591 |
| 592 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 592 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 593 } | 593 } |
| 594 | 594 |
| 595 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { | 595 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { |
| 596 ASSERT_TRUE( | 596 ASSERT_TRUE( |
| 597 RunExtensionSubtest("webnavigation", "test_history.html")) | 597 RunExtensionSubtest("webnavigation", "test_history.html")) |
| 598 << message_; | 598 << message_; |
| 599 } | 599 } |
| 600 | 600 |
| 601 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcess) { | 601 // http://crbug.com/152000 |
| 602 #if defined(OS_WIN) |
| 603 #define MAYBE_CrossProcess DISABLED_CrossProcess |
| 604 #else |
| 605 #define MAYBE_CrossProcess CrossProcess |
| 606 #endif |
| 607 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_CrossProcess) { |
| 602 LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app")); | 608 LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app")); |
| 603 LoadExtension(test_data_dir_.AppendASCII("webnavigation")); | 609 LoadExtension(test_data_dir_.AppendASCII("webnavigation")); |
| 604 | 610 |
| 605 ExtensionService* service = browser()->profile()->GetExtensionService(); | 611 ExtensionService* service = browser()->profile()->GetExtensionService(); |
| 606 const extensions::Extension* extension = | 612 const extensions::Extension* extension = |
| 607 service->GetExtensionById(last_loaded_extension_id_, false); | 613 service->GetExtensionById(last_loaded_extension_id_, false); |
| 608 | 614 |
| 609 // See crossProcess/d.html. | 615 // See crossProcess/d.html. |
| 610 DelayLoadStartAndExecuteJavascript call_script( | 616 DelayLoadStartAndExecuteJavascript call_script( |
| 611 test_navigation_listener(), | 617 test_navigation_listener(), |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 test_server()->GetURL("test6"), | 657 test_server()->GetURL("test6"), |
| 652 "updateHistory()", | 658 "updateHistory()", |
| 653 extension->GetResourceURL("crossProcess/empty.html")); | 659 extension->GetResourceURL("crossProcess/empty.html")); |
| 654 | 660 |
| 655 ASSERT_TRUE(RunPageTest( | 661 ASSERT_TRUE(RunPageTest( |
| 656 extension->GetResourceURL("test_crossProcess.html").spec())) | 662 extension->GetResourceURL("test_crossProcess.html").spec())) |
| 657 << message_; | 663 << message_; |
| 658 } | 664 } |
| 659 | 665 |
| 660 } // namespace extensions | 666 } // namespace extensions |
| OLD | NEW |