Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/views/toolbar_view.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 "chrome/browser/ui/views/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/accessibility/browser_accessibility_state.h"
@@ skipping 303 matching lines @@
   wrench_menu_->RunMenu(app_menu_);
 
   if (destroyed_flag)
     return;
   destroyed_flag_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, LocationBarView::Delegate implementation:
 
-TabContentsWrapper* ToolbarView::GetTabContentsWrapper() const {
+TabContentsWrapper* ToolbarView::GetTabContentsWrapper() {
   return browser_->GetSelectedTabContentsWrapper();
 }
 
 InstantController* ToolbarView::GetInstant() {
   return browser_->instant();
 }
 
 void ToolbarView::OnInputInProgress(bool in_progress) {
   // The edit should make sure we're only notified when something changes.
   DCHECK(model_->input_in_progress() != in_progress);
@@ skipping 412 matching lines @@
     NOTREACHED();
 #endif
   } else {
     NOTREACHED();
   }
 
   canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin);
 
   return canvas->ExtractBitmap();
 }