Revamp TabNavigation class

chrome/browser/sessions/session_service_test_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/sessions/session_service_test_helper.h"
 
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
+#include "chrome/browser/sessions/session_types_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 
 SessionServiceTestHelper::SessionServiceTestHelper() {}
 
 SessionServiceTestHelper::SessionServiceTestHelper(SessionService* service)
     : service_(service) {}
 
 SessionServiceTestHelper::~SessionServiceTestHelper() {}
@@ skipping 60 matching lines @@
     size_t nav_count,
     const SessionTab& session_tab) {
   EXPECT_EQ(visual_index, session_tab.tab_visual_index);
   EXPECT_EQ(nav_index, session_tab.current_navigation_index);
   ASSERT_EQ(nav_count, session_tab.navigations.size());
 }
 
 void SessionServiceTestHelper::AssertNavigationEquals(
     const TabNavigation& expected,
     const TabNavigation& actual) {
-  EXPECT_TRUE(expected.virtual_url() == actual.virtual_url());
-  EXPECT_EQ(expected.referrer().url, actual.referrer().url);
-  EXPECT_EQ(expected.referrer().policy, actual.referrer().policy);
-  EXPECT_EQ(expected.title(), actual.title());
-  EXPECT_EQ(expected.state(), actual.state());
-  EXPECT_EQ(expected.transition(), actual.transition());
-  EXPECT_EQ(expected.type_mask(), actual.type_mask());
-  EXPECT_TRUE(expected.original_request_url() == actual.original_request_url());
-  EXPECT_EQ(expected.is_overriding_user_agent(),
-      actual.is_overriding_user_agent());
+  SessionTypesTestHelper::ExpectNavigationEquals(expected, actual);
 }
 
 void SessionServiceTestHelper::AssertSingleWindowWithSingleTab(
     const std::vector<SessionWindow*>& windows,
     size_t nav_count) {
   ASSERT_EQ(1U, windows.size());
   EXPECT_EQ(1U, windows[0]->tabs.size());
   EXPECT_EQ(nav_count, windows[0]->tabs[0]->navigations.size());
 }
 
 SessionBackend* SessionServiceTestHelper::backend() {
   return service_->backend();
 }