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

chrome/renderer/chrome_render_frame_observer.h

 // 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.
 
 #ifndef CHROME_RENDERER_CHROME_RENDER_FRAME_OBSERVER_H_
 #define CHROME_RENDERER_CHROME_RENDER_FRAME_OBSERVER_H_
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "content/public/renderer/render_frame_observer.h"
@@ skipping 22 matching lines @@
  private:
   enum TextCaptureType { PRELIMINARY_CAPTURE, FINAL_CAPTURE };
 
   // RenderFrameObserver implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
   void DidFinishDocumentLoad() override;
   void DidStartProvisionalLoad() override;
   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);
   void OnRequestReloadImageForContextNode();
   void OnRequestThumbnailForContextNode(
       int thumbnail_min_area_pixels,
       const gfx::Size& thumbnail_max_size_pixels,
       int callback_id);
   void OnPrintNodeUnderContextMenu();
   void OnSetClientSidePhishingDetection(bool enable_phishing_detection);
   void OnAppBannerPromptRequest(int request_id,
                                 const std::string& platform);
 
   // Captures page information using the top (main) frame of a frame tree.
   // Currently, this page information is just the text content of the all
   // frames, collected and concatenated until a certain limit (kMaxIndexChars)
   // is reached.
   // TODO(dglazkov): This is incompatible with OOPIF and needs to be updated.
   void CapturePageText(TextCaptureType capture_type);
 
   void CapturePageTextLater(TextCaptureType capture_type,
                             base::TimeDelta delay);
 
-  // Used to delay calling CapturePageInfo.
-  base::Timer capture_timer_;
-
   // Have the same lifetime as us.
   translate::TranslateHelper* translate_helper_;
   safe_browsing::PhishingClassifierDelegate* phishing_classifier_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeRenderFrameObserver);
 };
 
 #endif  // CHROME_RENDERER_CHROME_RENDER_FRAME_OBSERVER_H_