Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5

chrome/BUILD.gn

Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 7192fa497949454b8695b6c83790da9c32440b4c..c66526065a4b1ae97fae471a3351b24c80cb4f0b 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -631,7 +631,9 @@ if (is_win) {
       sources += [ "$root_out_dir/chrome_200_percent.pak" ]
     }
 
-    if (enable_topchrome_md) {
+    # TODO(estade): remove material design specific resources.
+    # See crbug.com/613593
+    if (is_mac) {
       sources += [ "$root_out_dir/chrome_material_100_percent.pak" ]
 
       if (enable_hidpi) {
@@ -1079,7 +1081,7 @@ group("packed_resources") {
     public_deps += [ ":repack_chrome_200_percent" ]
   }
 
-  if (enable_topchrome_md) {
+  if (is_mac) {
     public_deps += [ ":repack_chrome_material_100_percent" ]
 
     if (enable_hidpi) {
@@ -1335,7 +1337,6 @@ template("chrome_repack_material_percent") {
     # All sources should also have deps for completeness.
     sources = [
       "$root_gen_dir/chrome/theme_resources_material_${percent}_percent.pak",
-      "$root_gen_dir/components/components_resources_material_${percent}_percent.pak",
     ]
 
     deps = [
@@ -1360,7 +1361,7 @@ template("chrome_repack_material_percent") {
   }
 }
 
-if (enable_topchrome_md) {
+if (is_mac) {
   chrome_repack_material_percent("repack_chrome_material_100_percent") {
     percent = "100"
   }