Switch the page-capturing machinery to use the new hooks.

chrome/renderer/chrome_render_frame_observer.h

Index: chrome/renderer/chrome_render_frame_observer.h
diff --git a/chrome/renderer/chrome_render_frame_observer.h b/chrome/renderer/chrome_render_frame_observer.h
index 283729d7c2a34933ab7cf87a8d904f7a8557e8e4..a14cae66dc0d2b5291a7c33e0bb6165ac9e939c8 100644
--- a/chrome/renderer/chrome_render_frame_observer.h
+++ b/chrome/renderer/chrome_render_frame_observer.h
@@ -46,19 +46,20 @@ class PageInfo {
   explicit PageInfo(PageInfoReceiver* context);
   ~PageInfo() {}
 
-  void CapturePageInfoLater(CaptureType capture_type,
-                            content::RenderFrame* render_frame,
-                            base::TimeDelta delay);
-
- private:
-  // Checks if the current frame is an error page.
-  bool IsErrorPage(blink::WebLocalFrame* frame);
+  // void CapturePageInfoLater(CaptureType capture_type,
+  //                           content::RenderFrame* render_frame,
+  //                           base::TimeDelta delay);
 
   // Captures the thumbnail and text contents for indexing for the given load
   // ID.  Kicks off analysis of the captured text.
   void CapturePageInfo(content::RenderFrame* render_frame,
                        CaptureType capture_type);
 
+ private:
+  // Checks if the current frame is an error page.
+  bool IsErrorPage(blink::WebLocalFrame* frame);
+
+
   // Retrieves the text from the given frame contents, the page text up to the
   // maximum amount kMaxIndexChars will be placed into the given buffer.
   void CaptureText(blink::WebLocalFrame* frame, base::string16* contents);
@@ -87,6 +88,7 @@ class ChromeRenderFrameObserver : public content::RenderFrameObserver,
   void DidFinishLoad() override;
   void DidCommitProvisionalLoad(bool is_new_navigation,
                                 bool is_same_page_navigation) override;
+  void DidMeaningfulLayout(blink::WebMeaningfulLayout layout_type) override;
 
   // IPC handlers
   void OnSetIsPrerendering(bool is_prerendering);