Index: components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc |
diff --git a/components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc b/components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc |
index e7b3181d3d32779b36d8108c1c0ae5515590bc99..fcb47df0837fa4df55545cd3421ed5b961773e6a 100644 |
--- a/components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc |
+++ b/components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc |
@@ -93,13 +93,14 @@ TEST_F(SessionsPageRevisitObserverTest, RunMatchersNoWindows) { |
TEST_F(SessionsPageRevisitObserverTest, RunMatchersNoTabs) { |
std::unique_ptr<SyncedSession> session = base::MakeUnique<SyncedSession>(); |
- session->windows[0] = base::MakeUnique<SessionWindow>(); |
+ session->windows[0] = base::MakeUnique<SyncedSessionWindow>(); |
CheckAndExpect(session.get(), GURL(kExampleUrl), false, false); |
} |
TEST_F(SessionsPageRevisitObserverTest, RunMatchersNoEntries) { |
- std::unique_ptr<SessionWindow> window = base::MakeUnique<SessionWindow>(); |
- window->tabs.push_back(base::MakeUnique<SessionTab>()); |
+ std::unique_ptr<SyncedSessionWindow> window = |
skym
2017/03/28 04:48:55
What do you think of using auto here? The right ha
Nicolas Zea
2017/03/29 19:01:33
Done.
|
+ base::MakeUnique<SyncedSessionWindow>(); |
+ window->wrapped_window.tabs.push_back(base::MakeUnique<SessionTab>()); |
std::unique_ptr<SyncedSession> session = base::MakeUnique<SyncedSession>(); |
session->windows[0] = std::move(window); |
CheckAndExpect(session.get(), GURL(kExampleUrl), false, false); |
@@ -111,8 +112,9 @@ TEST_F(SessionsPageRevisitObserverTest, RunMatchersSingle) { |
sessions::SerializedNavigationEntryTestHelper::CreateNavigation( |
kExampleUrl, "")); |
tab->current_navigation_index = 0; |
- std::unique_ptr<SessionWindow> window = base::MakeUnique<SessionWindow>(); |
- window->tabs.push_back(std::move(tab)); |
+ std::unique_ptr<SyncedSessionWindow> window = |
+ base::MakeUnique<SyncedSessionWindow>(); |
+ window->wrapped_window.tabs.push_back(std::move(tab)); |
std::unique_ptr<SyncedSession> session = base::MakeUnique<SyncedSession>(); |
session->windows[0] = std::move(window); |
CheckAndExpect(session.get(), GURL(kExampleUrl), true, false); |
@@ -127,8 +129,9 @@ TEST_F(SessionsPageRevisitObserverTest, RunMatchersFalseProvider) { |
sessions::SerializedNavigationEntryTestHelper::CreateNavigation( |
kExampleUrl, "")); |
tab->current_navigation_index = 1; |
- std::unique_ptr<SessionWindow> window = base::MakeUnique<SessionWindow>(); |
- window->tabs.push_back(std::move(tab)); |
+ std::unique_ptr<SyncedSessionWindow> window = |
+ base::MakeUnique<SyncedSessionWindow>(); |
+ window->wrapped_window.tabs.push_back(std::move(tab)); |
std::unique_ptr<SyncedSession> session = base::MakeUnique<SyncedSession>(); |
session->windows[0] = std::move(window); |
@@ -169,13 +172,16 @@ TEST_F(SessionsPageRevisitObserverTest, RunMatchersMany) { |
kDifferentUrl, "")); |
tab4->current_navigation_index = 1; |
- std::unique_ptr<SessionWindow> window1 = base::MakeUnique<SessionWindow>(); |
- window1->tabs.push_back(std::move(tab1)); |
- std::unique_ptr<SessionWindow> window2 = base::MakeUnique<SessionWindow>(); |
- window2->tabs.push_back(std::move(tab2)); |
- std::unique_ptr<SessionWindow> window3 = base::MakeUnique<SessionWindow>(); |
- window3->tabs.push_back(std::move(tab3)); |
- window3->tabs.push_back(std::move(tab4)); |
+ std::unique_ptr<SyncedSessionWindow> window1 = |
+ base::MakeUnique<SyncedSessionWindow>(); |
+ window1->wrapped_window.tabs.push_back(std::move(tab1)); |
+ std::unique_ptr<SyncedSessionWindow> window2 = |
+ base::MakeUnique<SyncedSessionWindow>(); |
+ window2->wrapped_window.tabs.push_back(std::move(tab2)); |
+ std::unique_ptr<SyncedSessionWindow> window3 = |
+ base::MakeUnique<SyncedSessionWindow>(); |
+ window3->wrapped_window.tabs.push_back(std::move(tab3)); |
+ window3->wrapped_window.tabs.push_back(std::move(tab4)); |
std::unique_ptr<SyncedSession> session1 = base::MakeUnique<SyncedSession>(); |
session1->windows[1] = std::move(window1); |