Move skia to DEPS, and put it in third_party.

app/gfx/chrome_font_skia.cc

 // Copyright (c) 2006-2008 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 "app/gfx/chrome_font.h"
 
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 
-#include "skia/include/SkTypeface.h"
-#include "skia/include/SkPaint.h"
+#include "third_party/skia/include/core/SkTypeface.h"
+#include "third_party/skia/include/core/SkPaint.h"
 
 ChromeFont::ChromeFont(const ChromeFont& other) {
   CopyChromeFont(other);
 }
 
 ChromeFont& ChromeFont::operator=(const ChromeFont& other) {
   CopyChromeFont(other);
   return *this;
 }
 
@@ skipping 51 matching lines @@
 }
 
 int ChromeFont::ave_char_width() const {
   return avg_width_;
 }
 
 ChromeFont ChromeFont::CreateFont(const std::wstring& font_family,
                                   int font_size) {
   DCHECK_GT(font_size, 0);
 
-  SkTypeface* tf = SkTypeface::Create(base::SysWideToUTF8(font_family).c_str(),
-                                      SkTypeface::kNormal);
+  SkTypeface* tf = SkTypeface::CreateFromName(
+      base::SysWideToUTF8(font_family).c_str(), SkTypeface::kNormal);
   DCHECK(tf) << "Could not find font: " << base::SysWideToUTF8(font_family);
   SkAutoUnref tf_helper(tf);
 
   return ChromeFont(tf, font_family, font_size, NORMAL);
 }
 
 ChromeFont ChromeFont::DeriveFont(int size_delta, int style) const {
   // If the delta is negative, if must not push the size below 1
   if (size_delta < 0) {
     DCHECK_LT(-size_delta, font_size_);
   }
 
   if (style == style_) {
     // Fast path, we just use the same typeface at a different size
     return ChromeFont(typeface_, font_family_, font_size_ + size_delta, style_);
   }
 
   // If the style has changed we may need to load a new face
   int skstyle = SkTypeface::kNormal;
   if (BOLD & style)
     skstyle |= SkTypeface::kBold;
   if (ITALIC & style)
     skstyle |= SkTypeface::kItalic;
 
-  SkTypeface* tf = SkTypeface::Create(base::SysWideToUTF8(font_family_).c_str(),
-                                      static_cast<SkTypeface::Style>(skstyle));
+  SkTypeface* tf = SkTypeface::CreateFromName(
+      base::SysWideToUTF8(font_family_).c_str(),
+      static_cast<SkTypeface::Style>(skstyle));
   SkAutoUnref tf_helper(tf);
 
   return ChromeFont(tf, font_family_, font_size_ + size_delta, skstyle);
 }
 
 void ChromeFont::PaintSetup(SkPaint* paint) const {
   paint->setAntiAlias(false);
   paint->setSubpixelText(false);
   paint->setTextSize(SkFloatToScalar(font_size_));
   paint->setTypeface(typeface_);
@@ skipping 33 matching lines @@
   return font_family_;
 }
 
 int ChromeFont::FontSize() {
   return font_size_;
 }
 
 NativeFont ChromeFont::nativeFont() const {
   return typeface_;
 }