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

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

Issue 2900643003: [ios] Clean how WebUsageEnabled flag is restored for WebStateList. (Closed)
Patch Set: 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 321bbcce79b28493e65efcebb4962111f5495d61..b4af185d511b88530493c99b217438a19782212c 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
@@ -130,7 +130,7 @@ TEST_F(WebStateListSerializationTest, SerializationRoundTrip) {
ASSERT_EQ(1, restored_web_state_list.count());
DeserializeWebStateList(
- &restored_web_state_list, session_window, false,
+ &restored_web_state_list, session_window,
base::BindRepeating(&SerializableTestWebState::CreateWithSessionStorage));
EXPECT_EQ(5, restored_web_state_list.count());
@@ -138,33 +138,7 @@ TEST_F(WebStateListSerializationTest, SerializationRoundTrip) {
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.
- ASSERT_EQ(restored_web_state_list_web_usage_enabled.count(),
- restored_web_state_list.count());
- for (int i = 0; i < restored_web_state_list.count(); ++i) {
- EXPECT_TRUE(restored_web_state_list_web_usage_enabled.GetWebStateAt(i)
- ->IsWebUsageEnabled());
+ // Verify that the WebUsageEnabled bit is left to default value.
+ for (int i = 0; i < restored_web_state_list.count(); ++i)
EXPECT_FALSE(restored_web_state_list.GetWebStateAt(i)->IsWebUsageEnabled());
- }
}

Powered by Google App Engine
This is Rietveld 408576698