Moves TabNavigation into components/sessions and renames

components/sessions/serialized_navigation_entry_unittest.cc

Index: components/sessions/serialized_navigation_entry_unittest.cc
diff --git a/chrome/browser/sessions/session_types_unittest.cc b/components/sessions/serialized_navigation_entry_unittest.cc
similarity index 51%
copy from chrome/browser/sessions/session_types_unittest.cc
copy to components/sessions/serialized_navigation_entry_unittest.cc
index 465d917d1f8825af4e337b9984a6d8a91c6425d3..c63f312da0ef3a6c51be56bb27b69314040722a7 100644
--- a/chrome/browser/sessions/session_types_unittest.cc
+++ b/components/sessions/serialized_navigation_entry_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "components/sessions/serialized_navigation_entry.h"
+
 #include <cstddef>
 #include <string>
 
@@ -12,9 +14,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/search/search.h"
-#include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/sessions/session_types_test_helper.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/page_transition_types.h"
@@ -25,6 +24,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h"
 
+namespace components {
 namespace {
 
 const int kIndex = 3;
@@ -64,8 +64,7 @@ scoped_ptr<content::NavigationEntry> MakeNavigationEntryForTest() {
   navigation_entry->SetOriginalRequestURL(kOriginalRequestURL);
   navigation_entry->SetIsOverridingUserAgent(kIsOverridingUserAgent);
   navigation_entry->SetTimestamp(kTimestamp);
-  navigation_entry->SetExtraData(
-      chrome::kInstantExtendedSearchTermsKey, kSearchTerms);
+  navigation_entry->SetExtraData(components::kSearchTermsKey, kSearchTerms);
   navigation_entry->GetFavicon().valid = true;
   navigation_entry->GetFavicon().url = kFaviconURL;
   return navigation_entry.Pass();
@@ -89,136 +88,122 @@ sync_pb::TabNavigation MakeSyncDataForTest() {
   return sync_data;
 }
 
-// Create a default TabNavigation.  All its fields should be
+// Create a default SerializedNavigationEntry.  All its fields should be
 // initialized to their respective default values.
-TEST(TabNavigationTest, DefaultInitializer) {
-  const TabNavigation navigation;
+TEST(SerializedNavigationEntryTest, DefaultInitializer) {
+  const SerializedNavigationEntry navigation;
   EXPECT_EQ(-1, navigation.index());
   EXPECT_EQ(0, navigation.unique_id());
-  EXPECT_EQ(GURL(), SessionTypesTestHelper::GetReferrer(navigation).url);
-  EXPECT_EQ(WebKit::WebReferrerPolicyDefault,
-            SessionTypesTestHelper::GetReferrer(navigation).policy);
+  EXPECT_EQ(GURL(), navigation.referrer().url);
+  EXPECT_EQ(WebKit::WebReferrerPolicyDefault, navigation.referrer().policy);
   EXPECT_EQ(GURL(), navigation.virtual_url());
   EXPECT_TRUE(navigation.title().empty());
   EXPECT_TRUE(navigation.content_state().empty());
-  EXPECT_EQ(content::PAGE_TRANSITION_TYPED,
-            SessionTypesTestHelper::GetTransitionType(navigation));
-  EXPECT_FALSE(SessionTypesTestHelper::GetHasPostData(navigation));
-  EXPECT_EQ(-1, SessionTypesTestHelper::GetPostID(navigation));
-  EXPECT_EQ(GURL(), SessionTypesTestHelper::GetOriginalRequestURL(navigation));
-  EXPECT_FALSE(SessionTypesTestHelper::GetIsOverridingUserAgent(navigation));
-  EXPECT_TRUE(SessionTypesTestHelper::GetTimestamp(navigation).is_null());
+  EXPECT_EQ(content::PAGE_TRANSITION_TYPED, navigation.transition_type());
+  EXPECT_FALSE(navigation.has_post_data());
+  EXPECT_EQ(-1, navigation.post_id());
+  EXPECT_EQ(GURL(), navigation.original_request_url());
+  EXPECT_FALSE(navigation.is_overriding_user_agent());
+  EXPECT_TRUE(navigation.timestamp().is_null());
   EXPECT_TRUE(navigation.search_terms().empty());
   EXPECT_FALSE(navigation.favicon_url().is_valid());
 }
 
-// Create a TabNavigation from a NavigationEntry.  All its fields
+// Create a SerializedNavigationEntry from a NavigationEntry.  All its fields
 // should match the NavigationEntry's.
-TEST(TabNavigationTest, FromNavigationEntry) {
+TEST(SerializedNavigationEntryTest, FromNavigationEntry) {
   const scoped_ptr<content::NavigationEntry> navigation_entry(
       MakeNavigationEntryForTest());
 
-  const TabNavigation& navigation =
-      TabNavigation::FromNavigationEntry(kIndex, *navigation_entry);
+  const SerializedNavigationEntry& navigation =
+      SerializedNavigationEntry::FromNavigationEntry(kIndex, *navigation_entry);
 
   EXPECT_EQ(kIndex, navigation.index());
 
   EXPECT_EQ(navigation_entry->GetUniqueID(), navigation.unique_id());
-  EXPECT_EQ(kReferrer.url,
-            SessionTypesTestHelper::GetReferrer(navigation).url);
-  EXPECT_EQ(kReferrer.policy,
-            SessionTypesTestHelper::GetReferrer(navigation).policy);
+  EXPECT_EQ(kReferrer.url, navigation.referrer().url);
+  EXPECT_EQ(kReferrer.policy, navigation.referrer().policy);
   EXPECT_EQ(kVirtualURL, navigation.virtual_url());
   EXPECT_EQ(kTitle, navigation.title());
   EXPECT_EQ(kContentState, navigation.content_state());
-  EXPECT_EQ(kTransitionType,
-            SessionTypesTestHelper::GetTransitionType(navigation));
-  EXPECT_EQ(kHasPostData, SessionTypesTestHelper::GetHasPostData(navigation));
-  EXPECT_EQ(kPostID, SessionTypesTestHelper::GetPostID(navigation));
-  EXPECT_EQ(kOriginalRequestURL,
-            SessionTypesTestHelper::GetOriginalRequestURL(navigation));
-  EXPECT_EQ(kIsOverridingUserAgent,
-            SessionTypesTestHelper::GetIsOverridingUserAgent(navigation));
-  EXPECT_EQ(kTimestamp, SessionTypesTestHelper::GetTimestamp(navigation));
+  EXPECT_EQ(kTransitionType, navigation.transition_type());
+  EXPECT_EQ(kHasPostData, navigation.has_post_data());
+  EXPECT_EQ(kPostID, navigation.post_id());
+  EXPECT_EQ(kOriginalRequestURL, navigation.original_request_url());
+  EXPECT_EQ(kIsOverridingUserAgent, navigation.is_overriding_user_agent());
+  EXPECT_EQ(kTimestamp, navigation.timestamp());
   EXPECT_EQ(kFaviconURL, navigation.favicon_url());
 }
 
-// Create a TabNavigation from a sync_pb::TabNavigation.  All its
+// Create a SerializedNavigationEntry from a sync_pb::TabNavigation.  All its
 // fields should match the protocol buffer's if it exists there, and
 // sbould be set to the default value otherwise.
-TEST(TabNavigationTest, FromSyncData) {
+TEST(SerializedNavigationEntryTest, FromSyncData) {
   const sync_pb::TabNavigation sync_data = MakeSyncDataForTest();
 
-  const TabNavigation& navigation =
-      TabNavigation::FromSyncData(kIndex, sync_data);
+  const SerializedNavigationEntry& navigation =
+      SerializedNavigationEntry::FromSyncData(kIndex, sync_data);
 
   EXPECT_EQ(kIndex, navigation.index());
   EXPECT_EQ(kUniqueID, navigation.unique_id());
-  EXPECT_EQ(kReferrer.url,
-            SessionTypesTestHelper::GetReferrer(navigation).url);
-  EXPECT_EQ(WebKit::WebReferrerPolicyDefault,
-            SessionTypesTestHelper::GetReferrer(navigation).policy);
+  EXPECT_EQ(kReferrer.url, navigation.referrer().url);
+  EXPECT_EQ(WebKit::WebReferrerPolicyDefault, navigation.referrer().policy);
   EXPECT_EQ(kVirtualURL, navigation.virtual_url());
   EXPECT_EQ(kTitle, navigation.title());
   EXPECT_EQ(kContentState, navigation.content_state());
-  EXPECT_EQ(kTransitionType,
-            SessionTypesTestHelper::GetTransitionType(navigation));
-  EXPECT_FALSE(SessionTypesTestHelper::GetHasPostData(navigation));
-  EXPECT_EQ(-1, SessionTypesTestHelper::GetPostID(navigation));
-  EXPECT_EQ(GURL(), SessionTypesTestHelper::GetOriginalRequestURL(navigation));
-  EXPECT_FALSE(SessionTypesTestHelper::GetIsOverridingUserAgent(navigation));
-  EXPECT_TRUE(SessionTypesTestHelper::GetTimestamp(navigation).is_null());
+  EXPECT_EQ(kTransitionType, navigation.transition_type());
+  EXPECT_FALSE(navigation.has_post_data());
+  EXPECT_EQ(-1, navigation.post_id());
+  EXPECT_EQ(GURL(), navigation.original_request_url());
+  EXPECT_FALSE(navigation.is_overriding_user_agent());
+  EXPECT_TRUE(navigation.timestamp().is_null());
   EXPECT_EQ(kSearchTerms, navigation.search_terms());
   EXPECT_EQ(kFaviconURL, navigation.favicon_url());
 }
 
-// Create a TabNavigation, pickle it, then create another one by
+// Create a SerializedNavigationEntry, pickle it, then create another one by
 // unpickling.  The new one should match the old one except for fields
 // that aren't pickled, which should be set to default values.
-TEST(TabNavigationTest, Pickle) {
-  const TabNavigation& old_navigation =
-      TabNavigation::FromNavigationEntry(kIndex, *MakeNavigationEntryForTest());
+TEST(SerializedNavigationEntryTest, Pickle) {
+  const SerializedNavigationEntry& old_navigation =
+      SerializedNavigationEntry::FromNavigationEntry(
+          kIndex, *MakeNavigationEntryForTest());
 
   Pickle pickle;
-  old_navigation.WriteToPickle(&pickle);
+  old_navigation.WriteToPickle(30000, &pickle);
 
-  TabNavigation new_navigation;
+  SerializedNavigationEntry new_navigation;
   PickleIterator pickle_iterator(pickle);
   EXPECT_TRUE(new_navigation.ReadFromPickle(&pickle_iterator));
 
   EXPECT_EQ(kIndex, new_navigation.index());
 
   EXPECT_EQ(0, new_navigation.unique_id());
-  EXPECT_EQ(kReferrer.url,
-            SessionTypesTestHelper::GetReferrer(new_navigation).url);
-  EXPECT_EQ(kReferrer.policy,
-            SessionTypesTestHelper::GetReferrer(new_navigation).policy);
+  EXPECT_EQ(kReferrer.url, new_navigation.referrer().url);
+  EXPECT_EQ(kReferrer.policy, new_navigation.referrer().policy);
   EXPECT_EQ(kVirtualURL, new_navigation.virtual_url());
   EXPECT_EQ(kTitle, new_navigation.title());
   EXPECT_TRUE(new_navigation.content_state().empty());
-  EXPECT_EQ(kTransitionType,
-            SessionTypesTestHelper::GetTransitionType(new_navigation));
-  EXPECT_EQ(kHasPostData,
-            SessionTypesTestHelper::GetHasPostData(new_navigation));
-  EXPECT_EQ(-1, SessionTypesTestHelper::GetPostID(new_navigation));
-  EXPECT_EQ(kOriginalRequestURL,
-            SessionTypesTestHelper::GetOriginalRequestURL(new_navigation));
-  EXPECT_EQ(kIsOverridingUserAgent,
-            SessionTypesTestHelper::GetIsOverridingUserAgent(new_navigation));
-  EXPECT_EQ(kTimestamp, SessionTypesTestHelper::GetTimestamp(new_navigation));
+  EXPECT_EQ(kTransitionType, new_navigation.transition_type());
+  EXPECT_EQ(kHasPostData, new_navigation.has_post_data());
+  EXPECT_EQ(-1, new_navigation.post_id());
+  EXPECT_EQ(kOriginalRequestURL, new_navigation.original_request_url());
+  EXPECT_EQ(kIsOverridingUserAgent, new_navigation.is_overriding_user_agent());
+  EXPECT_EQ(kTimestamp, new_navigation.timestamp());
   EXPECT_EQ(kSearchTerms, new_navigation.search_terms());
 }
 
 // Create a NavigationEntry, then create another one by converting to
-// a TabNavigation and back.  The new one should match the old one
+// a SerializedNavigationEntry and back.  The new one should match the old one
 // except for fields that aren't preserved, which should be set to
 // expected values.
-TEST(TabNavigationTest, ToNavigationEntry) {
+TEST(SerializedNavigationEntryTest, ToNavigationEntry) {
   const scoped_ptr<content::NavigationEntry> old_navigation_entry(
       MakeNavigationEntryForTest());
 
-  const TabNavigation& navigation =
-      TabNavigation::FromNavigationEntry(kIndex, *old_navigation_entry);
+  const SerializedNavigationEntry& navigation =
+      SerializedNavigationEntry::FromNavigationEntry(kIndex,
+                                                     *old_navigation_entry);
 
   const scoped_ptr<content::NavigationEntry> new_navigation_entry(
       navigation.ToNavigationEntry(kPageID, NULL));
@@ -237,20 +222,20 @@ TEST(TabNavigationTest, ToNavigationEntry) {
             new_navigation_entry->GetOriginalRequestURL());
   EXPECT_EQ(kIsOverridingUserAgent,
             new_navigation_entry->GetIsOverridingUserAgent());
-  EXPECT_EQ(kSearchTerms,
-            chrome::GetSearchTermsFromNavigationEntry(
-                new_navigation_entry.get()));
+  string16 search_terms;
+  new_navigation_entry->GetExtraData(kSearchTermsKey, &search_terms);
+  EXPECT_EQ(kSearchTerms, search_terms);
 }
 
-// Create a NavigationEntry, convert it to a TabNavigation, then
+// Create a NavigationEntry, convert it to a SerializedNavigationEntry, then
 // create a sync protocol buffer from it.  The protocol buffer should
 // have matching fields to the NavigationEntry (when applicable).
-TEST(TabNavigationTest, ToSyncData) {
+TEST(SerializedNavigationEntryTest, ToSyncData) {
   const scoped_ptr<content::NavigationEntry> navigation_entry(
       MakeNavigationEntryForTest());
 
-  const TabNavigation& navigation =
-      TabNavigation::FromNavigationEntry(kIndex, *navigation_entry);
+  const SerializedNavigationEntry& navigation =
+      SerializedNavigationEntry::FromNavigationEntry(kIndex, *navigation_entry);
 
   const sync_pb::TabNavigation sync_data = navigation.ToSyncData();
 
@@ -268,8 +253,8 @@ TEST(TabNavigationTest, ToSyncData) {
 }
 
 // Ensure all transition types and qualifiers are converted to/from the sync
-// TabNavigation representation properly.
-TEST(TabNavigationTest, TransitionTypes) {
+// SerializedNavigationEntry representation properly.
+TEST(SerializedNavigationEntryTest, TransitionTypes) {
   scoped_ptr<content::NavigationEntry> navigation_entry(
       MakeNavigationEntryForTest());
   for (uint32 core_type = content::PAGE_TRANSITION_LINK;
@@ -286,107 +271,19 @@ TEST(TabNavigationTest, TransitionTypes) {
           static_cast<content::PageTransition>(core_type | qualifier);
 
       navigation_entry->SetTransitionType(transition);
-      const TabNavigation& navigation =
-          TabNavigation::FromNavigationEntry(kIndex, *navigation_entry);
+      const SerializedNavigationEntry& navigation =
+          SerializedNavigationEntry::FromNavigationEntry(kIndex,
+                                                         *navigation_entry);
       const sync_pb::TabNavigation& sync_data = navigation.ToSyncData();
-      const TabNavigation& constructed_nav =
-          TabNavigation::FromSyncData(kIndex, sync_data);
+      const SerializedNavigationEntry& constructed_nav =
+          SerializedNavigationEntry::FromSyncData(kIndex, sync_data);
       const content::PageTransition constructed_transition =
-          SessionTypesTestHelper::GetTransitionType(constructed_nav);
+          constructed_nav.transition_type();
 
       EXPECT_EQ(transition, constructed_transition);
     }
   }
 }
 
-// Create a typical SessionTab protocol buffer and set an existing
-// SessionTab from it.  The data from the protocol buffer should
-// clobber the existing data.
-TEST(SessionTab, FromSyncData) {
-  sync_pb::SessionTab sync_data;
-  sync_data.set_tab_id(5);
-  sync_data.set_window_id(10);
-  sync_data.set_tab_visual_index(13);
-  sync_data.set_current_navigation_index(3);
-  sync_data.set_pinned(true);
-  sync_data.set_extension_app_id("app_id");
-  for (int i = 0; i < 5; ++i) {
-    sync_pb::TabNavigation* navigation = sync_data.add_navigation();
-    navigation->set_virtual_url("http://foo/" + base::IntToString(i));
-    navigation->set_referrer("referrer");
-    navigation->set_title("title");
-    navigation->set_page_transition(sync_pb::SyncEnums_PageTransition_TYPED);
-  }
-
-  SessionTab tab;
-  tab.window_id.set_id(100);
-  tab.tab_id.set_id(100);
-  tab.tab_visual_index = 100;
-  tab.current_navigation_index = 1000;
-  tab.pinned = false;
-  tab.extension_app_id = "fake";
-  tab.user_agent_override = "fake";
-  tab.timestamp = base::Time::FromInternalValue(100);
-  tab.navigations.resize(100);
-  tab.session_storage_persistent_id = "fake";
-
-  tab.SetFromSyncData(sync_data, base::Time::FromInternalValue(5u));
-  EXPECT_EQ(10, tab.window_id.id());
-  EXPECT_EQ(5, tab.tab_id.id());
-  EXPECT_EQ(13, tab.tab_visual_index);
-  EXPECT_EQ(3, tab.current_navigation_index);
-  EXPECT_TRUE(tab.pinned);
-  EXPECT_EQ("app_id", tab.extension_app_id);
-  EXPECT_TRUE(tab.user_agent_override.empty());
-  EXPECT_EQ(5u, tab.timestamp.ToInternalValue());
-  ASSERT_EQ(5u, tab.navigations.size());
-  for (int i = 0; i < 5; ++i) {
-    EXPECT_EQ(i, tab.navigations[i].index());
-    EXPECT_EQ(GURL("referrer"),
-              SessionTypesTestHelper::GetReferrer(tab.navigations[i]).url);
-    EXPECT_EQ(string16(ASCIIToUTF16("title")), tab.navigations[i].title());
-    EXPECT_EQ(content::PAGE_TRANSITION_TYPED,
-              SessionTypesTestHelper::GetTransitionType(tab.navigations[i]));
-    EXPECT_EQ(GURL("http://foo/" + base::IntToString(i)),
-              tab.navigations[i].virtual_url());
-  }
-  EXPECT_TRUE(tab.session_storage_persistent_id.empty());
-}
-
-TEST(SessionTab, ToSyncData) {
-  SessionTab tab;
-  tab.window_id.set_id(10);
-  tab.tab_id.set_id(5);
-  tab.tab_visual_index = 13;
-  tab.current_navigation_index = 3;
-  tab.pinned = true;
-  tab.extension_app_id = "app_id";
-  tab.user_agent_override = "fake";
-  tab.timestamp = base::Time::FromInternalValue(100);
-  for (int i = 0; i < 5; ++i) {
-    tab.navigations.push_back(
-        SessionTypesTestHelper::CreateNavigation(
-            "http://foo/" + base::IntToString(i), "title"));
-  }
-  tab.session_storage_persistent_id = "fake";
-
-  const sync_pb::SessionTab& sync_data = tab.ToSyncData();
-  EXPECT_EQ(5, sync_data.tab_id());
-  EXPECT_EQ(10, sync_data.window_id());
-  EXPECT_EQ(13, sync_data.tab_visual_index());
-  EXPECT_EQ(3, sync_data.current_navigation_index());
-  EXPECT_TRUE(sync_data.pinned());
-  EXPECT_EQ("app_id", sync_data.extension_app_id());
-  ASSERT_EQ(5, sync_data.navigation_size());
-  for (int i = 0; i < 5; ++i) {
-    EXPECT_EQ(tab.navigations[i].virtual_url().spec(),
-              sync_data.navigation(i).virtual_url());
-    EXPECT_EQ(UTF16ToUTF8(tab.navigations[i].title()),
-              sync_data.navigation(i).title());
-  }
-  EXPECT_FALSE(sync_data.has_favicon());
-  EXPECT_FALSE(sync_data.has_favicon_type());
-  EXPECT_FALSE(sync_data.has_favicon_source());
-}
-
 }  // namespace
+}  // namespace components