Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/autocomplete/autocomplete_edit_unittest.cc

Index: chrome/browser/autocomplete/autocomplete_edit_unittest.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete_edit_unittest.cc	(revision 80859)
+++ chrome/browser/autocomplete/autocomplete_edit_unittest.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -86,7 +86,7 @@
   virtual SkBitmap GetFavicon() const OVERRIDE { return SkBitmap(); }
   virtual string16 GetTitle() const OVERRIDE { return string16(); }
   virtual InstantController* GetInstant() OVERRIDE { return NULL; }
-  virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE {
+  virtual TabContentsWrapper* GetTabContentsWrapper() OVERRIDE {
     return NULL;
   }
 
Property changes on: chrome/browser/autocomplete/autocomplete_edit_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo