| 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 dd33e123c190560012e3f692644c7c854d52d617..7c28402cd924898e9c589406b16ab8c90ac0ab8c 100644
|
| --- a/chrome/browser/sessions/session_service_unittest.cc
|
| +++ b/chrome/browser/sessions/session_service_unittest.cc
|
| @@ -57,7 +57,8 @@ class SessionServiceTest : public BrowserWithTestWindowTest,
|
| window_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
|
| service()->SetWindowBounds(window_id,
|
| window_bounds,
|
| - ui::SHOW_STATE_NORMAL);
|
| + ui::SHOW_STATE_NORMAL,
|
| + false);
|
| }
|
|
|
| // Upon notification, increment the sync_save_count variable
|
| @@ -149,7 +150,8 @@ class SessionServiceTest : public BrowserWithTestWindowTest,
|
| window2_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
|
| service()->SetWindowBounds(window2_id,
|
| window2_bounds,
|
| - ui::SHOW_STATE_MAXIMIZED);
|
| + ui::SHOW_STATE_MAXIMIZED,
|
| + false);
|
| helper_.PrepareTabInWindow(window2_id, tab2_id, 0, true);
|
| UpdateNavigation(window2_id, tab2_id, *nav2, true);
|
|
|
| @@ -343,7 +345,8 @@ TEST_F(SessionServiceTest, WindowWithNoTabsGetsPruned) {
|
| window2_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
|
| service()->SetWindowBounds(window2_id,
|
| window2_bounds,
|
| - ui::SHOW_STATE_NORMAL);
|
| + ui::SHOW_STATE_NORMAL,
|
| + false);
|
| helper_.PrepareTabInWindow(window2_id, tab2_id, 0, true);
|
|
|
| ScopedVector<SessionWindow> windows;
|
| @@ -404,7 +407,8 @@ TEST_F(SessionServiceTest, WindowCloseCommittedAfterNavigate) {
|
| window2_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
|
| service()->SetWindowBounds(window2_id,
|
| window_bounds,
|
| - ui::SHOW_STATE_NORMAL);
|
| + ui::SHOW_STATE_NORMAL,
|
| + false);
|
|
|
| TabNavigation nav1 =
|
| SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
|
| @@ -448,7 +452,8 @@ TEST_F(SessionServiceTest, IgnorePopups) {
|
| window2_id, Browser::TYPE_POPUP, SessionService::TYPE_NORMAL);
|
| service()->SetWindowBounds(window2_id,
|
| window_bounds,
|
| - ui::SHOW_STATE_NORMAL);
|
| + ui::SHOW_STATE_NORMAL,
|
| + false);
|
|
|
| TabNavigation nav1 =
|
| SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
|
| @@ -488,7 +493,8 @@ TEST_F(SessionServiceTest, RestorePopup) {
|
| window2_id, Browser::TYPE_POPUP, SessionService::TYPE_NORMAL);
|
| service()->SetWindowBounds(window2_id,
|
| window_bounds,
|
| - ui::SHOW_STATE_NORMAL);
|
| + ui::SHOW_STATE_NORMAL,
|
| + false);
|
|
|
| TabNavigation nav1 =
|
| SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
|
| @@ -537,7 +543,8 @@ TEST_F(SessionServiceTest, RestoreApp) {
|
| window2_id, Browser::TYPE_POPUP, SessionService::TYPE_APP);
|
| service()->SetWindowBounds(window2_id,
|
| window_bounds,
|
| - ui::SHOW_STATE_NORMAL);
|
| + ui::SHOW_STATE_NORMAL,
|
| + false);
|
| service()->SetWindowAppName(window2_id, "TestApp");
|
|
|
| TabNavigation nav1 =
|
| @@ -745,7 +752,8 @@ TEST_F(SessionServiceTest, DontPersistDefault) {
|
| UpdateNavigation(window_id, tab_id, nav1, true);
|
| service()->SetWindowBounds(window_id,
|
| window_bounds,
|
| - ui::SHOW_STATE_DEFAULT);
|
| + ui::SHOW_STATE_DEFAULT,
|
| + false);
|
|
|
| ScopedVector<SessionWindow> windows;
|
| ReadWindows(&(windows.get()), NULL);
|
|
|