| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/scoped_ptr.h" | 7 #include "base/scoped_ptr.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "chrome/app/chrome_dll_resource.h" | 9 #include "chrome/app/chrome_dll_resource.h" |
| 10 #include "chrome/browser/defaults.h" | 10 #include "chrome/browser/defaults.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 } | 138 } |
| 139 | 139 |
| 140 // Tests that the SiteInstances used for entries in a restored tab's history | 140 // Tests that the SiteInstances used for entries in a restored tab's history |
| 141 // are given appropriate max page IDs, so that going back to a restored | 141 // are given appropriate max page IDs, so that going back to a restored |
| 142 // cross-site page and then forward again works. (Bug 1204135) | 142 // cross-site page and then forward again works. (Bug 1204135) |
| 143 TEST_F(SessionRestoreUITest, RestoresCrossSiteForwardAndBackwardNavs) { | 143 TEST_F(SessionRestoreUITest, RestoresCrossSiteForwardAndBackwardNavs) { |
| 144 const wchar_t kDocRoot[] = L"chrome/test/data"; | 144 const wchar_t kDocRoot[] = L"chrome/test/data"; |
| 145 scoped_refptr<HTTPTestServer> server = | 145 scoped_refptr<HTTPTestServer> server = |
| 146 HTTPTestServer::CreateServer(kDocRoot, NULL); | 146 HTTPTestServer::CreateServer(kDocRoot, NULL); |
| 147 ASSERT_TRUE(NULL != server.get()); | 147 ASSERT_TRUE(NULL != server.get()); |
| 148 GURL cross_site_url(server->TestServerPageW(L"files/title2.html")); | 148 GURL cross_site_url(server->TestServerPage("files/title2.html")); |
| 149 | 149 |
| 150 // Visit URLs on different sites. | 150 // Visit URLs on different sites. |
| 151 NavigateToURL(url1_); | 151 NavigateToURL(url1_); |
| 152 NavigateToURL(cross_site_url); | 152 NavigateToURL(cross_site_url); |
| 153 NavigateToURL(url2_); | 153 NavigateToURL(url2_); |
| 154 | 154 |
| 155 scoped_refptr<TabProxy> active_tab(GetActiveTab()); | 155 scoped_refptr<TabProxy> active_tab(GetActiveTab()); |
| 156 ASSERT_TRUE(active_tab.get()); | 156 ASSERT_TRUE(active_tab.get()); |
| 157 ASSERT_TRUE(active_tab->GoBack()); | 157 ASSERT_TRUE(active_tab->GoBack()); |
| 158 | 158 |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 ASSERT_TRUE(tab_proxy.get() != NULL); | 472 ASSERT_TRUE(tab_proxy.get() != NULL); |
| 473 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); | 473 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); |
| 474 tab_proxy = browser_proxy->GetTab(tab_count - 1); | 474 tab_proxy = browser_proxy->GetTab(tab_count - 1); |
| 475 ASSERT_TRUE(tab_proxy.get() != NULL); | 475 ASSERT_TRUE(tab_proxy.get() != NULL); |
| 476 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); | 476 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); |
| 477 | 477 |
| 478 ASSERT_EQ(expected_process_count, GetBrowserProcessCount()); | 478 ASSERT_EQ(expected_process_count, GetBrowserProcessCount()); |
| 479 } | 479 } |
| 480 | 480 |
| 481 } // namespace | 481 } // namespace |
| OLD | NEW |