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

content/shell/renderer/test_runner/WebTestProxy.cpp

 // Copyright 2013 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/test_runner/WebTestProxy.h"
 
 #include <cctype>
 
 #include "base/logging.h"
 #include "content/shell/renderer/test_runner/event_sender.h"
@@ skipping 286 matching lines @@
         result += data;
     }
 
     if (!recursive)
         return result;
     for (WebFrame* child = frame->firstChild(); child; child = child->nextSibling())
         result += dumpFrameScrollPosition(child, recursive);
     return result;
 }
 
-struct ToLower {
-    base::char16 operator()(base::char16 c) { return tolower(c); }
-};
-
-// Returns True if item1 < item2.
-bool HistoryItemCompareLess(const WebHistoryItem& item1, const WebHistoryItem& item2)
-{
-    base::string16 target1 = item1.target();
-    base::string16 target2 = item2.target();
-    std::transform(target1.begin(), target1.end(), target1.begin(), ToLower());
-    std::transform(target2.begin(), target2.end(), target2.begin(), ToLower());
-    return target1 < target2;
-}
-
-string dumpHistoryItem(const WebHistoryItem& item, int indent, bool isCurrent)
-{
-    string result;
-
-    if (isCurrent) {
-        result.append("curr->");
-        result.append(indent - 6, ' '); // 6 == "curr->".length()
-    } else
-        result.append(indent, ' ');
-
-    string url = normalizeLayoutTestURL(item.urlString().utf8());
-    result.append(url);
-    if (!item.target().isEmpty()) {
-        result.append(" (in frame \"");
-        result.append(item.target().utf8());
-        result.append("\")");
-    }
-    result.append("\n");
-
-    const WebVector<WebHistoryItem>& children = item.children();
-    if (!children.isEmpty()) {
-        // Must sort to eliminate arbitrary result ordering which defeats
-        // reproducible testing.
-        // FIXME: WebVector should probably just be a std::vector!!
-        std::vector<WebHistoryItem> sortedChildren;
-        for (size_t i = 0; i < children.size(); ++i)
-            sortedChildren.push_back(children[i]);
-        std::sort(sortedChildren.begin(), sortedChildren.end(), HistoryItemCompareLess);
-        for (size_t i = 0; i < sortedChildren.size(); ++i)
-            result += dumpHistoryItem(sortedChildren[i], indent + 4, false);
-    }
-
-    return result;
-}
-
-void dumpBackForwardList(const WebVector<WebHistoryItem>& history, size_t currentEntryIndex, string& result)
-{
-    result.append("\n============== Back Forward List ==============\n");
-    for (size_t index = 0; index < history.size(); ++index)
-        result.append(dumpHistoryItem(history[index], 8, index == currentEntryIndex));
-    result.append("===============================================\n");
-}
-
 string dumpAllBackForwardLists(TestInterfaces* interfaces, WebTestDelegate* delegate)
 {
     string result;
     const vector<WebTestProxyBase*>& windowList = interfaces->windowList();
-    for (unsigned i = 0; i < windowList.size(); ++i) {
-        size_t currentEntryIndex = 0;
-        WebVector<WebHistoryItem> history;
-        delegate->captureHistoryForWindow(windowList.at(i), &history, &currentEntryIndex);
-        dumpBackForwardList(history, currentEntryIndex, result);
-    }
+    for (unsigned i = 0; i < windowList.size(); ++i)
+        result.append(delegate->dumpHistoryForWindow(windowList.at(i)));
     return result;
 }
 
 }
 
 WebTestProxyBase::WebTestProxyBase()
     : m_testInterfaces(0)
     , m_delegate(0)
     , m_webWidget(0)
     , m_spellcheck(new SpellCheckClient(this))
@@ skipping 968 matching lines @@
 
 void WebTestProxyBase::resetInputMethod()
 {
     // If a composition text exists, then we need to let the browser process
     // to cancel the input method's ongoing composition session.
     if (m_webWidget)
         m_webWidget->confirmComposition();
 }
 
 }  // namespace content