Convert remaining WebContentsObservers loading callbacks to use RFH.

chrome/browser/dom_distiller/tab_utils_browsertest.cc

 // Copyright 2014 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 <string.h>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/dom_distiller/tab_utils.h"
@@ skipping 27 matching lines @@
 };
 
 class WebContentsMainFrameHelper : public content::WebContentsObserver {
  public:
   WebContentsMainFrameHelper(content::WebContents* web_contents,
                              const base::Closure& callback)
       : callback_(callback) {
     content::WebContentsObserver::Observe(web_contents);
   }
 
-  virtual void DidFinishLoad(
-      int64 frame_id,
-      const GURL& validated_url,
-      bool is_main_frame,
-      content::RenderViewHost* render_view_host) OVERRIDE {
-    if (is_main_frame && validated_url.scheme() == chrome::kDomDistillerScheme)
+  virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
+                             const GURL& validated_url) OVERRIDE {
+    if (!render_frame_host->GetParent() &&
+        validated_url.scheme() == chrome::kDomDistillerScheme)
       callback_.Run();
   }
 
  private:
   base::Closure callback_;
 };
 
 IN_PROC_BROWSER_TEST_F(DomDistillerTabUtilsBrowserTest, TestSwapWebContents) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
@@ skipping 18 matching lines @@
 
   // Verify the new URL is showing distilled content in a new WebContents.
   EXPECT_NE(initial_web_contents, after_web_contents);
   EXPECT_TRUE(after_web_contents->GetLastCommittedURL().SchemeIs(
       chrome::kDomDistillerScheme));
   EXPECT_EQ("Test Page Title",
             base::UTF16ToUTF8(after_web_contents->GetTitle()));
 }
 
 }  // namespace dom_distiller