Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

content/browser/tab_contents/tab_contents_observer.cc

 // Copyright (c) 2011 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 "content/browser/tab_contents/tab_contents_observer.h"
 
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 TabContentsObserver::Registrar::Registrar(TabContentsObserver* observer)
     : observer_(observer), tab_(NULL) {
 }
 
 TabContentsObserver::Registrar::~Registrar() {
   if (tab_)
     tab_->RemoveObserver(observer_);
 }
 
 void TabContentsObserver::Registrar::Observe(TabContents* tab) {
   observer_->SetTabContents(tab);
   if (tab_)
     tab_->RemoveObserver(observer_);
   tab_ = tab;
   if (tab_)
     tab_->AddObserver(observer_);
 }
 
-void TabContentsObserver::NavigateToPendingEntry(
-    const GURL& url,
-    NavigationController::ReloadType reload_type) {
+void TabContentsObserver::NavigateToPendingEntry() {
 }
 
 void TabContentsObserver::DidNavigateMainFramePostCommit(
     const NavigationController::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
 }
 
 void TabContentsObserver::DidNavigateAnyFramePostCommit(
     const NavigationController::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
@@ skipping 58 matching lines @@
 }
 
 void TabContentsObserver::TabContentsDestroyed() {
   // Do cleanup so that 'this' can safely be deleted from
   // OnTabContentsDestroyed.
   tab_contents_->RemoveObserver(this);
   TabContents* tab = tab_contents_;
   tab_contents_ = NULL;
   OnTabContentsDestroyed(tab);
 }