Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 270 matching lines @@
 
 string16 LocationBarViewMac::GetTitle() const {
   NOTIMPLEMENTED();
   return string16();
 }
 
 InstantController* LocationBarViewMac::GetInstant() {
   return browser_->instant();
 }
 
-TabContentsWrapper* LocationBarViewMac::GetTabContentsWrapper() const {
+TabContentsWrapper* LocationBarViewMac::GetTabContentsWrapper() {
   return browser_->GetSelectedTabContentsWrapper();
 }
 
 void LocationBarViewMac::Revert() {
   edit_view_->RevertAll();
 }
 
 const AutocompleteEditView* LocationBarViewMac::location_entry() const {
     return edit_view_.get();
   }
@@ skipping 321 matching lines @@
 
   // These need to change anytime the layout changes.
   // TODO(shess): Anytime the field editor might have changed, the
   // cursor rects almost certainly should have changed.  The tooltips
   // might change even when the rects don't change.
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ updateCursorAndToolTipRects];
 
   [field_ setNeedsDisplay:YES];
 }