Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

Unified Diff: ios/chrome/browser/web_state_list/web_state_list_serialization_unittest.mm

Issue 2894553003: Add |web_usage_enabled| to DeserializeWebStateList() (Closed)
Patch Set: Test web_usage_enabled bool Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/web_state_list/web_state_list_serialization_unittest.mm
diff --git a/ios/chrome/browser/web_state_list/web_state_list_serialization_unittest.mm b/ios/chrome/browser/web_state_list/web_state_list_serialization_unittest.mm
index 07cbe04a790ef8d78161a97e6701bc67a71ab122..1dd22b04e967a4d7353e159a1163deb55295fed5 100644
--- a/ios/chrome/browser/web_state_list/web_state_list_serialization_unittest.mm
+++ b/ios/chrome/browser/web_state_list/web_state_list_serialization_unittest.mm
@@ -124,16 +124,45 @@ void ExpectRelationshipIdenticalFrom(int restored_index,
EXPECT_EQ(4u, session_window.sessions.count);
EXPECT_EQ(1u, session_window.selectedIndex);
+ // Create a deserialized WebStateList and verify its contents.
WebStateList restored_web_state_list(web_state_list_delegate());
restored_web_state_list.InsertWebState(0, SerializableTestWebState::Create());
ASSERT_EQ(1, restored_web_state_list.count());
DeserializeWebStateList(
- &restored_web_state_list, session_window,
+ &restored_web_state_list, session_window, false,
base::BindRepeating(&SerializableTestWebState::CreateWithSessionStorage));
EXPECT_EQ(5, restored_web_state_list.count());
EXPECT_EQ(2, restored_web_state_list.active_index());
ExpectRelationshipIdenticalFrom(1, &original_web_state_list,
&restored_web_state_list);
+
+ // Create a deserialized WebStateList with web usage enabled and verify its
+ // contents.
+ WebStateList restored_web_state_list_web_usage_enabled(
+ web_state_list_delegate());
+ std::unique_ptr<web::WebState> webUsageEnabledWebState =
+ SerializableTestWebState::Create();
+ webUsageEnabledWebState->SetWebUsageEnabled(true);
+ restored_web_state_list_web_usage_enabled.InsertWebState(
+ 0, std::move(webUsageEnabledWebState));
+ ASSERT_EQ(1, restored_web_state_list_web_usage_enabled.count());
+
+ DeserializeWebStateList(
+ &restored_web_state_list_web_usage_enabled, session_window, true,
+ base::BindRepeating(&SerializableTestWebState::CreateWithSessionStorage));
+
+ EXPECT_EQ(5, restored_web_state_list_web_usage_enabled.count());
+ EXPECT_EQ(2, restored_web_state_list_web_usage_enabled.active_index());
+ ExpectRelationshipIdenticalFrom(1, &original_web_state_list,
+ &restored_web_state_list_web_usage_enabled);
+
+ // Verify that the WebUsageEnabled bit is set appropriately for the restored
+ // WebStateLists.
Eugene But (OOO till 7-30) 2017/05/19 14:18:05 ASSERT_EQ(restored_web_state_list_web_usage_enable
kkhorimoto 2017/05/19 17:58:16 Done.
+ for (int i = 0; i < 5; ++i) {
Eugene But (OOO till 7-30) 2017/05/19 14:18:05 s/5/restored_web_state_list_web_usage_enabled.coun
kkhorimoto 2017/05/19 17:58:16 Done.
+ EXPECT_TRUE(restored_web_state_list_web_usage_enabled.GetWebStateAt(i)
+ ->IsWebUsageEnabled());
+ EXPECT_FALSE(restored_web_state_list.GetWebStateAt(i)->IsWebUsageEnabled());
+ }
}

Powered by Google App Engine
This is Rietveld 408576698