Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

chrome/browser/ui/cocoa/tab_contents/favicon_util.mm

 // 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/ui/cocoa/tab_contents/favicon_util.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/mac/mac_util.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "skia/ext/skia_utils_mac.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/mac/nsimage_cache.h"
 
 namespace mac {
 
 NSImage* FaviconForTabContents(TabContentsWrapper* contents) {
   // TabContents returns IDR_DEFAULT_FAVICON, which is a rasterized version of
   // the Mac PDF. Use the PDF so the icon in the Omnibox matches the default
   // favicon.
   if (contents && contents->favicon_tab_helper()->FaviconIsValid()) {
     CGColorSpaceRef color_space = base::mac::GetSystemColorSpace();
     NSImage* image = gfx::SkBitmapToNSImageWithColorSpace(
         contents->favicon_tab_helper()->GetFavicon(), color_space);
     // The |image| could be nil if the bitmap is null. In that case, fallback
     // to the default image.
     if (image) {
       return image;
     }
   }
 
   return gfx::GetCachedImageWithName(@"nav.pdf");
 }
 
 }  // namespace mac