Convert remaining WebContentsObservers loading callbacks to use RFH.

chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

 // Copyright (c) 2012 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/browser/ui/ash/launcher/launcher_favicon_loader.h"
 
 #include "ash/shelf/shelf_constants.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 21 matching lines @@
   virtual ~ContentsObserver() {}
 
   void Reset() {
     got_favicons_ = false;
   }
 
   bool loaded() const { return loaded_; }
   bool got_favicons() const { return got_favicons_; }
 
   // WebContentsObserver overrides.
-  virtual void DidFinishLoad(
-      int64 frame_id,
-      const GURL& validated_url,
-      bool is_main_frame,
-      content::RenderViewHost* render_view_host) OVERRIDE {
+  virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
+                             const GURL& validated_url) OVERRIDE {
     loaded_ = true;
   }
 
   virtual void DidUpdateFaviconURL(
       const std::vector<content::FaviconURL>& candidates) OVERRIDE {
     if (!candidates.empty())
       got_favicons_ = true;
   }
 
  private:
@@ skipping 123 matching lines @@
   EXPECT_TRUE(favicon_loader_->GetFavicon().empty());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   ASSERT_TRUE(NavigateTo("launcher-largefavicon.html"));
   ASSERT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_FALSE(favicon_loader_->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader_->GetFavicon().height());
 }