OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/sessions/session_service_test_helper.h" | 5 #include "chrome/browser/sessions/session_service_test_helper.h" |
6 | 6 |
7 #include "base/memory/scoped_vector.h" | 7 #include "base/memory/scoped_vector.h" |
8 #include "chrome/browser/sessions/session_backend.h" | 8 #include "chrome/browser/sessions/session_backend.h" |
9 #include "chrome/browser/sessions/session_id.h" | 9 #include "chrome/browser/sessions/session_id.h" |
10 #include "chrome/browser/sessions/session_service.h" | 10 #include "chrome/browser/sessions/session_service.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 const SessionTab& session_tab) { | 70 const SessionTab& session_tab) { |
71 EXPECT_EQ(visual_index, session_tab.tab_visual_index); | 71 EXPECT_EQ(visual_index, session_tab.tab_visual_index); |
72 EXPECT_EQ(nav_index, session_tab.current_navigation_index); | 72 EXPECT_EQ(nav_index, session_tab.current_navigation_index); |
73 ASSERT_EQ(nav_count, session_tab.navigations.size()); | 73 ASSERT_EQ(nav_count, session_tab.navigations.size()); |
74 } | 74 } |
75 | 75 |
76 void SessionServiceTestHelper::AssertNavigationEquals( | 76 void SessionServiceTestHelper::AssertNavigationEquals( |
77 const TabNavigation& expected, | 77 const TabNavigation& expected, |
78 const TabNavigation& actual) { | 78 const TabNavigation& actual) { |
79 EXPECT_TRUE(expected.virtual_url() == actual.virtual_url()); | 79 EXPECT_TRUE(expected.virtual_url() == actual.virtual_url()); |
80 EXPECT_EQ(expected.referrer(), actual.referrer()); | 80 EXPECT_EQ(expected.referrer().url, actual.referrer().url); |
| 81 EXPECT_EQ(expected.referrer().policy, actual.referrer().policy); |
81 EXPECT_EQ(expected.title(), actual.title()); | 82 EXPECT_EQ(expected.title(), actual.title()); |
82 EXPECT_EQ(expected.state(), actual.state()); | 83 EXPECT_EQ(expected.state(), actual.state()); |
83 EXPECT_EQ(expected.transition(), actual.transition()); | 84 EXPECT_EQ(expected.transition(), actual.transition()); |
84 EXPECT_EQ(expected.type_mask(), actual.type_mask()); | 85 EXPECT_EQ(expected.type_mask(), actual.type_mask()); |
85 } | 86 } |
86 | 87 |
87 void SessionServiceTestHelper::AssertSingleWindowWithSingleTab( | 88 void SessionServiceTestHelper::AssertSingleWindowWithSingleTab( |
88 const std::vector<SessionWindow*>& windows, | 89 const std::vector<SessionWindow*>& windows, |
89 size_t nav_count) { | 90 size_t nav_count) { |
90 ASSERT_EQ(1U, windows.size()); | 91 ASSERT_EQ(1U, windows.size()); |
91 EXPECT_EQ(1U, windows[0]->tabs.size()); | 92 EXPECT_EQ(1U, windows[0]->tabs.size()); |
92 EXPECT_EQ(nav_count, windows[0]->tabs[0]->navigations.size()); | 93 EXPECT_EQ(nav_count, windows[0]->tabs[0]->navigations.size()); |
93 } | 94 } |
94 | 95 |
95 SessionBackend* SessionServiceTestHelper::backend() { | 96 SessionBackend* SessionServiceTestHelper::backend() { |
96 return service_->backend(); | 97 return service_->backend(); |
97 } | 98 } |
OLD | NEW |