Move history serialization from contet/public/renderer/ to content/renderer/

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/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/files/file_path.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.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/shell_switches.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/renderer/gc_controller.h"
 #include "content/shell/renderer/leak_detector.h"
 #include "content/shell/renderer/shell_render_process_observer.h"
 #include "content/shell/renderer/test_runner/WebTask.h"
@@ skipping 497 matching lines @@
 void WebKitTestRunner::loadURLForFrame(const WebURL& url,
                              const std::string& frame_name) {
   Send(new ShellViewHostMsg_LoadURLForFrame(
       routing_id(), url, frame_name));
 }
 
 bool WebKitTestRunner::allowExternalPages() {
   return test_config_.allow_external_pages;
 }
 
-void WebKitTestRunner::captureHistoryForWindow(
-    WebTestProxyBase* proxy,
-    WebVector<blink::WebHistoryItem>* history,
-    size_t* currentEntryIndex) {
+std::string WebKitTestRunner::dumpHistoryForWindow(WebTestProxyBase* proxy) {
   size_t pos = 0;
   std::vector<int>::iterator id;
   for (id = routing_ids_.begin(); id != routing_ids_.end(); ++id, ++pos) {
     RenderView* render_view = RenderView::FromRoutingID(*id);
     if (!render_view) {
       NOTREACHED();
       continue;
     }
     if (WebKitTestRunner::Get(render_view)->proxy() == proxy)
       break;
   }
 
   if (id == routing_ids_.end()) {
     NOTREACHED();
-    return;
+    return std::string();
   }
-  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] =
-        PageStateToHistoryItem(session_histories_[pos][entry]);
-  }
-  history->swap(result);
+  return DumpBackForwardList(session_histories_[pos],
+                             current_entry_indexes_[pos]);
 }
 
 // RenderViewObserver  --------------------------------------------------------
 
 void WebKitTestRunner::DidClearWindowObject(WebLocalFrame* frame,
                                             int world_id) {
   WebTestingSupport::injectInternalsObject(frame);
   if (world_id == 0) {
     ShellRenderProcessObserver::GetInstance()->test_interfaces()->bindTo(frame);
     GCController::Install(frame);
@@ skipping 158 matching lines @@
 
   leak_detector_->TryLeakDetection(main_frame);
 }
 
 void WebKitTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content