Remove use of legacy SkFontMgr factories.

content/child/font_warmup_win_unittest.cc

 // Copyright 2015 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 "content/child/font_warmup_win.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <windows.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/sys_byteorder.h"
 #include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkString.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 
 namespace content {
 
 namespace {
 
 class TestSkTypeface : public SkTypeface {
  public:
@@ skipping 94 matching lines @@
 };
 
 const char* kTestFontFamily = "GDITest";
 const wchar_t* kTestFontFamilyW = L"GDITest";
 const SkFontTableTag kTestFontTableTag = 0x11223344;
 const char* kTestFontData = "GDITestGDITest";
 const wchar_t* kTestFontFamilyInvalid = L"InvalidFont";
 
 class TestSkFontMgr : public SkFontMgr {
  public:
-  TestSkFontMgr() { content::SetPreSandboxWarmupFontMgrForTesting(this); }
+  TestSkFontMgr() {
+    content::SetPreSandboxWarmupFontMgrForTesting(sk_ref_sp(this));
+  }
   ~TestSkFontMgr() override {
-    content::SetPreSandboxWarmupFontMgrForTesting(nullptr);
+    content::SetPreSandboxWarmupFontMgrForTesting(sk_sp<SkFontMgr>());

[f(malita), 2017/01/09 15:25:34]

nit: I think nullptr reads better here.

[bungeman-chromium, 2017/01/09 19:15:28]

Done.

   }
 
  protected:
   int onCountFamilies() const override { return 1; }
 
   void onGetFamilyName(int index, SkString* familyName) const override {
     if (index == 0)
       *familyName = kTestFontFamily;
   }
 
@@ skipping 271 matching lines @@
   DWORD data_size = static_cast<DWORD>(strlen(kTestFontData));
   std::vector<char> data(data_size);
   DWORD size = GetFontData(hdc, kTestFontTableTag, 0, &data[0], data.size());
   EXPECT_EQ(size, data_size);
   EXPECT_EQ(memcmp(&data[0], kTestFontData, data.size()), 0);
   EXPECT_TRUE(DeleteObject(font));
   EXPECT_TRUE(DeleteDC(hdc));
 }
 
 }  // namespace content