Convert remaining WebContentsObservers loading callbacks to use RFH.

components/dom_distiller/content/distiller_page_web_contents.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 COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLER_PAGE_WEB_CONTENTS_H_
 #define COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLER_PAGE_WEB_CONTENTS_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "url/gurl.h"
 
-namespace content {
-class RenderViewHost;
-}
-
-using content::RenderViewHost;
-
 namespace dom_distiller {
 
 class SourcePageHandleWebContents : public SourcePageHandle {
  public:
   explicit SourcePageHandleWebContents(
       scoped_ptr<content::WebContents> web_contents);
   virtual ~SourcePageHandleWebContents();
 
   scoped_ptr<content::WebContents> GetWebContents();
 
@@ skipping 19 matching lines @@
 
 class DistillerPageWebContents : public DistillerPage,
                                  public content::WebContentsObserver {
  public:
   DistillerPageWebContents(
       content::BrowserContext* browser_context,
       scoped_ptr<SourcePageHandleWebContents> optional_web_contents_handle);
   virtual ~DistillerPageWebContents();
 
   // content::WebContentsObserver implementation.
-  virtual void DocumentLoadedInFrame(int64 frame_id,
-                                     RenderViewHost* render_view_host) OVERRIDE;
+  virtual void DocumentLoadedInFrame(
+      content::RenderFrameHost* render_frame_host) OVERRIDE;
 
-  virtual void DidFailLoad(int64 frame_id,
+  virtual void DidFailLoad(content::RenderFrameHost* render_frame_host,
                            const GURL& validated_url,
-                           bool is_main_frame,
                            int error_code,
-                           const base::string16& error_description,
-                           RenderViewHost* render_view_host) OVERRIDE;
+                           const base::string16& error_description) OVERRIDE;
 
  protected:
   virtual void DistillPageImpl(const GURL& url,
                                const std::string& script) OVERRIDE;
 
  private:
   friend class TestDistillerPageWebContents;
 
   enum State {
     // The page distiller is idle.
@@ skipping 26 matching lines @@
   std::string script_;
 
   scoped_ptr<content::WebContents> web_contents_;
   content::BrowserContext* browser_context_;
   DISALLOW_COPY_AND_ASSIGN(DistillerPageWebContents);
 };
 
 }  // namespace dom_distiller
 
 #endif  // COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLER_PAGE_WEB_CONTENTS_H_