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

content/renderer/render_view_browsertest.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 41 matching lines @@
 #include "content/test/test_render_frame.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_status_flags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
+#include "third_party/WebKit/public/web/WebFrameContentDumper.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPerformance.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/range/range.h"
 
 #if defined(USE_AURA) && defined(USE_X11)
 #include <X11/Xlib.h>
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/events/test/events_test_utils.h"
 #include "ui/events/test/events_test_utils_x11.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 #endif
 
 #include "url/url_constants.h"
 
 using blink::WebFrame;
+using blink::WebFrameContentDumper;
 using blink::WebInputEvent;
 using blink::WebLocalFrame;
 using blink::WebMouseEvent;
 using blink::WebRuntimeFeatures;
 using blink::WebString;
 using blink::WebTextDirection;
 using blink::WebURLError;
 
 namespace content {
 
@@ skipping 1241 matching lines @@
     // Update the status of our IME back-end.
     // TODO(hbono): we should verify messages to be sent from the back-end.
     view()->UpdateTextInputState(ShowIme::HIDE_IME, ChangeSource::FROM_NON_IME);
     ProcessPendingMessages();
     render_thread_->sink().ClearMessages();
 
     if (ime_message->result) {
       // Retrieve the content of this page and compare it with the expected
       // result.
       const int kMaxOutputCharacters = 128;
-      base::string16 output =
-          GetMainFrame()->contentAsText(kMaxOutputCharacters);
+      base::string16 output = WebFrameContentDumper::dumpFrameTreeAsText(
+          GetMainFrame(), kMaxOutputCharacters);
       EXPECT_EQ(base::WideToUTF16(ime_message->result), output);
     }
   }
 }
 
 // Test that the RenderView::OnSetTextDirection() function can change the text
 // direction of the selected input element.
 TEST_F(RenderViewImplTest, OnSetTextDirection) {
   // Load an HTML page consisting of a <textarea> element and a <div> element.
   // This test changes the text direction of the <textarea> element, and
@@ skipping 28 matching lines @@
         "var result = document.getElementById('result');"
         "var node = document.getElementById('test');"
         "var style = getComputedStyle(node, null);"
         "result.innerText ="
         "    node.getAttribute('dir') + ',' +"
         "    style.getPropertyValue('direction');");
 
     // Copy the document content to std::wstring and compare with the
     // expected result.
     const int kMaxOutputCharacters = 16;
-    base::string16 output = GetMainFrame()->contentAsText(kMaxOutputCharacters);
+    base::string16 output = WebFrameContentDumper::dumpFrameTreeAsText(
+        GetMainFrame(), kMaxOutputCharacters);
     EXPECT_EQ(base::WideToUTF16(kTextDirection[i].expected_result), output);
   }
 }
 
 // Test that we can receive correct DOM events when we send input events
 // through the RenderWidget::OnHandleInputEvent() function.
 TEST_F(RenderViewImplTest, OnHandleKeyboardEvent) {
 #if !defined(OS_MACOSX)
   // Load an HTML page consisting of one <input> element and three
   // contentediable <div> elements.
@@ skipping 119 matching lines @@
                        "%d,%s",   // texts in the third <div> element
                        key_code, kModifierData[j].expected_result,
                        static_cast<int>(char_code[0]),
                        kModifierData[j].expected_result,
                        key_code, kModifierData[j].expected_result);
 
         // Retrieve the text in the test page and compare it with the expected
         // text created from a virtual-key code, a character code, and the
         // modifier-key status.
         const int kMaxOutputCharacters = 1024;
-        std::string output = base::UTF16ToUTF8(base::StringPiece16(
-            GetMainFrame()->contentAsText(kMaxOutputCharacters)));
+        std::string output = base::UTF16ToUTF8(
+            base::StringPiece16(WebFrameContentDumper::dumpFrameTreeAsText(
+                GetMainFrame(), kMaxOutputCharacters)));
         EXPECT_EQ(expected_result, output);
       }
     }
   }
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 // Test that our EditorClientImpl class can insert characters when we send
@@ skipping 210 matching lines @@
         base::string16 char_code;
         if (SendKeyEvent(layout, key_code, modifiers, &char_code) < 0)
           continue;
       }
     }
 
     // Retrieve the text in the test page and compare it with the expected
     // text created from a virtual-key code, a character code, and the
     // modifier-key status.
     const int kMaxOutputCharacters = 4096;
-    base::string16 output = GetMainFrame()->contentAsText(kMaxOutputCharacters);
+    base::string16 output = WebFrameContentDumper::dumpFrameTreeAsText(
+        GetMainFrame(), kMaxOutputCharacters);
     EXPECT_EQ(base::WideToUTF16(kLayouts[i].expected_result), output);
   }
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 // Crashy, http://crbug.com/53247.
 TEST_F(RenderViewImplTest, DISABLED_DidFailProvisionalLoadWithErrorForError) {
   GetMainFrame()->enableViewSourceMode(true);
@@ skipping 314 matching lines @@
 
   TestRenderFrame* subframe =
       static_cast<TestRenderFrame*>(RenderFrameImpl::FromWebFrame(
           view()->webview()->findFrameByName("frame")));
   subframe->Navigate(common_params, StartNavigationParams(), request_params);
   FrameLoadWaiter(subframe).Wait();
 
   // Copy the document content to std::wstring and compare with the
   // expected result.
   const int kMaxOutputCharacters = 256;
-  std::string output = base::UTF16ToUTF8(base::StringPiece16(
-      GetMainFrame()->contentAsText(kMaxOutputCharacters)));
+  std::string output = base::UTF16ToUTF8(
+      base::StringPiece16(WebFrameContentDumper::dumpFrameTreeAsText(
+          GetMainFrame(), kMaxOutputCharacters)));
   EXPECT_EQ(output, "hello \n\nworld");
 }
 
 // This test ensures that a RenderFrame object is created for the top level
 // frame in the RenderView.
 TEST_F(RenderViewImplTest, BasicRenderFrame) {
   EXPECT_TRUE(view()->main_render_frame_);
 }
 
 TEST_F(RenderViewImplTest, GetSSLStatusOfFrame) {
@@ skipping 99 matching lines @@
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.url = GURL("data:text/html,test data");
   TestRenderFrame* main_frame = static_cast<TestRenderFrame*>(frame());
   main_frame->Navigate(common_params, StartNavigationParams(),
                        RequestNavigationParams());
 
   // An error occurred.
   main_frame->didFailProvisionalLoad(web_frame, error,
                                      blink::WebStandardCommit);
   const int kMaxOutputCharacters = 22;
-  EXPECT_EQ("", base::UTF16ToASCII(
-      base::StringPiece16(web_frame->contentAsText(kMaxOutputCharacters))));
+  EXPECT_EQ("", base::UTF16ToASCII(base::StringPiece16(
+                    WebFrameContentDumper::dumpFrameTreeAsText(
+                        web_frame, kMaxOutputCharacters))));
 }
 
 #if defined(OS_ANDROID)
 // Crashing on Android: http://crbug.com/311341
 #define MAYBE_DoesNotSuppress DISABLED_DoesNotSuppress
 #else
 #define MAYBE_DoesNotSuppress DoesNotSuppress
 #endif
 
 TEST_F(RendererErrorPageTest, MAYBE_DoesNotSuppress) {
@@ skipping 13 matching lines @@
                        RequestNavigationParams());
 
   // An error occurred.
   main_frame->didFailProvisionalLoad(web_frame, error,
                                      blink::WebStandardCommit);
 
   // The error page itself is loaded asynchronously.
   FrameLoadWaiter(main_frame).Wait();
   const int kMaxOutputCharacters = 22;
   EXPECT_EQ("A suffusion of yellow.",
-            base::UTF16ToASCII(base::StringPiece16(
-                web_frame->contentAsText(kMaxOutputCharacters))));
+            base::UTF16ToASCII(
+                base::StringPiece16(WebFrameContentDumper::dumpFrameTreeAsText(
+                    web_frame, kMaxOutputCharacters))));
 }
 
 #if defined(OS_ANDROID)
 // Crashing on Android: http://crbug.com/311341
 #define MAYBE_HttpStatusCodeErrorWithEmptyBody \
   DISABLED_HttpStatusCodeErrorWithEmptyBody
 #else
 #define MAYBE_HttpStatusCodeErrorWithEmptyBody HttpStatusCodeErrorWithEmptyBody
 #endif
 TEST_F(RendererErrorPageTest, MAYBE_HttpStatusCodeErrorWithEmptyBody) {
@@ skipping 12 matching lines @@
                        RequestNavigationParams());
 
   // Emulate a 4xx/5xx main resource response with an empty body.
   main_frame->didReceiveResponse(web_frame, 1, response);
   main_frame->didFinishDocumentLoad(web_frame, true);
 
   // The error page itself is loaded asynchronously.
   FrameLoadWaiter(main_frame).Wait();
   const int kMaxOutputCharacters = 22;
   EXPECT_EQ("A suffusion of yellow.",
-            base::UTF16ToASCII(base::StringPiece16(
-                web_frame->contentAsText(kMaxOutputCharacters))));
+            base::UTF16ToASCII(
+                base::StringPiece16(WebFrameContentDumper::dumpFrameTreeAsText(
+                    web_frame, kMaxOutputCharacters))));
 }
 
 // Ensure the render view sends favicon url update events correctly.
 TEST_F(RenderViewImplTest, SendFaviconURLUpdateEvent) {
   // An event should be sent when a favicon url exists.
   LoadHTML("<html>"
            "<head>"
            "<link rel='icon' href='http://www.google.com/favicon.ico'>"
            "</head>"
            "</html>");
@@ skipping 435 matching lines @@
       FROM_HERE,
       base::Bind(&DevToolsAgentTest::CloseWhilePaused, base::Unretained(this)));
   ExecuteJavaScriptForTests("debugger;");
 
   // CloseWhilePaused should resume execution and continue here.
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content