Shunt string-dumping functions from WebFrame to a side class.

third_party/WebKit/Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 60 matching lines @@
 #include "public/platform/WebUnitTestSupport.h"
 #include "public/web/WebAutofillClient.h"
 #include "public/web/WebContentDetectionResult.h"
 #include "public/web/WebDateTimeChooserCompletion.h"
 #include "public/web/WebDeviceEmulationParams.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebDragOperation.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebFrameClient.h"
+#include "public/web/WebFrameContentDumper.h"
 #include "public/web/WebHitTestResult.h"
 #include "public/web/WebInputEvent.h"
 #include "public/web/WebScriptSource.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebTreeScopeType.h"
 #include "public/web/WebViewClient.h"
 #include "public/web/WebWidget.h"
 #include "public/web/WebWidgetClient.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 2127 matching lines @@
 {
     ++m_count;
     return TestWebFrameClient::createChildFrame(parent, scope, frameName, sandboxFlags, frameOwnerProperties);
 }
 
 TEST_F(WebViewTest, ChangeDisplayMode)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("display_mode.html"));
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "display_mode.html", true);
 
-    std::string content = webView->mainFrame()->contentAsText(21).utf8();
+    std::string content = WebFrameContentDumper::dumpFrameTreeAsText(webView->mainFrame()->toWebLocalFrame(), 21).utf8();
     EXPECT_EQ("regular-ui", content);
 
     webView->setDisplayMode(WebDisplayModeMinimalUi);
-    content = webView->mainFrame()->contentAsText(21).utf8();
+    content = WebFrameContentDumper::dumpFrameTreeAsText(webView->mainFrame()->toWebLocalFrame(), 21).utf8();
     EXPECT_EQ("minimal-ui", content);
     m_webViewHelper.reset();
 }
 
 TEST_F(WebViewTest, AddFrameInCloseUnload)
 {
     CreateChildCounterFrameClient frameClient;
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("add_frame_in_unload.html"));
     m_webViewHelper.initializeAndLoad(m_baseURL + "add_frame_in_unload.html", true, &frameClient);
     m_webViewHelper.reset();
@@ skipping 450 matching lines @@
 TEST_F(WebViewTest, CompareSelectAllToContentAsText)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("longpress_selection.html"));
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "longpress_selection.html", true);
 
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
     frame->executeScript(WebScriptSource(WebString::fromUTF8("document.execCommand('SelectAll', false, null)")));
     std::string actual = frame->selectionAsText().utf8();
 
     const int kMaxOutputCharacters = 1024;
-    std::string expected = frame->contentAsText(kMaxOutputCharacters).utf8();
+    std::string expected = WebFrameContentDumper::dumpFrameTreeAsText(frame, kMaxOutputCharacters).utf8();
     EXPECT_EQ(expected, actual);
 }
 
 TEST_F(WebViewTest, AutoResizeSubtreeLayout)
 {
     std::string url = m_baseURL + "subtree-layout.html";
     URLTestHelpers::registerMockedURLLoad(toKURL(url), "subtree-layout.html");
     WebView* webView = m_webViewHelper.initialize(true);
 
     webView->enableAutoResizeMode(WebSize(200, 200), WebSize(200, 200));
@@ skipping 512 matching lines @@
     result = WebSubstringUtil::attributedSubstringInRange(frame, 5, 5, &baselinePoint);
     ASSERT_TRUE(!!result);
 
     point = WebPoint(baselinePoint.x, frameView->height() - baselinePoint.y);
     result = WebSubstringUtil::attributedWordAtPoint(webView, point, baselinePoint);
     ASSERT_TRUE(!!result);
 }
 #endif
 
 } // namespace blink