Adapt to new icon interface from WebFrame

chrome/browser/favicon/favicon_tab_helper.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/favicon/favicon_tab_helper.h"
 
-#include "chrome/browser/defaults.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/icon_messages.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/webui/web_ui.h"
 #include "ui/gfx/codec/png_codec.h"
 
 FaviconTabHelper::FaviconTabHelper(TabContents* tab_contents)
     : TabContentsObserver(tab_contents) {
   favicon_handler_.reset(new FaviconHandler(tab_contents,
                                             FaviconHandler::FAVICON));
-  if (browser_defaults::kEnableTouchIcon)
+  if (chrome::kEnableTouchIcon)
     touch_icon_handler_.reset(new FaviconHandler(tab_contents,
                                                  FaviconHandler::TOUCH));
 }
 
 FaviconTabHelper::~FaviconTabHelper() {
 }
 
 void FaviconTabHelper::FetchFavicon(const GURL& url) {
   favicon_handler_->FetchFavicon(url);
   if (touch_icon_handler_.get())
@@ skipping 118 matching lines @@
     touch_icon_handler_->OnDidDownloadFavicon(id, image_url, errored, image);
 }
 
 void FaviconTabHelper::OnUpdateFaviconURL(
     int32 page_id,
     const std::vector<FaviconURL>& candidates) {
   favicon_handler_->OnUpdateFaviconURL(page_id, candidates);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnUpdateFaviconURL(page_id, candidates);
 }