Introduce content::PageState (again).

content/shell/renderer/webkit_test_runner.cc

 // Copyright (c) 2012 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.
 
 #include "content/shell/renderer/webkit_test_runner.h"
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 
 #include "base/base64.h"
 #include "base/debug/debugger.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #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"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/renderer/shell_render_process_observer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
@@ skipping 18 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTestingSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTask.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestInterfaces.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h"
 #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"
 
 using WebKit::Platform;
 using WebKit::WebArrayBufferView;
 using WebKit::WebContextMenuData;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDeviceOrientation;
 using WebKit::WebElement;
@@ skipping 446 matching lines @@
 
   if (id == routing_ids_.end()) {
     NOTREACHED();
     return;
   }
   size_t num_entries = session_histories_[pos].size();
   *currentEntryIndex = current_entry_indexes_[pos];
   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);
 }
 
 WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer(
     WebFrame* frame, const WebURL& url, WebMediaPlayerClient* client)
 {
   if (!test_media_stream_client_) {
     test_media_stream_client_.reset(
         new webkit_glue::TestMediaStreamClient());
@@ skipping 149 matching lines @@
 
   WebTestInterfaces* interfaces =
       ShellRenderProcessObserver::GetInstance()->test_interfaces();
   interfaces->setTestIsRunning(true);
   interfaces->configureForTestWithURL(params.test_url,
                                       params.enable_pixel_dumping);
 }
 
 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;
   current_entry_indexes_ = current_entry_indexes;
   CaptureDump();
 }
 
 void WebKitTestRunner::OnReset() {
   ShellRenderProcessObserver::GetInstance()->test_interfaces()->resetAll();
   Reset();
   // Navigating to about:blank will make sure that no new loads are initiated
   // by the renderer.
   render_view()->GetWebView()->mainFrame()
       ->loadRequest(WebURLRequest(GURL("about:blank")));
   Send(new ShellViewHostMsg_ResetDone(routing_id()));
 }
 
 void WebKitTestRunner::OnNotifyDone() {
   render_view()->GetWebView()->mainFrame()->executeScript(
       WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();")));
 }
 
 }  // namespace content