Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/autocomplete/autocomplete_edit_unittest.cc

-// 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.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/testing_profile.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 67 matching lines @@
                                     PageTransition::Type transition,
                                     const GURL& alternate_nav_url) OVERRIDE {}
   virtual void OnChanged() OVERRIDE {}
   virtual void OnSelectionBoundsChanged() OVERRIDE {}
   virtual void OnInputInProgress(bool in_progress) OVERRIDE {}
   virtual void OnKillFocus() OVERRIDE {}
   virtual void OnSetFocus() OVERRIDE {}
   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;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingAutocompleteEditController);
 };
 
 }
 
 typedef testing::Test AutocompleteEditTest;
@@ skipping 50 matching lines @@
     GURL url;
     bool write_url;
     model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected,
                             &result, &url, &write_url);
     EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i;
     EXPECT_EQ(input[i].write_url, write_url) << " @" << i;
     if (write_url)
       EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i;
   }
 }