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

chrome/renderer/chrome_render_frame_observer.cc

 // 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 "chrome/renderer/chrome_render_frame_observer.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <string>
@@ skipping 14 matching lines @@
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/constants.h"
 #include "net/base/net_util.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptReply.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
+#include "third_party/WebKit/public/web/WebFrameContentDumper.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/geometry/size_f.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_PRINTING)
 #include "components/printing/common/print_messages.h"
 #include "components/printing/renderer/print_web_view_helper.h"
 #endif
 
 using blink::WebDataSource;
 using blink::WebElement;
+using blink::WebFrameContentDumper;
 using blink::WebLocalFrame;
 using blink::WebNode;
 using blink::WebString;
 using content::SSLStatus;
 using content::RenderFrame;
 
 // Maximum number of characters in the document to index.
 // Any text beyond this point will be clipped.
 static const size_t kMaxIndexChars = 65535;
 
@@ skipping 287 matching lines @@
     return;
 
   // Don't index/capture pages that are being prerendered.
   if (prerender::PrerenderHelper::IsPrerendering(render_frame()))
     return;
 
   base::TimeTicks capture_begin_time = base::TimeTicks::Now();
 
   // Retrieve the frame's full text (up to kMaxIndexChars), and pass it to the
   // translate helper for language detection and possible translation.
-  base::string16 contents = frame->contentAsText(kMaxIndexChars);
+  // TODO(dglazkov): WebFrameContentDumper should only be used for
+  // testing purposes. See http://crbug.com/585164.
+  base::string16 contents =
+      WebFrameContentDumper::dumpFrameTreeAsText(frame, kMaxIndexChars);
 
   UMA_HISTOGRAM_TIMES(kTranslateCaptureText,
                       base::TimeTicks::Now() - capture_begin_time);
 
   // We should run language detection only once. Parsing finishes before
   // the page loads, so let's pick that timing.
   if (translate_helper_ && capture_type == PRELIMINARY_CAPTURE)
     translate_helper_->PageCaptured(contents);
 
   TRACE_EVENT0("renderer", "ChromeRenderFrameObserver::CapturePageText");
@@ skipping 12 matching lines @@
     case blink::WebMeaningfulLayout::FinishedParsing:
       CapturePageText(PRELIMINARY_CAPTURE);
       break;
     case blink::WebMeaningfulLayout::FinishedLoading:
       CapturePageText(FINAL_CAPTURE);
       break;
     default:
       break;
   }
 }