Revamp TabNavigation class

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

Index: chrome/browser/sync/test/integration/sessions_helper.cc
diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc
index ed4197432c1ab9756a516006a245457782a1178a..7a0b916b823f5c0da87d5be588ff258ccb5f0d58 100644
--- a/chrome/browser/sync/test/integration/sessions_helper.cc
+++ b/chrome/browser/sync/test/integration/sessions_helper.cc
@@ -10,14 +10,15 @@
 #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/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/singleton_tabs.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
@@ -240,9 +241,12 @@ bool NavigationEquals(const TabNavigation& expected,
                << ", 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()) {
@@ -250,9 +254,12 @@ bool NavigationEquals(const TabNavigation& expected,
                << ", 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;