| 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 <map> | 5 #include <map> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 SessionTab* tab = win_ptr->tabs[j]; | 135 SessionTab* tab = win_ptr->tabs[j]; |
| 136 ASSERT_EQ(*tab_iter, tab->tab_id.id()); | 136 ASSERT_EQ(*tab_iter, tab->tab_id.id()); |
| 137 ASSERT_EQ(1U, tab->navigations.size()); | 137 ASSERT_EQ(1U, tab->navigations.size()); |
| 138 ASSERT_EQ(1, tab->tab_visual_index); | 138 ASSERT_EQ(1, tab->tab_visual_index); |
| 139 ASSERT_EQ(0, tab->current_navigation_index); | 139 ASSERT_EQ(0, tab->current_navigation_index); |
| 140 ASSERT_TRUE(tab->pinned); | 140 ASSERT_TRUE(tab->pinned); |
| 141 ASSERT_EQ("app_id", tab->extension_app_id); | 141 ASSERT_EQ("app_id", tab->extension_app_id); |
| 142 ASSERT_EQ(1U, tab->navigations.size()); | 142 ASSERT_EQ(1U, tab->navigations.size()); |
| 143 ASSERT_EQ(12, tab->navigations[0].index()); | 143 ASSERT_EQ(12, tab->navigations[0].index()); |
| 144 ASSERT_EQ(tab->navigations[0].virtual_url(), GURL("http://foo/1")); | 144 ASSERT_EQ(tab->navigations[0].virtual_url(), GURL("http://foo/1")); |
| 145 ASSERT_EQ(tab->navigations[0].referrer(), GURL("referrer")); | 145 ASSERT_EQ(tab->navigations[0].referrer().url, GURL("referrer")); |
| 146 ASSERT_EQ(tab->navigations[0].title(), string16(ASCIIToUTF16("title"))); | 146 ASSERT_EQ(tab->navigations[0].title(), string16(ASCIIToUTF16("title"))); |
| 147 ASSERT_EQ(tab->navigations[0].transition(), | 147 ASSERT_EQ(tab->navigations[0].transition(), |
| 148 content::PAGE_TRANSITION_TYPED); | 148 content::PAGE_TRANSITION_TYPED); |
| 149 } | 149 } |
| 150 } | 150 } |
| 151 } | 151 } |
| 152 | 152 |
| 153 } // namespace | 153 } // namespace |
| 154 | 154 |
| 155 class ProfileSyncServiceSessionTest | 155 class ProfileSyncServiceSessionTest |
| (...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 902 // Verify the now non-stale session does not get deleted. | 902 // Verify the now non-stale session does not get deleted. |
| 903 model_associator_->DeleteStaleSessions(); | 903 model_associator_->DeleteStaleSessions(); |
| 904 ASSERT_TRUE(model_associator_->GetAllForeignSessions(&foreign_sessions)); | 904 ASSERT_TRUE(model_associator_->GetAllForeignSessions(&foreign_sessions)); |
| 905 ASSERT_EQ(1U, foreign_sessions.size()); | 905 ASSERT_EQ(1U, foreign_sessions.size()); |
| 906 std::vector<std::vector<SessionID::id_type> > session_reference; | 906 std::vector<std::vector<SessionID::id_type> > session_reference; |
| 907 session_reference.push_back(tab_list1); | 907 session_reference.push_back(tab_list1); |
| 908 VerifySyncedSession(tag, session_reference, *(foreign_sessions[0])); | 908 VerifySyncedSession(tag, session_reference, *(foreign_sessions[0])); |
| 909 } | 909 } |
| 910 | 910 |
| 911 } // namespace browser_sync | 911 } // namespace browser_sync |
| OLD | NEW |