Moves TabNavigation into components/sessions and renames

chrome/browser/sync/glue/synced_session_tracker_unittest.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 <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/sessions/session_types_test_helper.h"
 #include "chrome/browser/sync/glue/synced_session_tracker.h"
+#include "components/sessions/serialized_navigation_entry_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
 
 typedef testing::Test SyncedSessionTrackerTest;
 
 TEST_F(SyncedSessionTrackerTest, GetSession) {
   SyncedSessionTracker tracker;
   SyncedSession* session1 = tracker.GetSession("tag");
   SyncedSession* session2 = tracker.GetSession("tag2");
@@ skipping 31 matching lines @@
 TEST_F(SyncedSessionTrackerTest, LookupAllForeignSessions) {
   SyncedSessionTracker tracker;
   std::vector<const SyncedSession*> sessions;
   ASSERT_FALSE(tracker.LookupAllForeignSessions(&sessions));
   tracker.GetSession("tag1");
   tracker.GetSession("tag2");
   tracker.PutWindowInSession("tag1", 0);
   tracker.PutTabInWindow("tag1", 0, 15, 0);
   SessionTab* tab = tracker.GetTab("tag1", 15);
   ASSERT_TRUE(tab);
-  tab->navigations.push_back(SessionTypesTestHelper::CreateNavigation(
+  tab->navigations.push_back(
+      sessions::SerializedNavigationEntryTestHelper::CreateNavigation(
       "bla://valid_url", "title"));
   ASSERT_TRUE(tracker.LookupAllForeignSessions(&sessions));
   // Only the session with a valid window and tab gets returned.
   ASSERT_EQ(1U, sessions.size());
   ASSERT_EQ("tag1", sessions[0]->session_tag);
 }
 
 TEST_F(SyncedSessionTrackerTest, LookupSessionWindows) {
   SyncedSessionTracker tracker;
   std::vector<const SessionWindow*> windows;
@@ skipping 158 matching lines @@
   ASSERT_EQ(1U, session2->windows[2]->tabs.size());
   ASSERT_EQ(2U, tracker.num_synced_sessions());
   ASSERT_EQ(4U, tracker.num_synced_tabs(tag1));
   ASSERT_EQ(1U, tracker.num_synced_tabs(tag2));
 
   // All memory should be properly deallocated by destructor for the
   // SyncedSessionTracker.
 }
 
 }  // namespace browser_sync