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/sync/test/integration/sessions_helper.h" | 5 #include "chrome/browser/sync/test/integration/sessions_helper.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 CompareSyncedSessions); | 230 CompareSyncedSessions); |
231 } | 231 } |
232 | 232 |
233 bool NavigationEquals(const TabNavigation& expected, | 233 bool NavigationEquals(const TabNavigation& expected, |
234 const TabNavigation& actual) { | 234 const TabNavigation& actual) { |
235 if (expected.virtual_url() != actual.virtual_url()) { | 235 if (expected.virtual_url() != actual.virtual_url()) { |
236 LOG(ERROR) << "Expected url " << expected.virtual_url() | 236 LOG(ERROR) << "Expected url " << expected.virtual_url() |
237 << ", actual " << actual.virtual_url(); | 237 << ", actual " << actual.virtual_url(); |
238 return false; | 238 return false; |
239 } | 239 } |
240 if (expected.referrer() != actual.referrer()) { | 240 if (expected.referrer().url != actual.referrer().url) { |
241 LOG(ERROR) << "Expected referrer " << expected.referrer() | 241 LOG(ERROR) << "Expected referrer " << expected.referrer().url |
242 << ", actual " << actual.referrer(); | 242 << ", actual " << actual.referrer().url; |
243 return false; | 243 return false; |
244 } | 244 } |
245 if (expected.title() != actual.title()) { | 245 if (expected.title() != actual.title()) { |
246 LOG(ERROR) << "Expected title " << expected.title() | 246 LOG(ERROR) << "Expected title " << expected.title() |
247 << ", actual " << actual.title(); | 247 << ", actual " << actual.title(); |
248 return false; | 248 return false; |
249 } | 249 } |
250 if (expected.transition() != actual.transition()) { | 250 if (expected.transition() != actual.transition()) { |
251 LOG(ERROR) << "Expected transition " << expected.transition() | 251 LOG(ERROR) << "Expected transition " << expected.transition() |
252 << ", actual " << actual.transition(); | 252 << ", actual " << actual.transition(); |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 | 303 |
304 return true; | 304 return true; |
305 } | 305 } |
306 | 306 |
307 void DeleteForeignSession(int index, std::string session_tag) { | 307 void DeleteForeignSession(int index, std::string session_tag) { |
308 test()->GetProfile(index)->GetProfileSyncService()-> | 308 test()->GetProfile(index)->GetProfileSyncService()-> |
309 GetSessionModelAssociator()->DeleteForeignSession(session_tag); | 309 GetSessionModelAssociator()->DeleteForeignSession(session_tag); |
310 } | 310 } |
311 | 311 |
312 } // namespace sessions_helper | 312 } // namespace sessions_helper |
OLD | NEW |