Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.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 CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_
 #pragma once
 
 #include <string>
 
@@ skipping 120 matching lines @@
       PageTransition::Type transition,
       const GURL& alternate_nav_url);
   virtual void OnChanged();
   virtual void OnSelectionBoundsChanged();
   virtual void OnInputInProgress(bool in_progress);
   virtual void OnKillFocus();
   virtual void OnSetFocus();
   virtual SkBitmap GetFavicon() const;
   virtual string16 GetTitle() const;
   virtual InstantController* GetInstant();
-  virtual TabContentsWrapper* GetTabContentsWrapper() const;
+  virtual TabContentsWrapper* GetTabContentsWrapper();
 
   NSImage* GetKeywordImage(const string16& keyword);
 
   AutocompleteTextField* GetAutocompleteTextField() { return field_; }
 
 
   // Overridden from NotificationObserver.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
@@ skipping 66 matching lines @@
   // Used to register for notifications received by NotificationObserver.
   NotificationRegistrar registrar_;
 
   // Used to schedule a task for the first run info bubble.
   ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_