| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/process/launch.h" | 9 #include "base/process/launch.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 // open. | 213 // open. |
| 214 CloseBrowserSynchronously(browser()); | 214 CloseBrowserSynchronously(browser()); |
| 215 | 215 |
| 216 // Create a new window, which should open NTP. | 216 // Create a new window, which should open NTP. |
| 217 ui_test_utils::BrowserAddedObserver browser_added_observer; | 217 ui_test_utils::BrowserAddedObserver browser_added_observer; |
| 218 chrome::NewWindow(incognito_browser); | 218 chrome::NewWindow(incognito_browser); |
| 219 Browser* new_browser = browser_added_observer.WaitForSingleNewBrowser(); | 219 Browser* new_browser = browser_added_observer.WaitForSingleNewBrowser(); |
| 220 | 220 |
| 221 ASSERT_TRUE(new_browser); | 221 ASSERT_TRUE(new_browser); |
| 222 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); | 222 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); |
| 223 EXPECT_TRUE(chrome::IsNTPURL( | 223 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), |
| 224 new_browser->tab_strip_model()->GetWebContentsAt(0)->GetURL(), | 224 new_browser->tab_strip_model()->GetWebContentsAt(0)->GetURL()); |
| 225 new_browser->profile())); | |
| 226 } | 225 } |
| 227 | 226 |
| 228 // Test that maximized applications get restored maximized. | 227 // Test that maximized applications get restored maximized. |
| 229 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, MaximizedApps) { | 228 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, MaximizedApps) { |
| 230 const char* app_name = "TestApp"; | 229 const char* app_name = "TestApp"; |
| 231 Browser* app_browser = CreateBrowserForApp(app_name, browser()->profile()); | 230 Browser* app_browser = CreateBrowserForApp(app_name, browser()->profile()); |
| 232 app_browser->window()->Maximize(); | 231 app_browser->window()->Maximize(); |
| 233 app_browser->window()->Show(); | 232 app_browser->window()->Show(); |
| 234 EXPECT_TRUE(app_browser->window()->IsMaximized()); | 233 EXPECT_TRUE(app_browser->window()->IsMaximized()); |
| 235 EXPECT_TRUE(app_browser->is_app()); | 234 EXPECT_TRUE(app_browser->is_app()); |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 643 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); | 642 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); |
| 644 ASSERT_EQ(1u, active_browser_list_->size()); | 643 ASSERT_EQ(1u, active_browser_list_->size()); |
| 645 ASSERT_EQ(url2_, | 644 ASSERT_EQ(url2_, |
| 646 new_browser->tab_strip_model()->GetActiveWebContents()->GetURL()); | 645 new_browser->tab_strip_model()->GetActiveWebContents()->GetURL()); |
| 647 GoBack(new_browser); | 646 GoBack(new_browser); |
| 648 ASSERT_EQ(url1_, | 647 ASSERT_EQ(url1_, |
| 649 new_browser->tab_strip_model()->GetActiveWebContents()->GetURL()); | 648 new_browser->tab_strip_model()->GetActiveWebContents()->GetURL()); |
| 650 } | 649 } |
| 651 | 650 |
| 652 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreWebUI) { | 651 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreWebUI) { |
| 653 const GURL webui_url("chrome://newtab"); | 652 const GURL webui_url("chrome://omnibox"); |
| 654 ui_test_utils::NavigateToURL(browser(), webui_url); | 653 ui_test_utils::NavigateToURL(browser(), webui_url); |
| 655 const content::WebContents* old_tab = | 654 const content::WebContents* old_tab = |
| 656 browser()->tab_strip_model()->GetActiveWebContents(); | 655 browser()->tab_strip_model()->GetActiveWebContents(); |
| 657 EXPECT_EQ(content::BINDINGS_POLICY_WEB_UI, | 656 EXPECT_EQ(content::BINDINGS_POLICY_WEB_UI, |
| 658 old_tab->GetRenderViewHost()->GetEnabledBindings()); | 657 old_tab->GetRenderViewHost()->GetEnabledBindings()); |
| 659 | 658 |
| 660 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); | 659 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); |
| 661 ASSERT_EQ(1u, active_browser_list_->size()); | 660 ASSERT_EQ(1u, active_browser_list_->size()); |
| 662 const content::WebContents* new_tab = | 661 const content::WebContents* new_tab = |
| 663 new_browser->tab_strip_model()->GetActiveWebContents(); | 662 new_browser->tab_strip_model()->GetActiveWebContents(); |
| (...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1150 content::NavigationController* controller = | 1149 content::NavigationController* controller = |
| 1151 &browser()->tab_strip_model()->GetActiveWebContents()->GetController(); | 1150 &browser()->tab_strip_model()->GetActiveWebContents()->GetController(); |
| 1152 EXPECT_TRUE( | 1151 EXPECT_TRUE( |
| 1153 controller->GetDefaultSessionStorageNamespace()->should_persist()); | 1152 controller->GetDefaultSessionStorageNamespace()->should_persist()); |
| 1154 | 1153 |
| 1155 // Quit and restore. Check that no extra tabs were created. | 1154 // Quit and restore. Check that no extra tabs were created. |
| 1156 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); | 1155 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); |
| 1157 ASSERT_EQ(1u, active_browser_list_->size()); | 1156 ASSERT_EQ(1u, active_browser_list_->size()); |
| 1158 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); | 1157 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); |
| 1159 } | 1158 } |
| OLD | NEW |