Add GTK3 and dependent instrumented libraries

third_party/instrumented_libraries/BUILD.gn

Index: third_party/instrumented_libraries/BUILD.gn
diff --git a/third_party/instrumented_libraries/BUILD.gn b/third_party/instrumented_libraries/BUILD.gn
index 35b21a404218ad239b916809ea6580708f4f7ff0..b35a0794b4c2922e33cd4cd23712dd476afc303b 100644
--- a/third_party/instrumented_libraries/BUILD.gn
+++ b/third_party/instrumented_libraries/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/linux/gtk/gtk.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/goma.gni")
 
@@ -111,6 +110,8 @@ if (use_locally_built_instrumented_libraries) {
       ":freetype",
       ":libappindicator1",
       ":libasound2",
+      ":libatk-bridge2.0-0",
+      ":libatspi2.0-0",
       ":libcairo2",
       ":libcap2",
       ":libcredentialkit_pkcs11",
@@ -123,9 +124,12 @@ if (use_locally_built_instrumented_libraries) {
       ":libfontconfig1",
       ":libgconf-2-4",
       ":libgcrypt11",
+      ":libgdk-pixbuf2.0-0",
       ":libglib2.0-0",
       ":libgnome-keyring0",
       ":libgpg-error0",
+      ":libgtk2.0-0",
+      ":libgtk-3-0",
       ":libnspr4",
       ":libp11-kit0",
       ":libpci3",
@@ -154,12 +158,6 @@ if (use_locally_built_instrumented_libraries) {
       ":udev",
       ":zlib1g",
     ]
-    if (!use_gtk3) {
-      deps += [
-        ":libgdk-pixbuf2.0-0",
-        ":libgtk2.0-0",
-      ]
-    }
     if (is_precise) {
       deps += [ ":libtasn1-3" ]
     }
@@ -364,6 +362,17 @@ if (use_locally_built_instrumented_libraries) {
     pre_build = "scripts/pre-build/libasound2.sh"
   }
 
+  instrumented_library("libatk-bridge2.0-0") {
+    extra_configure_flags = [ "--disable-static" ]
+  }
+
+  instrumented_library("libatspi2.0-0") {
+    extra_configure_flags = [
+      "--disable-static",
+      "--disable-introspection"
+    ]
+  }
+
   instrumented_library("libcairo2") {
     extra_configure_flags = [
       "--disable-gtk-doc",
@@ -580,6 +589,19 @@ if (use_locally_built_instrumented_libraries) {
     pre_build = "scripts/pre-build/libgtk2.0-0.sh"
   }
 
+  instrumented_library("libgtk-3-0") {
+    package_cflags = [ "-Wno-return-type" ]
+    extra_configure_flags = [
+      "--disable-static",
+      "--disable-introspection",
+
+      # From debian/rules.
+      "--enable-test-print-backend",
+      "--enable-x11-backend",
+    ]
+    pre_build = "scripts/pre-build/libgtk-3-0.sh"
+  }
+
   instrumented_library("libnspr4") {
     extra_configure_flags = [
       "--enable-64bit",