Moves TabNavigation into components/sessions and renames

chrome/browser/sync/test/integration/single_client_sessions_sync_test.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 "base/memory/scoped_vector.h"
 #include "chrome/browser/history/history_types.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 "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sessions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/sync/test/integration/typed_urls_helper.h"
 #include "sync/util/time.h"
 
 using sessions_helper::CheckInitialState;
 using sessions_helper::GetLocalWindows;
 using sessions_helper::GetSessionData;
 using sessions_helper::OpenTabAndGetLocalWindows;
@@ skipping 53 matching lines @@
   const GURL url("about:version");
 
   ScopedWindowMap windows;
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, url, windows.GetMutable()));
 
   int found_navigations = 0;
   for (SessionWindowMap::const_iterator it = windows.Get()->begin();
        it != windows.Get()->end(); ++it) {
     for (std::vector<SessionTab*>::const_iterator it2 =
              it->second->tabs.begin(); it2 != it->second->tabs.end(); ++it2) {
-      for (std::vector<TabNavigation>::const_iterator it3 =
-               (*it2)->navigations.begin();
+      for (std::vector<sessions::SerializedNavigationEntry>::const_iterator
+               it3 = (*it2)->navigations.begin();
            it3 != (*it2)->navigations.end(); ++it3) {
-        const base::Time timestamp = SessionTypesTestHelper::GetTimestamp(*it3);
+        const base::Time timestamp = it3->timestamp();
 
         history::URLRow virtual_row;
         ASSERT_TRUE(GetUrlFromClient(0, it3->virtual_url(), &virtual_row));
         const base::Time history_timestamp = virtual_row.last_visit();
 
         ASSERT_EQ(timestamp, history_timestamp);
         ++found_navigations;
       }
     }
   }
   ASSERT_EQ(1, found_navigations);
 }