Revamp TabNavigation class

chrome/browser/sessions/session_restore_browsertest.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/command_line.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service_test_helper.h"
+#include "chrome/browser/sessions/session_types.h"
+#include "chrome/browser/sessions/session_types_test_helper.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 353 matching lines @@
 
   // The first tab should have 'url' as its url.
   ASSERT_TRUE(new_browser);
   EXPECT_EQ(url, chrome::GetWebContentsAt(new_browser, 0)->GetURL());
 }
 #endif  // !OS_CHROMEOS
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignTab) {
   GURL url1("http://google.com");
   GURL url2("http://google2.com");
-  TabNavigation nav1(0, url1, content::Referrer(), ASCIIToUTF16("one"),
-        std::string(), content::PAGE_TRANSITION_TYPED);
-  TabNavigation nav2(0, url2, content::Referrer(), ASCIIToUTF16("two"),
-        std::string(), content::PAGE_TRANSITION_TYPED);
+  TabNavigation nav1 =
+      SessionTypesTestHelper::CreateNavigation(url1.spec(), "one");
+  TabNavigation nav2 =
+      SessionTypesTestHelper::CreateNavigation(url2.spec(), "two");
+  SessionTypesTestHelper::SetIsOverridingUserAgent(&nav2, true);
 
   // Set up the restore data.
   SessionTab tab;
   tab.tab_visual_index = 0;
   tab.current_navigation_index = 1;
   tab.pinned = false;
   tab.navigations.push_back(nav1);
   tab.navigations.push_back(nav2);
   tab.user_agent_override = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.19"
       " (KHTML, like Gecko) Chrome/18.0.1025.45 Safari/535.19";
@@ skipping 39 matching lines @@
   web_contents = chrome::GetWebContentsAt(new_browser, 0);
   VerifyNavigationEntries(web_contents->GetController(), url1, url2);
   ASSERT_EQ(tab.user_agent_override, web_contents->GetUserAgentOverride());
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignSession) {
   Profile* profile = browser()->profile();
 
   GURL url1("http://google.com");
   GURL url2("http://google2.com");
-  TabNavigation nav1(0, url1, content::Referrer(), ASCIIToUTF16("one"),
-        std::string(), content::PAGE_TRANSITION_TYPED);
-  TabNavigation nav2(0, url2, content::Referrer(), ASCIIToUTF16("two"),
-        std::string(), content::PAGE_TRANSITION_TYPED);
-  nav1.set_is_overriding_user_agent(false);
-  nav2.set_is_overriding_user_agent(true);
+  TabNavigation nav1 =
+      SessionTypesTestHelper::CreateNavigation(url1.spec(), "one");
+  TabNavigation nav2 =
+      SessionTypesTestHelper::CreateNavigation(url2.spec(), "two");
 
   // Set up the restore data -- one window with two tabs.
   std::vector<const SessionWindow*> session;
   SessionWindow window;
   SessionTab tab1;
   tab1.tab_visual_index = 0;
   tab1.current_navigation_index = 0;
   tab1.pinned = true;
   tab1.navigations.push_back(nav1);
   tab1.user_agent_override = "user_agent_override";
@@ skipping 23 matching lines @@
   ASSERT_EQ(url1, web_contents_1->GetURL());
   ASSERT_EQ(url2, web_contents_2->GetURL());
 
   // Check user agent override state.
   ASSERT_EQ(tab1.user_agent_override, web_contents_1->GetUserAgentOverride());
   ASSERT_EQ(tab2.user_agent_override, web_contents_2->GetUserAgentOverride());
 
   content::NavigationEntry* entry =
       web_contents_1->GetController().GetActiveEntry();
   ASSERT_TRUE(entry);
-  ASSERT_EQ(nav1.is_overriding_user_agent(), entry->GetIsOverridingUserAgent());
+  ASSERT_EQ(SessionTypesTestHelper::GetIsOverridingUserAgent(nav1),
+            entry->GetIsOverridingUserAgent());
 
   entry = web_contents_2->GetController().GetActiveEntry();
   ASSERT_TRUE(entry);
-  ASSERT_EQ(nav2.is_overriding_user_agent(), entry->GetIsOverridingUserAgent());
+  ASSERT_EQ(SessionTypesTestHelper::GetIsOverridingUserAgent(nav2),
+            entry->GetIsOverridingUserAgent());
 
   // The SessionWindow destructor deletes the tabs, so we have to clear them
   // here to avoid a crash.
   window.tabs.clear();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, Basic) {
   ui_test_utils::NavigateToURL(browser(), url1_);
   ui_test_utils::NavigateToURL(browser(), url2_);
 
@@ skipping 325 matching lines @@
   ASSERT_EQ(1u, BrowserList::size());
   ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL());
   content::NavigationController* new_controller =
       &chrome::GetActiveWebContents(new_browser)->GetController();
   ASSERT_TRUE(new_controller->GetDefaultSessionStorageNamespace());
   std::string restored_session_storage_persistent_id =
       new_controller->GetDefaultSessionStorageNamespace()->persistent_id();
   EXPECT_EQ(session_storage_persistent_id,
             restored_session_storage_persistent_id);
 }