Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: chrome/browser/sessions/session_restore_browsertest.cc

Issue 1697183003: Remove HostDesktopType from sessions and tab restore (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-19
Patch Set: mac Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sessions/session_restore_browsertest.cc
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index a53647572c2f461cd06d90be1a148679c320764e..80f41907f27fd79e9824048a571d6cbb24fc2d8e 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -537,8 +537,6 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) {
TabRestoreServiceFactory::GetForProfile(browser()->profile());
service->ClearEntries();
- chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
-
browser()->window()->Close();
// Expect a window with three tabs.
@@ -560,7 +558,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) {
timestamp = tab.navigations[0].timestamp();
http_status_code = tab.navigations[0].http_status_code();
std::vector<sessions::LiveTab*> content =
- service->RestoreEntryById(NULL, tab.id, host_desktop_type, UNKNOWN);
+ service->RestoreEntryById(NULL, tab.id, UNKNOWN);
ASSERT_EQ(1U, content.size());
sessions::ContentLiveTab* live_tab =
static_cast<sessions::ContentLiveTab*>(content[0]);
@@ -611,8 +609,6 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, MAYBE_WindowWithOneTab) {
service->ClearEntries();
EXPECT_EQ(0U, service->entries().size());
- chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
-
// Close the window.
browser()->window()->Close();
@@ -625,7 +621,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, MAYBE_WindowWithOneTab) {
// Restore the tab.
std::vector<sessions::LiveTab*> content =
- service->RestoreEntryById(NULL, tab->id, host_desktop_type, UNKNOWN);
+ service->RestoreEntryById(NULL, tab->id, UNKNOWN);
ASSERT_EQ(1U, content.size());
ASSERT_TRUE(content[0]);
EXPECT_EQ(url, static_cast<sessions::ContentLiveTab*>(content[0])
« no previous file with comments | « chrome/browser/sessions/chrome_tab_restore_service_client.cc ('k') | chrome/browser/ui/ash/chrome_new_window_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698