| 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/defaults.h" | 8 #include "chrome/browser/defaults.h" |
| 9 #include "chrome/browser/first_run/first_run.h" | 9 #include "chrome/browser/first_run/first_run.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 FilePath(kTitle1File))); | 130 FilePath(kTitle1File))); |
| 131 ui_test_utils::NavigateToURL(browser(), url); | 131 ui_test_utils::NavigateToURL(browser(), url); |
| 132 | 132 |
| 133 // Turn on session restore. | 133 // Turn on session restore. |
| 134 SessionStartupPref::SetStartupPref( | 134 SessionStartupPref::SetStartupPref( |
| 135 browser()->profile(), | 135 browser()->profile(), |
| 136 SessionStartupPref(SessionStartupPref::LAST)); | 136 SessionStartupPref(SessionStartupPref::LAST)); |
| 137 | 137 |
| 138 // Create a new popup. | 138 // Create a new popup. |
| 139 Profile* profile = browser()->profile(); | 139 Profile* profile = browser()->profile(); |
| 140 Browser* popup = Browser::CreateForType(Browser::TYPE_POPUP, profile); | 140 Browser* popup = Browser::CreateWithParams( |
| 141 Browser::CreateParams(Browser::TYPE_POPUP, profile)); |
| 141 popup->window()->Show(); | 142 popup->window()->Show(); |
| 142 | 143 |
| 143 // Close the browser. | 144 // Close the browser. |
| 144 CloseBrowserSynchronously(browser()); | 145 CloseBrowserSynchronously(browser()); |
| 145 | 146 |
| 146 // Create a new window, which should trigger session restore. | 147 // Create a new window, which should trigger session restore. |
| 147 ui_test_utils::BrowserAddedObserver observer; | 148 ui_test_utils::BrowserAddedObserver observer; |
| 148 popup->NewWindow(); | 149 popup->NewWindow(); |
| 149 Browser* new_browser = observer.WaitForSingleNewBrowser(); | 150 Browser* new_browser = observer.WaitForSingleNewBrowser(); |
| 150 | 151 |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 | 332 |
| 332 // Restore in a new window. | 333 // Restore in a new window. |
| 333 ui_test_utils::BrowserAddedObserver browser_observer; | 334 ui_test_utils::BrowserAddedObserver browser_observer; |
| 334 SessionRestore::RestoreForeignSessionTab(profile, tab, NEW_WINDOW); | 335 SessionRestore::RestoreForeignSessionTab(profile, tab, NEW_WINDOW); |
| 335 Browser* new_browser = browser_observer.WaitForSingleNewBrowser(); | 336 Browser* new_browser = browser_observer.WaitForSingleNewBrowser(); |
| 336 | 337 |
| 337 ASSERT_EQ(1, new_browser->tab_count()); | 338 ASSERT_EQ(1, new_browser->tab_count()); |
| 338 VerifyNavigationEntries( | 339 VerifyNavigationEntries( |
| 339 new_browser->GetWebContentsAt(0)->GetController(), url1, url2); | 340 new_browser->GetWebContentsAt(0)->GetController(), url1, url2); |
| 340 } | 341 } |
| OLD | NEW |