Introduce content::PageState

content/shell/renderer/webkit_test_runner.cc

Index: content/shell/renderer/webkit_test_runner.cc
diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc
index 866b096bf4018e6b6203785cb565328b52389884..376f1098aeca4e5ac3b2c71fb37d34db3799228e 100644
--- a/content/shell/renderer/webkit_test_runner.cc
+++ b/content/shell/renderer/webkit_test_runner.cc
@@ -18,6 +18,7 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "content/public/renderer/history_item_serialization.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "content/public/test/layouttest_support.h"
@@ -56,7 +57,6 @@
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h"
 #include "ui/gfx/rect.h"
 #include "webkit/base/file_path_string_conversions.h"
-#include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/mocks/test_media_stream_client.h"
@@ -523,7 +523,7 @@ void WebKitTestRunner::captureHistoryForWindow(
   WebVector<WebHistoryItem> result(num_entries);
   for (size_t entry = 0; entry < num_entries; ++entry) {
     result[entry] =
-        webkit_glue::HistoryItemFromString(session_histories_[pos][entry]);
+        PageStateToHistoryItem(session_histories_[pos][entry]);
   }
   history->swap(result);
 }
@@ -692,7 +692,7 @@ void WebKitTestRunner::OnSetTestConfiguration(
 
 void WebKitTestRunner::OnSessionHistory(
     const std::vector<int>& routing_ids,
-    const std::vector<std::vector<std::string> >& session_histories,
+    const std::vector<std::vector<PageState> >& session_histories,
     const std::vector<unsigned>& current_entry_indexes) {
   routing_ids_ = routing_ids;
   session_histories_ = session_histories;