Move legacyCreateTypeface to SkFontStyle.

components/font_service/public/cpp/font_loader.h

 // 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.
 
 #ifndef COMPONENTS_FONT_SERVICE_PUBLIC_CPP_FONT_LOADER_H_
 #define COMPONENTS_FONT_SERVICE_PUBLIC_CPP_FONT_LOADER_H_
 
 #include <stdint.h>
 
 #include "base/containers/hash_tables.h"
@@ skipping 25 matching lines @@
                    public internal::MappedFontFile::Observer {
  public:
   explicit FontLoader(mojo::Connector* connector);
   ~FontLoader() override;
 
   // Shuts down the background thread.
   void Shutdown();
 
   // SkFontConfigInterface:
   bool matchFamilyName(const char family_name[],
-                       SkTypeface::Style requested,
+                       SkFontStyle requested,
                        FontIdentity* out_font_identifier,
                        SkString* out_family_name,
-                       SkTypeface::Style* out_style) override;
+                       SkFontStyle* out_style) override;
   SkStreamAsset* openStream(const FontIdentity& identity) override;
 
  private:
   // internal::MappedFontFile::Observer:
   void OnMappedFontFileDestroyed(internal::MappedFontFile* f) override;
 
   // Thread to own the mojo message pipe. Because FontLoader can be called on
   // multiple threads, we create a dedicated thread to send and receive mojo
   // message calls.
   scoped_refptr<internal::FontServiceThread> thread_;
 
   // Lock preventing multiple threads from opening font file and accessing
   // |mapped_font_files_| map at the same time.
   base::Lock lock_;
 
   // Maps font identity ID to the memory-mapped file with font data.
   base::hash_map<uint32_t, internal::MappedFontFile*> mapped_font_files_;
 
   DISALLOW_COPY_AND_ASSIGN(FontLoader);
 };
 
 }  // namespace font_service
 
 #endif  // COMPONENTS_FONT_SERVICE_PUBLIC_CPP_FONT_LOADER_H_