1 files changed, 3 insertions, 54 deletions
diff --git a/content/common/sandbox_mac_fontloading_unittest.mm b/content/common/sandbox_mac_fontloading_unittest.mm
index b4b1a88..bca576d 100644
--- a/content/common/sandbox_mac_fontloading_unittest.mm
+++ b/content/common/sandbox_mac_fontloading_unittest.mm
@@ -18,48 +18,6 @@ namespace {
 using sandboxtest::MacSandboxTest;
 using sandbox::Sandbox;
 
-bool CGFontFromFontContainer(ATSFontContainerRef container, CGFontRef* out) {
-  // Count the number of fonts that were loaded.
-  ItemCount fontCount = 0;
-  OSStatus err = ATSFontFindFromContainer(container, kATSOptionFlagsDefault, 0,
-                    NULL, &fontCount);
-
-  if (err != noErr || fontCount < 1) {
-    return false;
-  }
-
-  // Load font from container.
-  ATSFontRef font_ref_ats = 0;
-  ATSFontFindFromContainer(container, kATSOptionFlagsDefault, 1,
-      &font_ref_ats, NULL);
-
-  if (!font_ref_ats) {
-    return false;
-  }
-
-  // Convert to cgFont.
-  CGFontRef font_ref_cg = CGFontCreateWithPlatformFont(&font_ref_ats);
-
-  if (!font_ref_cg) {
-    return false;
-  }
-
-  *out = font_ref_cg;
-  return true;
-}
-
-class ScopedFontContainer {
- public:
-  explicit ScopedFontContainer(ATSFontContainerRef ref)
-      : container_ref(ref) {}
-
-  ~ScopedFontContainer() {
-    ATSFontDeactivate(container_ref, NULL, kATSOptionFlagsDefault);
-  }
-
-  ATSFontContainerRef container_ref;
-};
-
 class FontLoadingTestCase : public sandboxtest::MacSandboxTestCase {
  public:
   FontLoadingTestCase() : font_data_length_(-1) {}
@@ -112,19 +70,10 @@ bool FontLoadingTestCase::SandboxedTest() {
     return false;
   }
 
-  ATSFontContainerRef font_container;
-  if (!FontLoader::ATSFontContainerFromBuffer(shmem_handle, font_data_length_,
-          &font_container)) {
-    LOG(ERROR) << "Call to CreateCGFontFromBuffer() failed";
-    return false;
-  }
-
-  // Unload the font container when done.
-  ScopedFontContainer scoped_unloader(font_container);
-
   CGFontRef cg_font_ref;
-  if (!CGFontFromFontContainer(font_container, &cg_font_ref)) {
-    LOG(ERROR) << "CGFontFromFontContainer failed";
+  if (!FontLoader::CGFontRefFromBuffer(shmem_handle, font_data_length_,
+                                       &cg_font_ref)) {
+    LOG(ERROR) << "Call to CreateCGFontFromBuffer() failed";
     return false;
   }