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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/defaults.h" | 9 #include "chrome/browser/defaults.h" |
10 #include "chrome/browser/first_run/first_run.h" | 10 #include "chrome/browser/first_run/first_run.h" |
11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
13 #include "chrome/browser/sessions/session_restore.h" | 13 #include "chrome/browser/sessions/session_restore.h" |
14 #include "chrome/browser/sessions/session_service.h" | 14 #include "chrome/browser/sessions/session_service.h" |
15 #include "chrome/browser/sessions/session_service_factory.h" | 15 #include "chrome/browser/sessions/session_service_factory.h" |
16 #include "chrome/browser/sessions/session_service_test_helper.h" | 16 #include "chrome/browser/sessions/session_service_test_helper.h" |
17 #include "chrome/browser/sessions/session_types.h" | 17 #include "chrome/browser/sessions/session_types.h" |
18 #include "chrome/browser/sessions/session_types_test_helper.h" | 18 #include "chrome/browser/sessions/session_types_test_helper.h" |
19 #include "chrome/browser/sessions/tab_restore_service.h" | 19 #include "chrome/browser/sessions/tab_restore_service.h" |
20 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 20 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
21 #include "chrome/browser/ui/browser.h" | 21 #include "chrome/browser/ui/browser.h" |
22 #include "chrome/browser/ui/browser_commands.h" | 22 #include "chrome/browser/ui/browser_commands.h" |
23 #include "chrome/browser/ui/browser_list.h" | 23 #include "chrome/browser/ui/browser_list.h" |
24 #include "chrome/browser/ui/browser_tabstrip.h" | 24 #include "chrome/browser/ui/browser_tabstrip.h" |
25 #include "chrome/browser/ui/browser_window.h" | 25 #include "chrome/browser/ui/browser_window.h" |
| 26 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
26 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 27 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
27 #include "chrome/common/chrome_notification_types.h" | 28 #include "chrome/common/chrome_notification_types.h" |
28 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
29 #include "chrome/common/url_constants.h" | 30 #include "chrome/common/url_constants.h" |
30 #include "chrome/test/base/in_process_browser_test.h" | 31 #include "chrome/test/base/in_process_browser_test.h" |
31 #include "chrome/test/base/ui_test_utils.h" | 32 #include "chrome/test/base/ui_test_utils.h" |
32 #include "content/public/browser/navigation_controller.h" | 33 #include "content/public/browser/navigation_controller.h" |
33 #include "content/public/browser/navigation_entry.h" | 34 #include "content/public/browser/navigation_entry.h" |
34 #include "content/public/browser/notification_service.h" | 35 #include "content/public/browser/notification_service.h" |
35 #include "content/public/browser/notification_types.h" | 36 #include "content/public/browser/notification_types.h" |
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
845 ASSERT_EQ(1u, BrowserList::size()); | 846 ASSERT_EQ(1u, BrowserList::size()); |
846 ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); | 847 ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); |
847 content::NavigationController* new_controller = | 848 content::NavigationController* new_controller = |
848 &chrome::GetActiveWebContents(new_browser)->GetController(); | 849 &chrome::GetActiveWebContents(new_browser)->GetController(); |
849 ASSERT_TRUE(new_controller->GetDefaultSessionStorageNamespace()); | 850 ASSERT_TRUE(new_controller->GetDefaultSessionStorageNamespace()); |
850 std::string restored_session_storage_persistent_id = | 851 std::string restored_session_storage_persistent_id = |
851 new_controller->GetDefaultSessionStorageNamespace()->persistent_id(); | 852 new_controller->GetDefaultSessionStorageNamespace()->persistent_id(); |
852 EXPECT_EQ(session_storage_persistent_id, | 853 EXPECT_EQ(session_storage_persistent_id, |
853 restored_session_storage_persistent_id); | 854 restored_session_storage_persistent_id); |
854 } | 855 } |
| 856 |
| 857 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorageAfterTabReplace) { |
| 858 // Simulate what prerendering does: create a new TabContents with the same |
| 859 // SessionStorageNamespace as an existing tab, then replace the tab with it. |
| 860 { |
| 861 content::NavigationController* controller = |
| 862 &chrome::GetActiveWebContents(browser())->GetController(); |
| 863 ASSERT_TRUE(controller->GetDefaultSessionStorageNamespace()); |
| 864 |
| 865 content::SessionStorageNamespaceMap session_storage_namespace_map; |
| 866 session_storage_namespace_map[""] = |
| 867 controller->GetDefaultSessionStorageNamespace(); |
| 868 scoped_ptr<content::WebContents> web_contents( |
| 869 content::WebContents::CreateWithSessionStorage( |
| 870 browser()->profile(), NULL, MSG_ROUTING_NONE, NULL, |
| 871 session_storage_namespace_map)); |
| 872 |
| 873 TabStripModel* tab_strip_model = browser()->tab_strip_model(); |
| 874 // We only need to create a TabContents because ReplaceTabContentsAt wants |
| 875 // one. We don't need any of the helpers TabContents provides. |
| 876 scoped_ptr<TabContents> old_tab_contents( |
| 877 tab_strip_model->ReplaceTabContentsAt( |
| 878 tab_strip_model->active_index(), |
| 879 TabContents::Factory::CreateTabContents(web_contents.release()))); |
| 880 // Navigate with the new tab. |
| 881 ui_test_utils::NavigateToURL(browser(), url2_); |
| 882 // old_tab_contents goes out of scope. |
| 883 } |
| 884 |
| 885 // Check that the sessionStorage data is going to be persisted. |
| 886 content::NavigationController* controller = |
| 887 &chrome::GetActiveWebContents(browser())->GetController(); |
| 888 EXPECT_TRUE( |
| 889 controller->GetDefaultSessionStorageNamespace()->should_persist()); |
| 890 |
| 891 // Quit and restore. Check that no extra tabs were created. |
| 892 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); |
| 893 ASSERT_EQ(1u, BrowserList::size()); |
| 894 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); |
| 895 } |
OLD | NEW |