Use MDCTypography instead of MDFRobotoFontLoader directly.

ios/chrome/browser/ui/omnibox/omnibox_popup_material_view_controller.mm

 // Copyright (c) 2014 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.
 
 #import "ios/chrome/browser/ui/omnibox/omnibox_popup_material_view_controller.h"
 
 #include <memory>
 
 #include "base/ios/ios_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "components/image_fetcher/ios/ios_image_data_fetcher_wrapper.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/suggestion_answer.h"
 #include "ios/chrome/browser/ui/animation_util.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_popup_material_row.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_popup_view_ios.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_util.h"
 #import "ios/chrome/browser/ui/omnibox/truncating_attributed_label.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
-#import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
 #include "net/base/escape.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 const int kRowCount = 6;
 const CGFloat kRowHeight = 48.0;
 const CGFloat kAnswerRowHeight = 64.0;
@@ skipping 426 matching lines @@
   NSDictionary* attributes = nil;
 
   const id font = (id)NSFontAttributeName;
   NSString* foregroundColor = (NSString*)NSForegroundColorAttributeName;
   const id baselineOffset = (id)NSBaselineOffsetAttributeName;
 
   // Answer types, sizes and colors specified at http://goto.google.com/ais_api.
   switch (type) {
     case SuggestionAnswer::TOP_ALIGNED:
       attributes = @{
-        font : [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:12],
+        font : [[MDCTypography fontLoader] regularFontOfSize:12],
         baselineOffset : @10.0f,
         foregroundColor : [UIColor grayColor],
       };
       break;
     case SuggestionAnswer::DESCRIPTION_POSITIVE:
       attributes = @{
-        font : [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:16],
+        font : [[MDCTypography fontLoader] regularFontOfSize:16],
         foregroundColor : [UIColor colorWithRed:11 / 255.0
                                           green:128 / 255.0
                                            blue:67 / 255.0
                                           alpha:1.0],
       };
       break;
     case SuggestionAnswer::DESCRIPTION_NEGATIVE:
       attributes = @{
-        font : [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:16],
+        font : [[MDCTypography fontLoader] regularFontOfSize:16],
         foregroundColor : [UIColor colorWithRed:197 / 255.0
                                           green:57 / 255.0
                                            blue:41 / 255.0
                                           alpha:1.0],
       };
       break;
     case SuggestionAnswer::PERSONALIZED_SUGGESTION:
       attributes = @{
-        font : [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:16],
+        font : [[MDCTypography fontLoader] regularFontOfSize:16],
       };
       break;
     case SuggestionAnswer::ANSWER_TEXT_MEDIUM:
       attributes = @{
-        font : [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:20],
+        font : [[MDCTypography fontLoader] regularFontOfSize:20],
         foregroundColor : [UIColor grayColor],
       };
       break;
     case SuggestionAnswer::ANSWER_TEXT_LARGE:
       attributes = @{
-        font : [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:24],
+        font : [[MDCTypography fontLoader] regularFontOfSize:24],
         foregroundColor : [UIColor grayColor],
       };
       break;
     case SuggestionAnswer::SUGGESTION_SECONDARY_TEXT_SMALL:
       attributes = @{
-        font : [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:12],
+        font : [[MDCTypography fontLoader] regularFontOfSize:12],
         foregroundColor : [UIColor grayColor],
       };
       break;
     case SuggestionAnswer::SUGGESTION_SECONDARY_TEXT_MEDIUM:
       attributes = @{
-        font : [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:14],
+        font : [[MDCTypography fontLoader] regularFontOfSize:14],
         foregroundColor : [UIColor grayColor],
       };
       break;
     case SuggestionAnswer::SUGGESTION:
     // Fall through.
     default:
       attributes = @{
-        font : [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:16],
+        font : [[MDCTypography fontLoader] regularFontOfSize:16],
       };
   }
 
   NSString* unescapedString =
       base::SysUTF16ToNSString(net::UnescapeForHTML(string));
   // TODO(jdonnelly): Remove this tag stripping once the JSON parsing class
   // handles HTML tags.
   unescapedString = [unescapedString stringByReplacingOccurrencesOfString:@"<b>"
                                                                withString:@""];
   unescapedString =
@@ skipping 148 matching lines @@
       [[NSMutableAttributedString alloc] initWithString:text];
 
   // Set the base attributes to the default font and color.
   NSDictionary* dict = @{
     NSFontAttributeName : fontRef,
     NSForegroundColorAttributeName : defaultColor,
   };
   [as addAttributes:dict range:NSMakeRange(0, [text length])];
 
   if (classifications != NULL) {
-    UIFont* boldFontRef = [[MDFRobotoFontLoader sharedInstance]
-        mediumFontOfSize:fontRef.pointSize];
+    UIFont* boldFontRef =
+        [[MDCTypography fontLoader] mediumFontOfSize:fontRef.pointSize];
 
     for (ACMatchClassifications::const_iterator i = classifications->begin();
          i != classifications->end(); ++i) {
       const BOOL isLast = (i + 1) == classifications->end();
       const size_t nextOffset = (isLast ? [text length] : (i + 1)->offset);
       const NSInteger location = static_cast<NSInteger>(i->offset);
       const NSInteger length = static_cast<NSInteger>(nextOffset - i->offset);
       // Guard against bad, off-the-end classification ranges due to
       // crbug.com/121703 and crbug.com/131370.
       if (i->offset + length > [text length] || length <= 0)
@@ skipping 75 matching lines @@
     // The delete button never disappears if you don't call this after a tap.
     // It doesn't seem to be required anywhere else.
     [_rows[indexPath.row] prepareForReuse];
     const AutocompleteMatch& match =
         ((const AutocompleteResult&)_currentResult).match_at(indexPath.row);
     _popupView->DeleteMatch(match);
   }
 }
 
 @end