Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

content/browser/tab_contents/tab_contents_observer.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_
 
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "ipc/ipc_channel.h"
 
 struct ViewHostMsg_FrameNavigate_Params;
 
 // An observer API implemented by classes which are interested in various page
 // load events from TabContents.  They also get a chance to filter IPC messages.
 class TabContentsObserver : public IPC::Channel::Listener,
                             public IPC::Message::Sender {
  public:
-  // Use this as a member variable in a class that uses the empty constructor
+  // Use this as a member variable in a class that uses the emptry constructor
   // version of this interface.
   class Registrar {
    public:
     explicit Registrar(TabContentsObserver* observer);
     ~Registrar();
 
     // Call this to start observing a tab.  Passing in NULL resets it.
     // This can only be used to watch one tab at a time.  If you call this and
     // you're already observing another tab, the old tab won't be observed
     // afterwards.
     void Observe(TabContents* tab);
 
    private:
     TabContentsObserver* observer_;
     TabContents* tab_;
 
     DISALLOW_COPY_AND_ASSIGN(Registrar);
   };
 
-  virtual void NavigateToPendingEntry(
-      const GURL& url,
-      NavigationController::ReloadType reload_type);
+  virtual void NavigateToPendingEntry();
 
   virtual void DidNavigateMainFramePostCommit(
       const NavigationController::LoadCommittedDetails& details,
       const ViewHostMsg_FrameNavigate_Params& params);
   virtual void DidNavigateAnyFramePostCommit(
       const NavigationController::LoadCommittedDetails& details,
       const ViewHostMsg_FrameNavigate_Params& params);
   virtual void OnProvisionalChangeToMainFrameUrl(const GURL& url);
 
   virtual void DidStartLoading();
@@ skipping 56 matching lines @@
 
   TabContents* tab_contents_;
 
   // The routing ID of the associated TabContents.
   int routing_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsObserver);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_