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

content/renderer/render_view_browsertest_mac.mm

Index: content/renderer/render_view_browsertest_mac.mm
diff --git a/content/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm
index a973c313c4ecdc2b9096de0f0fc395bb222e96d2..2b8908428d1b18a75b34180c01771db55b73e897 100644
--- a/content/renderer/render_view_browsertest_mac.mm
+++ b/content/renderer/render_view_browsertest_mac.mm
@@ -10,11 +10,14 @@
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/render_view_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/public/web/WebFrameContentDumper.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 #include <Carbon/Carbon.h>  // for the kVK_* constants.
 #include <Cocoa/Cocoa.h>
 
+using blink::WebFrameContentDumper;
+
 namespace content {
 
 NSEvent* CmdDeadKeyEvent(NSEventType type, unsigned short code) {
@@ -104,7 +107,8 @@ TEST_F(RenderViewTest, MacTestCmdUp) {
   SendNativeKeyEvent(NativeWebKeyboardEvent(arrowDownKeyDown));
   ProcessPendingMessages();
   ExecuteJavaScriptForTests("scroll.textContent = window.pageYOffset");
-  output = GetMainFrame()->contentAsText(kMaxOutputCharacters);
+  output = WebFrameContentDumper::dumpFrameTreeAsText(GetMainFrame(),
+                                                      kMaxOutputCharacters);
   EXPECT_EQ(kArrowDownScrollDown, base::UTF16ToASCII(output));
 
   const char* kArrowUpScrollUp = "38,false,false,true,false\n0\np1";
@@ -113,7 +117,8 @@ TEST_F(RenderViewTest, MacTestCmdUp) {
   SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown));
   ProcessPendingMessages();
   ExecuteJavaScriptForTests("scroll.textContent = window.pageYOffset");
-  output = GetMainFrame()->contentAsText(kMaxOutputCharacters);
+  output = WebFrameContentDumper::dumpFrameTreeAsText(GetMainFrame(),
+                                                      kMaxOutputCharacters);
   EXPECT_EQ(kArrowUpScrollUp, base::UTF16ToASCII(output));
 
   // Now let javascript eat the key events -- no scrolling should happen.
@@ -127,7 +132,8 @@ TEST_F(RenderViewTest, MacTestCmdUp) {
   SendNativeKeyEvent(NativeWebKeyboardEvent(arrowDownKeyDown));
   ProcessPendingMessages();
   ExecuteJavaScriptForTests("scroll.textContent = window.pageYOffset");
-  output = GetMainFrame()->contentAsText(kMaxOutputCharacters);
+  output = WebFrameContentDumper::dumpFrameTreeAsText(GetMainFrame(),
+                                                      kMaxOutputCharacters);
   EXPECT_EQ(kArrowDownNoScroll, base::UTF16ToASCII(output));
 
   const char* kArrowUpNoScroll = "38,false,false,true,false\n100\np1";
@@ -136,7 +142,8 @@ TEST_F(RenderViewTest, MacTestCmdUp) {
   SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown));
   ProcessPendingMessages();
   ExecuteJavaScriptForTests("scroll.textContent = window.pageYOffset");
-  output = GetMainFrame()->contentAsText(kMaxOutputCharacters);
+  output = WebFrameContentDumper::dumpFrameTreeAsText(GetMainFrame(),
+                                                      kMaxOutputCharacters);
   EXPECT_EQ(kArrowUpNoScroll, base::UTF16ToASCII(output));
 }