Moves TabNavigation into components/sessions and renames

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/test/base/ui_test_utils.h"
 #include "googleurl/src/gurl.h"
 
@@ skipping 38 matching lines @@
   if (!GetLocalSession(index, &local_session)) {
     return false;
   }
 
   if (local_session->windows.size() == 0) {
     DVLOG(1) << "Empty windows vector";
     return false;
   }
 
   int nav_index;
-  TabNavigation nav;
+  components::SerializedNavigationEntry nav;
   for (SessionWindowMap::const_iterator it =
            local_session->windows.begin();
        it != local_session->windows.end(); ++it) {
     if (it->second->tabs.size() == 0) {
       DVLOG(1) << "Empty tabs vector";
       continue;
     }
     for (std::vector<SessionTab*>::const_iterator tab_it =
              it->second->tabs.begin();
          tab_it != it->second->tabs.end(); ++tab_it) {
       if ((*tab_it)->navigations.size() == 0) {
         DVLOG(1) << "Empty navigations vector";
         continue;
       }
       nav_index = (*tab_it)->current_navigation_index;
       nav = (*tab_it)->navigations[nav_index];
       if (nav.virtual_url() == url) {
         DVLOG(1) << "Found tab with url " << url.spec();
-        DVLOG(1) << "Timestamp is "
-                 << SessionTypesTestHelper::GetTimestamp(nav).ToInternalValue();
+        DVLOG(1) << "Timestamp is " << nav.timestamp().ToInternalValue();
         if (nav.title().empty()) {
           DVLOG(1) << "Title empty -- tab hasn't finished loading yet";
           continue;
         }
         return true;
       }
     }
   }
   DVLOG(1) << "Could not find tab with url " << url.spec();
   return false;
@@ skipping 124 matching lines @@
   }
 
   return lhs->windows < rhs->windows;
 }
 
 void SortSyncedSessions(SyncedSessionVector* sessions) {
   std::sort(sessions->begin(), sessions->end(),
             CompareSyncedSessions);
 }
 
-bool NavigationEquals(const TabNavigation& expected,
-                      const TabNavigation& actual) {
+bool NavigationEquals(const components::SerializedNavigationEntry& expected,
+                      const components::SerializedNavigationEntry& actual) {
   if (expected.virtual_url() != actual.virtual_url()) {
     LOG(ERROR) << "Expected url " << expected.virtual_url()
                << ", actual " << actual.virtual_url();
     return false;
   }
-  if (SessionTypesTestHelper::GetReferrer(expected).url !=
-      SessionTypesTestHelper::GetReferrer(actual).url) {
+  if (expected.referrer().url != actual.referrer().url) {
     LOG(ERROR) << "Expected referrer "
-               << SessionTypesTestHelper::GetReferrer(expected).url
+               << expected.referrer().url
                << ", actual "
-               << SessionTypesTestHelper::GetReferrer(actual).url;
+               << actual.referrer().url;
     return false;
   }
   if (expected.title() != actual.title()) {
     LOG(ERROR) << "Expected title " << expected.title()
                << ", actual " << actual.title();
     return false;
   }
-  if (SessionTypesTestHelper::GetTransitionType(expected) !=
-      SessionTypesTestHelper::GetTransitionType(actual)) {
+  if (expected.transition_type() != actual.transition_type()) {
     LOG(ERROR) << "Expected transition "
-               << SessionTypesTestHelper::GetTransitionType(expected)
+               << expected.transition_type()
                << ", actual "
-               << SessionTypesTestHelper::GetTransitionType(actual);
+               << actual.transition_type();
     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