Add |web_usage_enabled| to DeserializeWebStateList()

ios/chrome/browser/web_state_list/web_state_list_serialization_unittest.mm

 // Copyright 2017 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.
 
 #import "ios/chrome/browser/web_state_list/web_state_list_serialization.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 106 matching lines @@
   original_web_state_list.SetOpenerOfWebStateAt(
       3, WebStateOpener(original_web_state_list.GetWebStateAt(1), 1));
   original_web_state_list.ActivateWebStateAt(1);
 
   SessionWindowIOS* session_window =
       SerializeWebStateList(&original_web_state_list);
 
   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_enabled.count(),
restored_web_state_list.count()) ?

[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.count() ?

[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());
+  }
 }