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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 672083002: Refactoring of SessionService to get componentized. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing files. Created 6 years, 2 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
« no previous file with comments | « chrome/browser/sessions/session_service_test_helper.cc ('k') | chrome/browser/sessions/session_service_utils.h » ('j') | chrome/browser/sessions/session_service_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/session_service_unittest.cc
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index 64f6fd5871fe98e84d1b4e04824d77710c0a0bf8..c600b20240d3fbc3fe43ffecba3d59e15faf64d0 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -61,8 +61,7 @@ class SessionServiceTest : public BrowserWithTestWindowTest,
helper_.SetService(session_service);
- service()->SetWindowType(
- window_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
+ service()->SetWindowType(window_id, Browser::TYPE_TABBED, TYPE_NORMAL);
service()->SetWindowBounds(window_id,
window_bounds,
ui::SHOW_STATE_NORMAL);
@@ -155,8 +154,7 @@ class SessionServiceTest : public BrowserWithTestWindowTest,
UpdateNavigation(window_id, tab1_id, *nav1, true);
const gfx::Rect window2_bounds(3, 4, 5, 6);
- service()->SetWindowType(
- window2_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
+ service()->SetWindowType(window2_id, Browser::TYPE_TABBED, TYPE_NORMAL);
service()->SetWindowBounds(window2_id,
window2_bounds,
ui::SHOW_STATE_MAXIMIZED);
@@ -201,7 +199,7 @@ TEST_F(SessionServiceTest, Basic) {
ASSERT_EQ(0, windows[0]->selected_tab_index);
ASSERT_EQ(window_id.id(), windows[0]->window_id.id());
ASSERT_EQ(1U, windows[0]->tabs.size());
- ASSERT_EQ(Browser::TYPE_TABBED, windows[0]->type);
+ ASSERT_EQ(SessionWindow::TYPE_TABBED, windows[0]->type);
SessionTab* tab = windows[0]->tabs[0];
helper_.AssertTabEquals(window_id, tab_id, 0, 0, 1, *tab);
@@ -354,8 +352,7 @@ TEST_F(SessionServiceTest, WindowWithNoTabsGetsPruned) {
UpdateNavigation(window_id, tab1_id, nav1, true);
const gfx::Rect window2_bounds(3, 4, 5, 6);
- service()->SetWindowType(
- window2_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
+ service()->SetWindowType(window2_id, Browser::TYPE_TABBED, TYPE_NORMAL);
service()->SetWindowBounds(window2_id,
window2_bounds,
ui::SHOW_STATE_NORMAL);
@@ -449,8 +446,7 @@ TEST_F(SessionServiceTest, WindowCloseCommittedAfterNavigate) {
SessionID tab2_id;
ASSERT_NE(window2_id.id(), window_id.id());
- service()->SetWindowType(
- window2_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
+ service()->SetWindowType(window2_id, Browser::TYPE_TABBED, TYPE_NORMAL);
service()->SetWindowBounds(window2_id,
window_bounds,
ui::SHOW_STATE_NORMAL);
@@ -492,8 +488,7 @@ TEST_F(SessionServiceTest, IgnorePopups) {
SessionID tab2_id;
ASSERT_NE(window2_id.id(), window_id.id());
- service()->SetWindowType(
- window2_id, Browser::TYPE_POPUP, SessionService::TYPE_NORMAL);
+ service()->SetWindowType(window2_id, Browser::TYPE_POPUP, TYPE_NORMAL);
service()->SetWindowBounds(window2_id,
window_bounds,
ui::SHOW_STATE_NORMAL);
@@ -532,8 +527,7 @@ TEST_F(SessionServiceTest, RestoreApp) {
SessionID tab2_id;
ASSERT_NE(window2_id.id(), window_id.id());
- service()->SetWindowType(
- window2_id, Browser::TYPE_POPUP, SessionService::TYPE_APP);
+ service()->SetWindowType(window2_id, Browser::TYPE_POPUP, TYPE_APP);
service()->SetWindowBounds(window2_id,
window_bounds,
ui::SHOW_STATE_NORMAL);
@@ -556,7 +550,7 @@ TEST_F(SessionServiceTest, RestoreApp) {
ReadWindows(&(windows.get()), NULL);
ASSERT_EQ(2U, windows.size());
- int tabbed_index = windows[0]->type == Browser::TYPE_TABBED ?
+ int tabbed_index = windows[0]->type == SessionWindow::TYPE_TABBED ?
0 : 1;
int app_index = tabbed_index == 0 ? 1 : 0;
ASSERT_EQ(0, windows[tabbed_index]->selected_tab_index);
@@ -570,7 +564,7 @@ TEST_F(SessionServiceTest, RestoreApp) {
ASSERT_EQ(0, windows[app_index]->selected_tab_index);
ASSERT_EQ(window2_id.id(), windows[app_index]->window_id.id());
ASSERT_EQ(1U, windows[app_index]->tabs.size());
- ASSERT_TRUE(windows[app_index]->type == Browser::TYPE_POPUP);
+ ASSERT_TRUE(windows[app_index]->type == SessionWindow::TYPE_POPUP);
ASSERT_EQ("TestApp", windows[app_index]->app_name);
tab = windows[app_index]->tabs[0];
@@ -907,10 +901,8 @@ TEST_F(SessionServiceTest, RestoreActivation1) {
CreateAndWriteSessionWithTwoWindows(
window2_id, tab1_id, tab2_id, &nav1, &nav2);
- service()->ScheduleCommand(
- service()->CreateSetActiveWindowCommand(window2_id));
- service()->ScheduleCommand(
- service()->CreateSetActiveWindowCommand(window_id));
+ service()->ScheduleCommand(CreateSetActiveWindowCommand(window2_id));
+ service()->ScheduleCommand(CreateSetActiveWindowCommand(window_id));
ScopedVector<SessionWindow> windows;
SessionID::id_type active_window_id = 0;
@@ -930,12 +922,9 @@ TEST_F(SessionServiceTest, RestoreActivation2) {
CreateAndWriteSessionWithTwoWindows(
window2_id, tab1_id, tab2_id, &nav1, &nav2);
- service()->ScheduleCommand(
- service()->CreateSetActiveWindowCommand(window2_id));
- service()->ScheduleCommand(
- service()->CreateSetActiveWindowCommand(window_id));
- service()->ScheduleCommand(
- service()->CreateSetActiveWindowCommand(window2_id));
+ service()->ScheduleCommand(CreateSetActiveWindowCommand(window2_id));
+ service()->ScheduleCommand(CreateSetActiveWindowCommand(window_id));
+ service()->ScheduleCommand(CreateSetActiveWindowCommand(window2_id));
ScopedVector<SessionWindow> windows;
SessionID::id_type active_window_id = 0;
« no previous file with comments | « chrome/browser/sessions/session_service_test_helper.cc ('k') | chrome/browser/sessions/session_service_utils.h » ('j') | chrome/browser/sessions/session_service_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698