Remove static caching of default favicon in CustomHomePagesTableModel

chrome/browser/custom_home_pages_table_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_CUSTOM_HOME_PAGES_TABLE_MODEL_H_
 #define CHROME_BROWSER_CUSTOM_HOME_PAGES_TABLE_MODEL_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "app/table_model.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/favicon_service.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class Profile;
 class TableModelObserver;
 
 // CustomHomePagesTableModel is the model for the TableView showing the list
 // of pages the user wants opened on startup.
@@ skipping 41 matching lines @@
     // Icon for the page.
     SkBitmap icon;
 
     // If non-zero, indicates we're loading the title for the page.
     HistoryService::Handle title_handle;
 
     // If non-zero, indicates we're loading the favicon for the page.
     FaviconService::Handle fav_icon_handle;
   };
 
-  static void InitClass();
-
   // Loads the title and favicon for the specified entry.
   void LoadTitleAndFavIcon(Entry* entry);
 
   // Callback from history service. Updates the title of the Entry whose
   // |title_handle| matches |handle| and notifies the observer of the change.
   void OnGotTitle(HistoryService::Handle handle,
                   bool found_url,
                   const history::URLRow* row,
                   history::VisitVector* visits);
 
@@ skipping 16 matching lines @@
   Entry* GetEntryByFavIconHandle(FaviconService::Handle handle,
                                  int* entry_index);
 
   // Returns the URL for a particular row, formatted for display to the user.
   std::wstring FormattedURL(int row) const;
 
   // Set of entries we're showing.
   std::vector<Entry> entries_;
 
   // Default icon to show when one can't be found for the URL.
-  static SkBitmap default_favicon_;
+  SkBitmap* default_favicon_;
 
   // Profile used to load titles and icons.
   Profile* profile_;
 
   TableModelObserver* observer_;
 
   // Used in loading titles and favicons.
   CancelableRequestConsumer query_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomHomePagesTableModel);
 };
 
 #endif  // CHROME_BROWSER_CUSTOM_HOME_PAGES_TABLE_MODEL_H_