Revert 187283

content/common/font_config_ipc_linux.h

Index: content/common/font_config_ipc_linux.h
===================================================================
--- content/common/font_config_ipc_linux.h	(revision 187285)
+++ content/common/font_config_ipc_linux.h	(working copy)
@@ -6,7 +6,7 @@
 #define CONTENT_COMMON_FONT_CONFIG_IPC_LINUX_H_
 
 #include "base/compiler_specific.h"
-#include "third_party/skia/include/ports/SkFontConfigInterface.h"
+#include "skia/ext/SkFontHost_fontconfig_impl.h"
 
 #include <string>
 
@@ -14,28 +14,27 @@
 
 // FontConfig implementation for Skia that proxies out of process to get out
 // of the sandbox. See http://code.google.com/p/chromium/wiki/LinuxSandboxIPC
-class FontConfigIPC : public SkFontConfigInterface {
+class FontConfigIPC : public FontConfigInterface {
  public:
   explicit FontConfigIPC(int fd);
   virtual ~FontConfigIPC();
 
-  virtual bool matchFamilyName(const char familyName[],
-                               SkTypeface::Style requested,
-                               FontIdentity* outFontIdentifier,
-                               SkString* outFamilyName,
-                               SkTypeface::Style* outStyle) OVERRIDE;
+  // FontConfigInterface implementation.
+  virtual bool Match(std::string* result_family,
+                     unsigned* result_filefaceid,
+                     bool filefaceid_valid,
+                     unsigned filefaceid,
+                     const std::string& family,
+                     const void* characters,
+                     size_t characters_bytes,
+                     bool* is_bold, bool* is_italic) OVERRIDE;
+  virtual int Open(unsigned filefaceid) OVERRIDE;
 
-  virtual SkStream* openStream(const FontIdentity&) OVERRIDE;
-
   enum Method {
     METHOD_MATCH = 0,
     METHOD_OPEN = 1,
   };
 
-  enum {
-    kMaxFontFamilyLength = 2048
-  };
-
  private:
   const int fd_;
 };