Roll material_components_ios & material_roboto_font_loader_ios.

ios/third_party/material_roboto_font_loader_ios/BUILD.gn

Index: ios/third_party/material_roboto_font_loader_ios/BUILD.gn
diff --git a/ios/third_party/material_roboto_font_loader_ios/BUILD.gn b/ios/third_party/material_roboto_font_loader_ios/BUILD.gn
index b013f748c2d3935fef5d28ca19b214a1ad5e057b..c14230f1ed6a7b4aa87727395cbcc7ed5f8feb09 100644
--- a/ios/third_party/material_roboto_font_loader_ios/BUILD.gn
+++ b/ios/third_party/material_roboto_font_loader_ios/BUILD.gn
@@ -2,19 +2,32 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# Version v1.1.1 of material_components_ios uses a cocoa pod path to access

[lpromero, 2017/01/06 13:06:08]

CocoaPods

[sdefresne, 2017/01/06 13:15:29]

Done.

+# MaterialTypography.h which breaks Chromium build. This variable protects
+# the workaround so that it is clear what needs to be updated once upstream
+# code has been fixed.

[lpromero, 2017/01/06 13:06:08]

Add TODO(crbug.com/673904)

[sdefresne, 2017/01/06 13:15:29]

Done.

+use_material_typography_workaround = true
+
 config("material_roboto_font_loader_ios_config") {
   include_dirs = [ "src/src" ]
   visibility = [ ":material_roboto_font_loader_ios" ]
+
+  if (use_material_typography_workaround) {
+    include_dirs += [ "local_src" ]
+  }
 }
 
 source_set("material_roboto_font_loader_ios") {
   sources = [
+    "src/src/MDCTypographyAdditions/MDFRobotoFontLoader+MDCTypographyAdditions.h",
+    "src/src/MDCTypographyAdditions/MDFRobotoFontLoader+MDCTypographyAdditions.m",
     "src/src/MDFRobotoFontLoader.h",
     "src/src/MDFRobotoFontLoader.m",
     "src/src/MaterialRobotoFontLoader.h",
   ]
   deps = [
     ":material_roboto_font_loader_bundle",
+    "//ios/third_party/material_components_ios",
     "//ios/third_party/material_font_disk_loader_ios",
   ]
   public_configs = [ ":material_roboto_font_loader_ios_config" ]