Move favicon from TabContents to TabContentsWrapper.

chrome/browser/autocomplete/autocomplete_edit.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_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
@@ skipping 61 matching lines @@
   // Returns the favicon of the current page.
   virtual SkBitmap GetFavicon() const = 0;
 
   // Returns the title of the current page.
   virtual string16 GetTitle() const = 0;
 
   // Returns the InstantController, or NULL if instant is not enabled.
   virtual InstantController* GetInstant() = 0;
 
   // Returns the TabContentsWrapper of the currently selected tab.
-  virtual TabContentsWrapper* GetTabContentsWrapper() = 0;
+  virtual TabContentsWrapper* GetTabContentsWrapper() const = 0;
 
  protected:
   virtual ~AutocompleteEditController();
 };
 
 class AutocompleteEditModel : public AutocompleteControllerDelegate {
  public:
   struct State {
     State(bool user_input_in_progress,
           const string16& user_text,
@@ skipping 462 matching lines @@
   // It has no effect if a keyword is already selected.
   bool allow_exact_keyword_match_;
 
   // Last value of InstantCompleteBehavior supplied to |SetSuggestedText|.
   InstantCompleteBehavior instant_complete_behavior_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditModel);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_