Move legacyCreateTypeface to SkFontStyle.

components/font_service/public/cpp/font_loader.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 "components/font_service/public/cpp/font_loader.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/trace_event/trace_event.h"
 #include "components/font_service/public/cpp/font_service_thread.h"
 #include "mojo/shell/public/cpp/connector.h"
 
 namespace font_service {
 
 FontLoader::FontLoader(mojo::Connector* connector) {
   FontServicePtr font_service;
   connector->ConnectToInterface("mojo:font_service", &font_service);
   thread_ = new internal::FontServiceThread(std::move(font_service));
 }
 
 FontLoader::~FontLoader() {}
 
 void FontLoader::Shutdown() {
   thread_->Stop();
   thread_ = nullptr;
 }
 
 bool FontLoader::matchFamilyName(const char family_name[],
-                                 SkTypeface::Style requested,
+                                 SkFontStyle requested,
                                  FontIdentity* out_font_identifier,
                                  SkString* out_family_name,
-                                 SkTypeface::Style* out_style) {
+                                 SkFontStyle* out_style) {
   TRACE_EVENT1("font_service", "FontServiceThread::MatchFamilyName",
                "family_name", family_name);
   return thread_->MatchFamilyName(family_name, requested, out_font_identifier,
                                   out_family_name, out_style);
 }
 
 SkStreamAsset* FontLoader::openStream(const FontIdentity& identity) {
   TRACE_EVENT2("font_loader", "FontLoader::openStream",
                "identity", identity.fID,
                "name", identity.fString.c_str());
@@ skipping 23 matching lines @@
 }
 
 void FontLoader::OnMappedFontFileDestroyed(internal::MappedFontFile* f) {
   TRACE_EVENT1("font_loader", "FontLoader::OnMappedFontFileDestroyed",
                "identity", f->font_id());
   base::AutoLock lock(lock_);
   mapped_font_files_.erase(f->font_id());
 }
 
 }  // namespace font_service