BASELINE: Update Chromium to 65.0.3525.40

Also imports missing submodules

Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

5 files changed, 42 insertions, 68 deletions

diff --git a/chromium/chrome/installer/linux/BUILD.gn b/chromium/chrome/installer/linux/BUILD.gn
index 225c6fd2669..fbf86a5726a 100644
--- a/chromium/chrome/installer/linux/BUILD.gn
+++ b/chromium/chrome/installer/linux/BUILD.gn
@@ -61,6 +61,8 @@ packaging_files = packaging_files_binaries + [
                     "$root_out_dir/xdg-mime",
                     "$root_out_dir/xdg-settings",
                     "$root_out_dir/locales/en-US.pak",
+                    "$root_out_dir/MEIPreload/manifest.json",
+                    "$root_out_dir/MEIPreload/preloaded_data.pb",
                   ]
 
 action_foreach("calculate_deb_dependencies") {
@@ -348,6 +350,7 @@ group("installer_deps") {
     ":theme_files",
     "//chrome",
     "//chrome:packed_resources",
+    "//chrome/browser/resources/media/mei_preload:component",
     "//sandbox/linux:chrome_sandbox",
   ]
   if (enable_nacl) {
@@ -431,6 +434,8 @@ template("linux_package") {
       rebase_path(root_out_dir, root_build_dir),
       "-s",
       rebase_path(sysroot, root_build_dir),
+      "-t",
+      target_os,
     ]
     if (is_official_build) {
       args += [ "-f" ]
@@ -481,6 +486,8 @@ template("linux_package") {
         branding_path_component,
         "-o",
         rebase_path(root_out_dir, root_build_dir),
+        "-t",
+        target_os,
       ]
       if (is_official_build) {
         args += [ "-f" ]
diff --git a/chromium/chrome/installer/linux/debian/dist_package_versions.json b/chromium/chrome/installer/linux/debian/dist_package_versions.json
index 7b9c8ec41b3..6266402f167 100644
--- a/chromium/chrome/installer/linux/debian/dist_package_versions.json
+++ b/chromium/chrome/installer/linux/debian/dist_package_versions.json
@@ -1,26 +1,22 @@
 {
     "Debian 10 (Buster)": {
-        "gconf-service": "3.2.6-4+b1",
         "libasound2": "1.1.3-5",
         "libatk-bridge2.0-0": "2.26.0-1",
         "libatk1.0-0": "2.26.0-2",
-        "libc6": "2.24-17",
+        "libc6": "2.25-3",
         "libcairo2": "1.15.8-2",
         "libcups2": "2.2.6-2",
-        "libdbus-1-3": "1.12.0-1",
-        "libdconf1": "0.26.1-1",
+        "libdbus-1-3": "1.12.2-1",
         "libexpat1": "2.2.3-2",
-        "libfontconfig1": "2.12.3-0.2",
-        "libgcc1": "1:7.2.0-14",
-        "libgconf-2-4": "3.2.6-4+b1",
+        "libgcc1": "1:7.2.0-17",
         "libgdk-pixbuf2.0-0": "2.36.11-1",
         "libglib2.0-0": "2.54.1-1",
         "libgtk-3-0": "3.22.24-3",
-        "libnspr4": "2:4.16-1",
-        "libnss3": "2:3.33-1",
+        "libnspr4": "2:4.16-1+b1",
+        "libnss3": "2:3.34-1",
         "libpango-1.0-0": "1.40.12-1",
         "libpangocairo-1.0-0": "1.40.12-1",
-        "libstdc++6": "7.2.0-14",
+        "libstdc++6": "7.2.0-17",
         "libx11-6": "2:1.6.4-3",
         "libx11-xcb1": "2:1.6.4-3",
         "libxcb1": "1.12-1",
@@ -36,7 +32,6 @@
         "libxtst6": "2:1.2.3-1"
     },
     "Debian 8 (Jessie)": {
-        "gconf-service": "3.2.6-3",
         "libasound2": "1.0.28-1",
         "libatk-bridge2.0-0": "2.14.0-2",
         "libatk1.0-0": "2.14.0-1",
@@ -44,11 +39,8 @@
         "libcairo2": "1.14.0-2.1+deb8u2",
         "libcups2": "1.7.5-11+deb8u1",
         "libdbus-1-3": "1.8.22-0+deb8u1",
-        "libdconf1": "0.22.0-1",
         "libexpat1": "2.1.0-6+deb8u4",
-        "libfontconfig1": "2.11.0-6.3+deb8u1",
         "libgcc1": "1:4.9.2-10",
-        "libgconf-2-4": "3.2.6-3",
         "libgdk-pixbuf2.0-0": "2.31.1-2+deb8u6",
         "libglib2.0-0": "2.42.1-1+b1",
         "libgtk-3-0": "3.14.5-1+deb8u1",
@@ -57,34 +49,30 @@
         "libpango-1.0-0": "1.36.8-3",
         "libpangocairo-1.0-0": "1.36.8-3",
         "libstdc++6": "4.9.2-10",
-        "libx11-6": "2:1.6.2-3",
-        "libx11-xcb1": "2:1.6.2-3",
+        "libx11-6": "2:1.6.2-3+deb8u1",
+        "libx11-xcb1": "2:1.6.2-3+deb8u1",
         "libxcb1": "1.10-3+b1",
         "libxcomposite1": "1:0.4.4-1",
-        "libxcursor1": "1:1.1.14-1+b1",
+        "libxcursor1": "1:1.1.14-1+deb8u1",
         "libxdamage1": "1:1.1.4-2+b1",
         "libxext6": "2:1.3.3-1",
-        "libxfixes3": "1:5.0.1-2+b2",
-        "libxi6": "2:1.7.4-1+b2",
-        "libxrandr2": "2:1.4.2-1+b1",
+        "libxfixes3": "1:5.0.1-2+deb8u1",
+        "libxi6": "2:1.7.4-1+deb8u1",
+        "libxrandr2": "2:1.4.2-1+deb8u1",
         "libxrender1": "1:0.9.8-1+b1",
         "libxss1": "1:1.2.2-1",
-        "libxtst6": "2:1.2.2-1+b1"
+        "libxtst6": "2:1.2.2-1+deb8u1"
     },
     "Debian 9 (Stretch)": {
-        "gconf-service": "3.2.6-4+b1",
         "libasound2": "1.1.3-5",
         "libatk-bridge2.0-0": "2.22.0-2",
         "libatk1.0-0": "2.22.0-1",
         "libc6": "2.24-11+deb9u1",
         "libcairo2": "1.14.8-1",
         "libcups2": "2.2.1-8",
-        "libdbus-1-3": "1.10.22-0+deb9u1",
-        "libdconf1": "0.26.0-2+b1",
+        "libdbus-1-3": "1.10.24-0+deb9u1",
         "libexpat1": "2.2.0-2+deb9u1",
-        "libfontconfig1": "2.11.0-6.7+b1",
         "libgcc1": "1:6.3.0-18",
-        "libgconf-2-4": "3.2.6-4+b1",
         "libgdk-pixbuf2.0-0": "2.36.5-2+deb9u1",
         "libglib2.0-0": "2.50.3-2",
         "libgtk-3-0": "3.22.11-1",
@@ -97,7 +85,7 @@
         "libx11-xcb1": "2:1.6.4-3",
         "libxcb1": "1.12-1",
         "libxcomposite1": "1:0.4.4-2",
-        "libxcursor1": "1:1.1.14-1+b4",
+        "libxcursor1": "1:1.1.14-1+deb9u1",
         "libxdamage1": "1:1.1.4-2+b3",
         "libxext6": "2:1.3.3-1+b2",
         "libxfixes3": "1:5.0.3-1",
@@ -108,7 +96,6 @@
         "libxtst6": "2:1.2.3-1"
     },
     "Ubuntu 14.04 (Trusty)": {
-        "gconf-service": "3.2.6-0ubuntu2",
         "libasound2": "1.0.27.2-3ubuntu7",
         "libatk-bridge2.0-0": "2.10.2-2ubuntu1",
         "libatk1.0-0": "2.10.0-2ubuntu2",
@@ -116,11 +103,8 @@
         "libcairo2": "1.13.0~20140204-0ubuntu1.1",
         "libcups2": "1.7.2-0ubuntu1.7",
         "libdbus-1-3": "1.6.18-0ubuntu4.4",
-        "libdconf1": "0.20.0-1",
         "libexpat1": "2.1.0-4ubuntu1.4",
-        "libfontconfig1": "2.11.0-0ubuntu4.2",
         "libgcc1": "1:4.9.3-0ubuntu4",
-        "libgconf-2-4": "3.2.6-0ubuntu2",
         "libgdk-pixbuf2.0-0": "2.30.7-0ubuntu1.7",
         "libglib2.0-0": "2.40.2-0ubuntu1",
         "libgtk-3-0": "3.10.8-0ubuntu1.4",
@@ -133,7 +117,7 @@
         "libx11-xcb1": "2:1.6.2-1ubuntu2",
         "libxcb1": "1.10-2ubuntu1",
         "libxcomposite1": "1:0.4.4-1",
-        "libxcursor1": "1:1.1.14-1",
+        "libxcursor1": "1:1.1.14-1ubuntu0.14.04.1",
         "libxdamage1": "1:1.1.4-1ubuntu1",
         "libxext6": "2:1.3.2-1ubuntu0.0.14.04.1",
         "libxfixes3": "1:5.0.1-1ubuntu1.1",
@@ -144,7 +128,6 @@
         "libxtst6": "2:1.2.2-1"
     },
     "Ubuntu 16.04 (Xenial)": {
-        "gconf-service": "3.2.6-3ubuntu6",
         "libasound2": "1.1.0-0ubuntu1",
         "libatk-bridge2.0-0": "2.18.1-2ubuntu1",
         "libatk1.0-0": "2.18.0-1",
@@ -152,11 +135,8 @@
         "libcairo2": "1.14.6-1",
         "libcups2": "2.1.3-4ubuntu0.3",
         "libdbus-1-3": "1.10.6-1ubuntu3.1",
-        "libdconf1": "0.24.0-2",
         "libexpat1": "2.1.0-7ubuntu0.16.04.3",
-        "libfontconfig1": "2.11.94-0ubuntu1.1",
         "libgcc1": "1:6.0.1-0ubuntu1",
-        "libgconf-2-4": "3.2.6-3ubuntu6",
         "libgdk-pixbuf2.0-0": "2.32.2-1ubuntu1.3",
         "libglib2.0-0": "2.48.2-0ubuntu1",
         "libgtk-3-0": "3.18.9-1ubuntu3.3",
@@ -169,7 +149,7 @@
         "libx11-xcb1": "2:1.6.3-1ubuntu2",
         "libxcb1": "1.11.1-1ubuntu1",
         "libxcomposite1": "1:0.4.4-1",
-        "libxcursor1": "1:1.1.14-1",
+        "libxcursor1": "1:1.1.14-1ubuntu0.16.04.1",
         "libxdamage1": "1:1.1.4-2",
         "libxext6": "2:1.3.3-1",
         "libxfixes3": "1:5.0.1-2",
@@ -180,7 +160,6 @@
         "libxtst6": "2:1.2.2-1"
     },
     "Ubuntu 17.04 (Zesty)": {
-        "gconf-service": "3.2.6-3ubuntu7",
         "libasound2": "1.1.3-5",
         "libatk-bridge2.0-0": "2.22.0-1ubuntu1",
         "libatk1.0-0": "2.22.0-1",
@@ -188,11 +167,8 @@
         "libcairo2": "1.14.8-1",
         "libcups2": "2.2.2-1ubuntu1",
         "libdbus-1-3": "1.10.10-1ubuntu2",
-        "libdconf1": "0.26.0-2",
         "libexpat1": "2.2.0-2ubuntu0.1",
-        "libfontconfig1": "2.11.94-0ubuntu2",
         "libgcc1": "1:6.3.0-12ubuntu2",
-        "libgconf-2-4": "3.2.6-3ubuntu7",
         "libgdk-pixbuf2.0-0": "2.36.5-3ubuntu0.2",
         "libglib2.0-0": "2.52.0-1",
         "libgtk-3-0": "3.22.11-0ubuntu3",
@@ -205,7 +181,7 @@
         "libx11-xcb1": "2:1.6.4-3",
         "libxcb1": "1.11.1-1ubuntu1",
         "libxcomposite1": "1:0.4.4-2",
-        "libxcursor1": "1:1.1.14-1",
+        "libxcursor1": "1:1.1.14-1ubuntu0.17.04.1",
         "libxdamage1": "1:1.1.4-2",
         "libxext6": "2:1.3.3-1",
         "libxfixes3": "1:5.0.3-1",
@@ -216,7 +192,6 @@
         "libxtst6": "2:1.2.3-1"
     },
     "Ubuntu 17.10 (Artful)": {
-        "gconf-service": "3.2.6-4ubuntu1",
         "libasound2": "1.1.3-5",
         "libatk-bridge2.0-0": "2.26.0-1ubuntu1",
         "libatk1.0-0": "2.26.0-2ubuntu1",
@@ -224,11 +199,8 @@
         "libcairo2": "1.14.10-1ubuntu1",
         "libcups2": "2.2.4-7ubuntu3",
         "libdbus-1-3": "1.10.22-1ubuntu1",
-        "libdconf1": "0.26.0-2",
         "libexpat1": "2.2.3-1",
-        "libfontconfig1": "2.11.94-0ubuntu2",
         "libgcc1": "1:7.2.0-8ubuntu3",
-        "libgconf-2-4": "3.2.6-4ubuntu1",
         "libgdk-pixbuf2.0-0": "2.36.11-1",
         "libglib2.0-0": "2.54.1-1ubuntu1",
         "libgtk-3-0": "3.22.25-0ubuntu0.1",
@@ -241,7 +213,7 @@
         "libx11-xcb1": "2:1.6.4-3",
         "libxcb1": "1.12-1ubuntu1",
         "libxcomposite1": "1:0.4.4-2",
-        "libxcursor1": "1:1.1.14-3",
+        "libxcursor1": "1:1.1.14-3ubuntu0.1",
         "libxdamage1": "1:1.1.4-3",
         "libxext6": "2:1.3.3-1",
         "libxfixes3": "1:5.0.3-1",
diff --git a/chromium/chrome/installer/linux/rpm/dist_package_provides.json b/chromium/chrome/installer/linux/rpm/dist_package_provides.json
index 61667584855..c231d2ecba1 100644
--- a/chromium/chrome/installer/linux/rpm/dist_package_provides.json
+++ b/chromium/chrome/installer/linux/rpm/dist_package_provides.json
@@ -57,14 +57,12 @@
         "libdbus-1.so.3()(64bit)",
         "libdbus-1.so.3(LIBDBUS_1_3)(64bit)",
         "libdbus-1.so.3(LIBDBUS_PRIVATE_1.11.18)(64bit)",
-        "libdconf.so.1()(64bit)",
         "libdl.so.2()(64bit)",
         "libdl.so.2(GLIBC_2.2.5)(64bit)",
         "libdl.so.2(GLIBC_2.3.3)(64bit)",
         "libdl.so.2(GLIBC_2.3.4)(64bit)",
         "libexpat.so.0()(64bit)",
         "libexpat.so.1()(64bit)",
-        "libfontconfig.so.1()(64bit)",
         "libgcc_s.so.1()(64bit)",
         "libgcc_s.so.1(GCC_3.0)(64bit)",
         "libgcc_s.so.1(GCC_3.3)(64bit)",
@@ -77,7 +75,6 @@
         "libgcc_s.so.1(GCC_4.3.0)(64bit)",
         "libgcc_s.so.1(GCC_4.7.0)(64bit)",
         "libgcc_s.so.1(GCC_4.8.0)(64bit)",
-        "libgconf-2.so.4()(64bit)",
         "libgdk-3.so.0()(64bit)",
         "libgdk_pixbuf-2.0.so.0()(64bit)",
         "libgio-2.0.so.0()(64bit)",
@@ -131,6 +128,7 @@
         "libnss3.so(NSS_3.30)(64bit)",
         "libnss3.so(NSS_3.31)(64bit)",
         "libnss3.so(NSS_3.33)(64bit)",
+        "libnss3.so(NSS_3.34)(64bit)",
         "libnss3.so(NSS_3.4)(64bit)",
         "libnss3.so(NSS_3.5)(64bit)",
         "libnss3.so(NSS_3.6)(64bit)",
@@ -298,14 +296,12 @@
         "libdbus-1.so.3()(64bit)",
         "libdbus-1.so.3(LIBDBUS_1_3)(64bit)",
         "libdbus-1.so.3(LIBDBUS_PRIVATE_1.11.18)(64bit)",
-        "libdconf.so.1()(64bit)",
         "libdl.so.2()(64bit)",
         "libdl.so.2(GLIBC_2.2.5)(64bit)",
         "libdl.so.2(GLIBC_2.3.3)(64bit)",
         "libdl.so.2(GLIBC_2.3.4)(64bit)",
         "libexpat.so.0()(64bit)",
         "libexpat.so.1()(64bit)",
-        "libfontconfig.so.1()(64bit)",
         "libgcc_s.so.1()(64bit)",
         "libgcc_s.so.1(GCC_3.0)(64bit)",
         "libgcc_s.so.1(GCC_3.3)(64bit)",
@@ -319,7 +315,6 @@
         "libgcc_s.so.1(GCC_4.7.0)(64bit)",
         "libgcc_s.so.1(GCC_4.8.0)(64bit)",
         "libgcc_s.so.1(GCC_7.0.0)(64bit)",
-        "libgconf-2.so.4()(64bit)",
         "libgdk-3.so.0()(64bit)",
         "libgdk_pixbuf-2.0.so.0()(64bit)",
         "libgio-2.0.so.0()(64bit)",
@@ -374,6 +369,7 @@
         "libnss3.so(NSS_3.30)(64bit)",
         "libnss3.so(NSS_3.31)(64bit)",
         "libnss3.so(NSS_3.33)(64bit)",
+        "libnss3.so(NSS_3.34)(64bit)",
         "libnss3.so(NSS_3.4)(64bit)",
         "libnss3.so(NSS_3.5)(64bit)",
         "libnss3.so(NSS_3.6)(64bit)",
@@ -545,13 +541,11 @@
         "libdbus-1.so.3()(64bit)",
         "libdbus-1.so.3(LIBDBUS_1_3)(64bit)",
         "libdbus-1.so.3(LIBDBUS_PRIVATE_1.12.0)(64bit)",
-        "libdconf.so.1()(64bit)",
         "libdl.so.2()(64bit)",
         "libdl.so.2(GLIBC_2.2.5)(64bit)",
         "libdl.so.2(GLIBC_2.3.3)(64bit)",
         "libdl.so.2(GLIBC_2.3.4)(64bit)",
         "libexpat.so.1()(64bit)",
-        "libfontconfig.so.1()(64bit)",
         "libgcc_s.so.1()(64bit)",
         "libgcc_s.so.1(GCC_3.0)(64bit)",
         "libgcc_s.so.1(GCC_3.3)(64bit)",
@@ -565,7 +559,6 @@
         "libgcc_s.so.1(GCC_4.7.0)(64bit)",
         "libgcc_s.so.1(GCC_4.8.0)(64bit)",
         "libgcc_s.so.1(GCC_7.0.0)(64bit)",
-        "libgconf-2.so.4()(64bit)",
         "libgdk-3.so.0()(64bit)",
         "libgdk_pixbuf-2.0.so.0()(64bit)",
         "libgio-2.0.so.0()(64bit)",
@@ -621,6 +614,7 @@
         "libnss3.so(NSS_3.30)(64bit)",
         "libnss3.so(NSS_3.31)(64bit)",
         "libnss3.so(NSS_3.33)(64bit)",
+        "libnss3.so(NSS_3.34)(64bit)",
         "libnss3.so(NSS_3.4)(64bit)",
         "libnss3.so(NSS_3.5)(64bit)",
         "libnss3.so(NSS_3.6)(64bit)",
@@ -845,8 +839,6 @@
         "libcups.so.2()(64bit)",
         "libdbus-1.so.3",
         "libdbus-1.so.3()(64bit)",
-        "libdconf.so.1",
-        "libdconf.so.1()(64bit)",
         "libdl.so.2",
         "libdl.so.2()(64bit)",
         "libdl.so.2(GLIBC_2.0)",
@@ -861,8 +853,6 @@
         "libexpat.so.0()(64bit)",
         "libexpat.so.1",
         "libexpat.so.1()(64bit)",
-        "libfontconfig.so.1",
-        "libfontconfig.so.1()(64bit)",
         "libgcc_s.so.1",
         "libgcc_s.so.1()(64bit)",
         "libgcc_s.so.1(GCC_3.0)",
@@ -889,8 +879,6 @@
         "libgcc_s.so.1(GCC_4.8.0)",
         "libgcc_s.so.1(GCC_4.8.0)(64bit)",
         "libgcc_s.so.1(GLIBC_2.0)",
-        "libgconf-2.so.4",
-        "libgconf-2.so.4()(64bit)",
         "libgdk-3.so.0",
         "libgdk-3.so.0()(64bit)",
         "libgdk_pixbuf-2.0.so.0",
@@ -1300,8 +1288,6 @@
         "libcups.so.2()(64bit)",
         "libdbus-1.so.3",
         "libdbus-1.so.3()(64bit)",
-        "libdconf.so.1",
-        "libdconf.so.1()(64bit)",
         "libdl.so.2",
         "libdl.so.2()(64bit)",
         "libdl.so.2(GLIBC_2.0)",
@@ -1316,8 +1302,6 @@
         "libexpat.so.0()(64bit)",
         "libexpat.so.1",
         "libexpat.so.1()(64bit)",
-        "libfontconfig.so.1",
-        "libfontconfig.so.1()(64bit)",
         "libgcc_s.so.1",
         "libgcc_s.so.1()(64bit)",
         "libgcc_s.so.1(GCC_3.0)",
@@ -1346,8 +1330,6 @@
         "libgcc_s.so.1(GCC_7.0.0)",
         "libgcc_s.so.1(GCC_7.0.0)(64bit)",
         "libgcc_s.so.1(GLIBC_2.0)",
-        "libgconf-2.so.4",
-        "libgconf-2.so.4()(64bit)",
         "libgdk-3.so.0",
         "libgdk-3.so.0()(64bit)",
         "libgdk_pixbuf-2.0.so.0",
@@ -1631,6 +1613,8 @@
         "libstdc++.so.6(GLIBCXX_3.4.22)(64bit)",
         "libstdc++.so.6(GLIBCXX_3.4.23)",
         "libstdc++.so.6(GLIBCXX_3.4.23)(64bit)",
+        "libstdc++.so.6(GLIBCXX_3.4.24)",
+        "libstdc++.so.6(GLIBCXX_3.4.24)(64bit)",
         "libstdc++.so.6(GLIBCXX_3.4.3)",
         "libstdc++.so.6(GLIBCXX_3.4.3)(64bit)",
         "libstdc++.so.6(GLIBCXX_3.4.4)",
diff --git a/chromium/chrome/installer/mini_installer/BUILD.gn b/chromium/chrome/installer/mini_installer/BUILD.gn
index 88a6d8627d5..3f65aa27ca3 100644
--- a/chromium/chrome/installer/mini_installer/BUILD.gn
+++ b/chromium/chrome/installer/mini_installer/BUILD.gn
@@ -133,6 +133,7 @@ template("generate_mini_installer") {
       "$root_out_dir/locales/en-US.pak",
       "$root_out_dir/setup.exe",
       "$root_out_dir/v8_context_snapshot.bin",
+      "//chrome/tools/build/win/makecab.py",
       release_file,
     ]
 
diff --git a/chromium/chrome/installer/zucchini/BUILD.gn b/chromium/chrome/installer/zucchini/BUILD.gn
index 1f00eedd90f..47eef3adfad 100644
--- a/chromium/chrome/installer/zucchini/BUILD.gn
+++ b/chromium/chrome/installer/zucchini/BUILD.gn
@@ -32,8 +32,12 @@ static_library("zucchini_lib") {
     "element_detection.h",
     "encoded_view.cc",
     "encoded_view.h",
+    "ensemble_matcher.cc",
+    "ensemble_matcher.h",
     "equivalence_map.cc",
     "equivalence_map.h",
+    "heuristic_ensemble_matcher.cc",
+    "heuristic_ensemble_matcher.h",
     "image_index.cc",
     "image_index.h",
     "image_utils.h",
@@ -46,6 +50,8 @@ static_library("zucchini_lib") {
     "patch_utils.h",
     "patch_writer.cc",
     "patch_writer.h",
+    "reference_set.cc",
+    "reference_set.h",
     "rel32_finder.cc",
     "rel32_finder.h",
     "rel32_utils.cc",
@@ -53,6 +59,8 @@ static_library("zucchini_lib") {
     "reloc_utils.cc",
     "reloc_utils.h",
     "suffix_array.h",
+    "target_pool.cc",
+    "target_pool.h",
     "targets_affinity.cc",
     "targets_affinity.h",
     "type_win_pe.h",
@@ -144,10 +152,12 @@ test("zucchini_unittests") {
     "mapped_file_unittest.cc",
     "patch_read_write_unittest.cc",
     "patch_utils_unittest.cc",
+    "reference_set_unittest.cc",
     "rel32_finder_unittest.cc",
     "rel32_utils_unittest.cc",
     "reloc_utils_unittest.cc",
     "suffix_array_unittest.cc",
+    "target_pool_unittest.cc",
     "targets_affinity_unittest.cc",
     "test_disassembler.cc",
     "test_disassembler.h",