| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/sessions/content/content_serialized_navigation_builder.h" | 5 #include "components/sessions/content/content_serialized_navigation_builder.h" |
| 6 | 6 |
| 7 #include "components/sessions/core/serialized_navigation_entry.h" | 7 #include "components/sessions/core/serialized_navigation_entry.h" |
| 8 #include "components/sessions/core/serialized_navigation_entry_test_helper.h" | 8 #include "components/sessions/core/serialized_navigation_entry_test_helper.h" |
| 9 #include "content/public/browser/favicon_status.h" | 9 #include "content/public/browser/favicon_status.h" |
| 10 #include "content/public/browser/navigation_entry.h" | 10 #include "content/public/browser/navigation_entry.h" |
| 11 #include "content/public/common/page_state.h" | 11 #include "content/public/common/page_state.h" |
| 12 #include "content/public/common/referrer.h" | 12 #include "content/public/common/referrer.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 | 14 |
| 15 namespace sessions { | 15 namespace sessions { |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 // Create a NavigationEntry from the test_data constants in | 18 // Create a NavigationEntry from the test_data constants in |
| 19 // serialized_navigation_entry_test_helper.h. | 19 // serialized_navigation_entry_test_helper.h. |
| 20 scoped_ptr<content::NavigationEntry> MakeNavigationEntryForTest() { | 20 std::unique_ptr<content::NavigationEntry> MakeNavigationEntryForTest() { |
| 21 scoped_ptr<content::NavigationEntry> navigation_entry( | 21 std::unique_ptr<content::NavigationEntry> navigation_entry( |
| 22 content::NavigationEntry::Create()); | 22 content::NavigationEntry::Create()); |
| 23 navigation_entry->SetReferrer(content::Referrer( | 23 navigation_entry->SetReferrer(content::Referrer( |
| 24 test_data::kReferrerURL, | 24 test_data::kReferrerURL, |
| 25 static_cast<blink::WebReferrerPolicy>(test_data::kReferrerPolicy))); | 25 static_cast<blink::WebReferrerPolicy>(test_data::kReferrerPolicy))); |
| 26 navigation_entry->SetVirtualURL(test_data::kVirtualURL); | 26 navigation_entry->SetVirtualURL(test_data::kVirtualURL); |
| 27 navigation_entry->SetTitle(test_data::kTitle); | 27 navigation_entry->SetTitle(test_data::kTitle); |
| 28 navigation_entry->SetPageState( | 28 navigation_entry->SetPageState( |
| 29 content::PageState::CreateFromEncodedData(test_data::kEncodedPageState)); | 29 content::PageState::CreateFromEncodedData(test_data::kEncodedPageState)); |
| 30 navigation_entry->SetTransitionType(test_data::kTransitionType); | 30 navigation_entry->SetTransitionType(test_data::kTransitionType); |
| 31 navigation_entry->SetHasPostData(test_data::kHasPostData); | 31 navigation_entry->SetHasPostData(test_data::kHasPostData); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 45 navigation_entry->SetRedirectChain(redirect_chain); | 45 navigation_entry->SetRedirectChain(redirect_chain); |
| 46 return navigation_entry; | 46 return navigation_entry; |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace | 49 } // namespace |
| 50 | 50 |
| 51 | 51 |
| 52 // Create a SerializedNavigationEntry from a NavigationEntry. All its fields | 52 // Create a SerializedNavigationEntry from a NavigationEntry. All its fields |
| 53 // should match the NavigationEntry's. | 53 // should match the NavigationEntry's. |
| 54 TEST(ContentSerializedNavigationBuilderTest, FromNavigationEntry) { | 54 TEST(ContentSerializedNavigationBuilderTest, FromNavigationEntry) { |
| 55 const scoped_ptr<content::NavigationEntry> navigation_entry( | 55 const std::unique_ptr<content::NavigationEntry> navigation_entry( |
| 56 MakeNavigationEntryForTest()); | 56 MakeNavigationEntryForTest()); |
| 57 | 57 |
| 58 const SerializedNavigationEntry& navigation = | 58 const SerializedNavigationEntry& navigation = |
| 59 ContentSerializedNavigationBuilder::FromNavigationEntry( | 59 ContentSerializedNavigationBuilder::FromNavigationEntry( |
| 60 test_data::kIndex, *navigation_entry); | 60 test_data::kIndex, *navigation_entry); |
| 61 | 61 |
| 62 EXPECT_EQ(test_data::kIndex, navigation.index()); | 62 EXPECT_EQ(test_data::kIndex, navigation.index()); |
| 63 | 63 |
| 64 EXPECT_EQ(navigation_entry->GetUniqueID(), navigation.unique_id()); | 64 EXPECT_EQ(navigation_entry->GetUniqueID(), navigation.unique_id()); |
| 65 EXPECT_EQ(test_data::kReferrerURL, navigation.referrer_url()); | 65 EXPECT_EQ(test_data::kReferrerURL, navigation.referrer_url()); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 80 EXPECT_EQ(test_data::kRedirectURL0, navigation.redirect_chain()[0]); | 80 EXPECT_EQ(test_data::kRedirectURL0, navigation.redirect_chain()[0]); |
| 81 EXPECT_EQ(test_data::kRedirectURL1, navigation.redirect_chain()[1]); | 81 EXPECT_EQ(test_data::kRedirectURL1, navigation.redirect_chain()[1]); |
| 82 EXPECT_EQ(test_data::kVirtualURL, navigation.redirect_chain()[2]); | 82 EXPECT_EQ(test_data::kVirtualURL, navigation.redirect_chain()[2]); |
| 83 } | 83 } |
| 84 | 84 |
| 85 // Create a NavigationEntry, then create another one by converting to | 85 // Create a NavigationEntry, then create another one by converting to |
| 86 // a SerializedNavigationEntry and back. The new one should match the old one | 86 // a SerializedNavigationEntry and back. The new one should match the old one |
| 87 // except for fields that aren't preserved, which should be set to | 87 // except for fields that aren't preserved, which should be set to |
| 88 // expected values. | 88 // expected values. |
| 89 TEST(ContentSerializedNavigationBuilderTest, ToNavigationEntry) { | 89 TEST(ContentSerializedNavigationBuilderTest, ToNavigationEntry) { |
| 90 const scoped_ptr<content::NavigationEntry> old_navigation_entry( | 90 const std::unique_ptr<content::NavigationEntry> old_navigation_entry( |
| 91 MakeNavigationEntryForTest()); | 91 MakeNavigationEntryForTest()); |
| 92 | 92 |
| 93 const SerializedNavigationEntry& navigation = | 93 const SerializedNavigationEntry& navigation = |
| 94 ContentSerializedNavigationBuilder::FromNavigationEntry( | 94 ContentSerializedNavigationBuilder::FromNavigationEntry( |
| 95 test_data::kIndex, *old_navigation_entry); | 95 test_data::kIndex, *old_navigation_entry); |
| 96 | 96 |
| 97 const scoped_ptr<content::NavigationEntry> new_navigation_entry( | 97 const std::unique_ptr<content::NavigationEntry> new_navigation_entry( |
| 98 ContentSerializedNavigationBuilder::ToNavigationEntry( | 98 ContentSerializedNavigationBuilder::ToNavigationEntry( |
| 99 &navigation, test_data::kPageID, NULL)); | 99 &navigation, test_data::kPageID, NULL)); |
| 100 | 100 |
| 101 EXPECT_EQ(test_data::kReferrerURL, new_navigation_entry->GetReferrer().url); | 101 EXPECT_EQ(test_data::kReferrerURL, new_navigation_entry->GetReferrer().url); |
| 102 EXPECT_EQ(test_data::kReferrerPolicy, | 102 EXPECT_EQ(test_data::kReferrerPolicy, |
| 103 new_navigation_entry->GetReferrer().policy); | 103 new_navigation_entry->GetReferrer().policy); |
| 104 EXPECT_EQ(test_data::kVirtualURL, new_navigation_entry->GetVirtualURL()); | 104 EXPECT_EQ(test_data::kVirtualURL, new_navigation_entry->GetVirtualURL()); |
| 105 EXPECT_EQ(test_data::kTitle, new_navigation_entry->GetTitle()); | 105 EXPECT_EQ(test_data::kTitle, new_navigation_entry->GetTitle()); |
| 106 EXPECT_EQ(test_data::kEncodedPageState, | 106 EXPECT_EQ(test_data::kEncodedPageState, |
| 107 new_navigation_entry->GetPageState().ToEncodedData()); | 107 new_navigation_entry->GetPageState().ToEncodedData()); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 122 ASSERT_EQ(3U, new_navigation_entry->GetRedirectChain().size()); | 122 ASSERT_EQ(3U, new_navigation_entry->GetRedirectChain().size()); |
| 123 EXPECT_EQ(test_data::kRedirectURL0, | 123 EXPECT_EQ(test_data::kRedirectURL0, |
| 124 new_navigation_entry->GetRedirectChain()[0]); | 124 new_navigation_entry->GetRedirectChain()[0]); |
| 125 EXPECT_EQ(test_data::kRedirectURL1, | 125 EXPECT_EQ(test_data::kRedirectURL1, |
| 126 new_navigation_entry->GetRedirectChain()[1]); | 126 new_navigation_entry->GetRedirectChain()[1]); |
| 127 EXPECT_EQ(test_data::kVirtualURL, | 127 EXPECT_EQ(test_data::kVirtualURL, |
| 128 new_navigation_entry->GetRedirectChain()[2]); | 128 new_navigation_entry->GetRedirectChain()[2]); |
| 129 } | 129 } |
| 130 | 130 |
| 131 } // namespace sessions | 131 } // namespace sessions |
| OLD | NEW |