Moves TabNavigation into components/sessions and renames

chrome/browser/sync/glue/session_model_associator_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/message_loop.h"
 #include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/sessions/session_types_test_helper.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/profile_mock.h"
+#include "components/sessions/serialized_navigation_entry_test_helper.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/util/time.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
+using sessions::SerializedNavigationEntry;
+using sessions::SerializedNavigationEntryTestHelper;
 using testing::NiceMock;
 using testing::Return;
 using testing::StrictMock;
 using testing::_;
 
 namespace browser_sync {
 
 class SyncSessionModelAssociatorTest : public testing::Test {
  protected:
   SyncSessionModelAssociatorTest()
@@ skipping 47 matching lines @@
 };
 
 namespace {
 
 TEST_F(SyncSessionModelAssociatorTest, SessionWindowHasNoTabsToSync) {
   SessionWindow win;
   ASSERT_TRUE(SessionWindowHasNoTabsToSync(win));
   scoped_ptr<SessionTab> tab(new SessionTab());
   win.tabs.push_back(tab.release());
   ASSERT_TRUE(SessionWindowHasNoTabsToSync(win));
-  TabNavigation nav =
-      SessionTypesTestHelper::CreateNavigation("about:bubba", "title");
+  SerializedNavigationEntry nav =
+      SerializedNavigationEntryTestHelper::CreateNavigation("about:bubba",
+                                                            "title");
   win.tabs[0]->navigations.push_back(nav);
   ASSERT_FALSE(SessionWindowHasNoTabsToSync(win));
 }
 
 TEST_F(SyncSessionModelAssociatorTest, ShouldSyncSessionTab) {
   SessionTab tab;
   ASSERT_FALSE(ShouldSyncSessionTab(tab));
-  TabNavigation nav =
-      SessionTypesTestHelper::CreateNavigation(
+  SerializedNavigationEntry nav =
+      SerializedNavigationEntryTestHelper::CreateNavigation(
           chrome::kChromeUINewTabURL, "title");
   tab.navigations.push_back(nav);
   // NewTab does not count as valid if it's the only navigation.
   ASSERT_FALSE(ShouldSyncSessionTab(tab));
-  TabNavigation nav2 =
-      SessionTypesTestHelper::CreateNavigation("about:bubba", "title");
+  SerializedNavigationEntry nav2 =
+      SerializedNavigationEntryTestHelper::CreateNavigation("about:bubba",
+                                                            "title");
   tab.navigations.push_back(nav2);
   // Once there's another navigation, the tab is valid.
   ASSERT_TRUE(ShouldSyncSessionTab(tab));
 }
 
 TEST_F(SyncSessionModelAssociatorTest,
        ShouldSyncSessionTabIgnoresFragmentForNtp) {
   SessionTab tab;
   ASSERT_FALSE(ShouldSyncSessionTab(tab));
-  TabNavigation nav =
-      SessionTypesTestHelper::CreateNavigation(
+  SerializedNavigationEntry nav =
+      SerializedNavigationEntryTestHelper::CreateNavigation(
           std::string(chrome::kChromeUINewTabURL) + "#bookmarks", "title");
   tab.navigations.push_back(nav);
   // NewTab does not count as valid if it's the only navigation.
   ASSERT_FALSE(ShouldSyncSessionTab(tab));
 }
 
 }  // namespace
 
 TEST_F(SyncSessionModelAssociatorTest, PopulateSessionHeader) {
   sync_pb::SessionHeader header_s;
@@ skipping 201 matching lines @@
   SessionTab session_tab;
   session_tab.window_id.set_id(1);
   session_tab.tab_id.set_id(1);
   session_tab.tab_visual_index = 1;
   session_tab.current_navigation_index = 1;
   session_tab.pinned = true;
   session_tab.extension_app_id = "app id";
   session_tab.user_agent_override = "override";
   session_tab.timestamp = kTime5;
   session_tab.navigations.push_back(
-      SessionTypesTestHelper::CreateNavigation(
+      SerializedNavigationEntryTestHelper::CreateNavigation(
           "http://www.example.com", "Example"));
   session_tab.session_storage_persistent_id = "persistent id";
   SetSessionTabFromDelegate(tab_mock, kTime4, &session_tab);
 
   EXPECT_EQ(0, session_tab.window_id.id());
   EXPECT_EQ(0, session_tab.tab_id.id());
   EXPECT_EQ(0, session_tab.tab_visual_index);
   EXPECT_EQ(2, session_tab.current_navigation_index);
   EXPECT_FALSE(session_tab.pinned);
   EXPECT_TRUE(session_tab.extension_app_id.empty());
   EXPECT_TRUE(session_tab.user_agent_override.empty());
   EXPECT_EQ(kTime4, session_tab.timestamp);
   ASSERT_EQ(3u, session_tab.navigations.size());
   EXPECT_EQ(entry1->GetVirtualURL(),
             session_tab.navigations[0].virtual_url());
   EXPECT_EQ(entry2->GetVirtualURL(),
             session_tab.navigations[1].virtual_url());
   EXPECT_EQ(entry3->GetVirtualURL(),
             session_tab.navigations[2].virtual_url());
-  EXPECT_EQ(kTime1,
-            SessionTypesTestHelper::GetTimestamp(session_tab.navigations[0]));
-  EXPECT_EQ(kTime2,
-            SessionTypesTestHelper::GetTimestamp(session_tab.navigations[1]));
-  EXPECT_EQ(kTime3,
-            SessionTypesTestHelper::GetTimestamp(session_tab.navigations[2]));
+  EXPECT_EQ(kTime1, session_tab.navigations[0].timestamp());
+  EXPECT_EQ(kTime2, session_tab.navigations[1].timestamp());
+  EXPECT_EQ(kTime3, session_tab.navigations[2].timestamp());
   EXPECT_TRUE(session_tab.session_storage_persistent_id.empty());
 }
 
 // Create tab specifics with an empty favicon. Ensure it gets ignored and not
 // stored into the synced favicon lookups.
 TEST_F(SyncSessionModelAssociatorTest, LoadEmptyFavicon) {
   std::string favicon;
   std::string favicon_url = "http://www.faviconurl.com/favicon.ico";
   std::string page_url = "http://www.faviconurl.com/page.html";
   sync_pb::SessionTab tab;
@@ skipping 82 matching lines @@
   // The new page should be mapped to the old favicon data.
   EXPECT_TRUE(FaviconEquals(GURL(page_url2), std::string()));
   LoadTabFavicon(tab2);
   EXPECT_TRUE(FaviconEquals(GURL(page_url), favicon));
   EXPECT_TRUE(FaviconEquals(GURL(page_url2), favicon));
 }
 
 }  // namespace
 
 }  // namespace browser_sync