Fixes failures to load material design resource packs on try bots

This CL adds the resource packs to isolated tests and a final
production install.

See sample failures:
Failing trybot runs for --top-chrome-md=material-hybrid:
https://codereview.chromium.org/1388453002
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/111179
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_ozone_rel_ng/builds/70625

This also fixes those tests in browser_tests:
PreferenceServiceTest.Test
ExtensionApiTest.UpdateWindowResize
PreservedWindowPlacement.Test

BUG=540721, 538639, 538741, 539369, 505796

Review URL: https://codereview.chromium.org/1396913002

Cr-Commit-Position: refs/heads/master@{#353813}

7 files changed, 45 insertions, 2 deletions

diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index aff959b..7e79388 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -92,6 +92,14 @@
         ],
       },
     }],
+    ['OS=="linux" or OS=="win"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/chrome_material_100_percent.pak',
+          '<(PRODUCT_DIR)/chrome_100_percent.pak',
+        ],
+      },
+    }],
     ['disable_nacl==0 and (OS=="linux" or OS=="mac" or OS=="win")', {
       'variables': {
         'files': [
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index e82cb4f..98453be 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -20,6 +20,7 @@ wow_helper.exe: %(ChromeDir)s\
 #
 chrome.dll: %(VersionDir)s\
 chrome_100_percent.pak: %(VersionDir)s\
+chrome_material_100_percent.pak: %(VersionDir)s\
 chrome_child.dll: %(VersionDir)s\
 chrome_elf.dll: %(VersionDir)s\
 chrome_watcher.dll: %(VersionDir)s\
@@ -50,6 +51,7 @@ locales\*.pak: %(VersionDir)s\Locales
 
 [HIDPI]
 chrome_200_percent.pak: %(VersionDir)s\
+chrome_material_200_percent.pak: %(VersionDir)s\
 
 [TOUCH]
 
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index fbb78b2..d5af58e 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -63,6 +63,7 @@
     ['OS=="linux" or OS=="win"', {
       'variables': {
         'files': [
+          '<(PRODUCT_DIR)/chrome_material_100_percent.pak',
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/locales/fr.pak',
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index c96dcf0..218f1d4 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -314,6 +314,7 @@ if (!is_android) {
     if (is_linux || is_win) {
       data += [
         "$root_out_dir/chrome_100_percent.pak",
+        "$root_out_dir/chrome_material_100_percent.pak",
         "$root_out_dir/locales/en-US.pak",
         "$root_out_dir/locales/fr.pak",
       ]
@@ -779,7 +780,9 @@ if (!is_android) {
   # The _run targets exist only for compatibility w/ GYP.
   group("browser_tests_run") {
     testonly = true
-    data_deps = [ ":browser_tests" ]
+    data_deps = [
+      ":browser_tests",
+    ]
   }
 
   test("browser_tests") {
@@ -824,6 +827,7 @@ if (!is_android) {
       "$root_out_dir/pyproto/",
       "$root_out_dir/browser_tests.pak",
       "$root_out_dir/chrome_100_percent.pak",
+      "$root_out_dir/chrome_material_100_percent.pak",
       "$root_out_dir/locales/",
       "$root_out_dir/remoting/unittests/",
       "$root_out_dir/resources.pak",
@@ -1301,6 +1305,7 @@ if (!is_android) {
     if (is_linux || is_win) {
       data += [
         "$root_out_dir/chrome_100_percent.pak",
+        "$root_out_dir/chrome_material_100_percent.pak",
         "$root_out_dir/locales/en-US.pak",
       ]
     }
@@ -1328,7 +1333,9 @@ if (!is_android) {
       "//third_party/WebKit/public:blink",
     ]
 
-    data_deps = [ "//third_party/mesa:osmesa" ]
+    data_deps = [
+      "//third_party/mesa:osmesa",
+    ]
 
     if (cld_version == 2) {
       # Language detection is irrelevant to sync, so it can depend on any
@@ -1524,6 +1531,9 @@ if (!is_android) {
         "$root_out_dir/locales/en-US.pak",
       ]
     }
+    if (is_linux || is_win) {
+      data += [ "$root_out_dir/chrome_material_100_percent.pak" ]
+    }
 
     defines = []
 
diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg
index 192713a..cfe7217 100644
--- a/chrome/tools/build/chromeos/FILES.cfg
+++ b/chrome/tools/build/chromeos/FILES.cfg
@@ -37,6 +37,18 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
+    'filename': 'chrome_200_percent.pak',
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'chrome_material_100_percent.pak',
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'chrome_material_200_percent.pak',
+    'buildtype': ['dev', 'official'],
+  },
+  {
     'filename': 'chrome_sandbox',
     'buildtype': ['dev', 'official'],
   },
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 73d1141..7807d42 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -87,6 +87,15 @@ FILES = [
     'optional': ['dev', 'official'],
   },
   {
+    'filename': 'chrome_material_100_percent.pak',
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'chrome_material_200_percent.pak',
+    'buildtype': ['dev', 'official'],
+    'optional': ['dev', 'official'],
+  },
+  {
     'filename': 'crash_service.exe',
     'buildtype': ['dev', 'official'],
   },
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index a3bff84..e67d527 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -152,6 +152,7 @@
       'variables': {
         'files': [
           '../chromeos/test/data/network/',
+          '<(PRODUCT_DIR)/keyboard_resources.pak',
           '<(PRODUCT_DIR)/libexif.so',
           '<(PRODUCT_DIR)/test_data/chrome/browser/resources/chromeos/',
         ],