Revamp TabNavigation class

chrome/browser/sync/test/integration/sessions_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/test/integration/sessions_helper.h"
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sessions/session_types_test_helper.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
-#include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 using sync_datatype_helper::test;
 
 namespace sessions_helper {
 
 ScopedWindowMap::ScopedWindowMap() {
 }
@@ skipping 202 matching lines @@
             CompareSyncedSessions);
 }
 
 bool NavigationEquals(const TabNavigation& expected,
                       const TabNavigation& actual) {
   if (expected.virtual_url() != actual.virtual_url()) {
     LOG(ERROR) << "Expected url " << expected.virtual_url()
                << ", actual " << actual.virtual_url();
     return false;
   }
-  if (expected.referrer().url != actual.referrer().url) {
-    LOG(ERROR) << "Expected referrer " << expected.referrer().url
-               << ", actual " << actual.referrer().url;
+  if (SessionTypesTestHelper::GetReferrer(expected).url !=
+      SessionTypesTestHelper::GetReferrer(actual).url) {
+    LOG(ERROR) << "Expected referrer "
+               << SessionTypesTestHelper::GetReferrer(expected).url
+               << ", actual "
+               << SessionTypesTestHelper::GetReferrer(actual).url;
     return false;
   }
   if (expected.title() != actual.title()) {
     LOG(ERROR) << "Expected title " << expected.title()
                << ", actual " << actual.title();
     return false;
   }
-  if (expected.transition() != actual.transition()) {
-    LOG(ERROR) << "Expected transition " << expected.transition()
-               << ", actual " << actual.transition();
+  if (SessionTypesTestHelper::GetTransitionType(expected) !=
+      SessionTypesTestHelper::GetTransitionType(actual)) {
+    LOG(ERROR) << "Expected transition "
+               << SessionTypesTestHelper::GetTransitionType(expected)
+               << ", actual "
+               << SessionTypesTestHelper::GetTransitionType(actual);
     return false;
   }
   return true;
 }
 
 bool WindowsMatch(const SessionWindowMap& win1,
                   const SessionWindowMap& win2) {
   SessionTab* client0_tab;
   SessionTab* client1_tab;
   if (win1.size() != win2.size())
@@ skipping 41 matching lines @@
   return true;
 }
 
 void DeleteForeignSession(int index, std::string session_tag) {
   ProfileSyncServiceFactory::GetInstance()->GetForProfile(
       test()->GetProfile(index))->
       GetSessionModelAssociator()->DeleteForeignSession(session_tag);
 }
 
 }  // namespace sessions_helper