Revert "Add precompiled headers to GN build for large targets."

This reverts commit 8f3218985dde74063ccc362da47803be163f3165.

It looks like this may have broken incremental builds on Win.

TBR=brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

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

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

51 files changed, 108 insertions, 187 deletions

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 9a10e27..b710cf5 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -14,7 +14,6 @@ gypi_values = exec_script("//build/gypi_to_gn.py",
 component("ash") {
   sources = gypi_values.ash_sources
 
-  configs += [ "//build/config:precompiled_headers" ]
   defines = [ "ASH_IMPLEMENTATION" ]
 
   public_deps = [
@@ -174,10 +173,9 @@ component("ash_with_content") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = gypi_values.ash_test_support_sources
-  configs += [ "//build/config:precompiled_headers" ]
 
   public_deps = [
     ":ash",
@@ -253,7 +251,6 @@ static_library("ash_shell_lib") {
 
 test("ash_unittests") {
   sources = gypi_values.ash_unittests_sources
-  configs += [ "//build/config:precompiled_headers" ]
 
   deps = [
     ":ash",
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 6eac22e..23cc60f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -645,10 +645,7 @@ component("base") {
 
   data = []
 
-  configs += [
-    ":base_implementation",
-    "//build/config:precompiled_headers",
-  ]
+  configs += [ ":base_implementation" ]
 
   deps = [
     ":base_static",
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index 39eea78..127ec82 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -124,8 +124,6 @@ source_set("test_support") {
     "values_test_util.h",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   data = [
     # The isolate needs this script for setting up the test. It's not actually
     # needed to run this target locally.
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index 618de26..56a86e5 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -418,7 +418,9 @@ config("default_libs") {
 #
 # Recommend precompiled headers for targets with more than 50 .cc files.
 config("precompiled_headers") {
-  if (is_win) {
+  # TODO(brettw) enable this when GN support in the binary has been rolled.
+  #if (is_win) {
+  if (false) {
     # This is a string rather than a file GN knows about. It has to match
     # exactly what's in the /FI flag below, and what might appear in the source
     # code in quotes for an #include directive.
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 871abf2..86d1586 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -108,12 +108,6 @@ config("compiler") {
       "/FS",  # Preserve previous PDB behavior.
     ]
 
-    # Force C/C++ mode for the given GN detected file type. This is necessary
-    # for precompiled headers where the same source file is compiled in both
-    # modes.
-    cflags_c += [ "/TC" ]
-    cflags_cc += [ "/TP" ]
-
     # Building with Clang on Windows is a work in progress and very
     # experimental. See crbug.com/82385.
     # Keep this in sync with the similar block in build/common.gypi
diff --git a/build/json_schema_api.gni b/build/json_schema_api.gni
index 24867d1..a2f308f 100644
--- a/build/json_schema_api.gni
+++ b/build/json_schema_api.gni
@@ -47,9 +47,6 @@
 #   A list of schema files which should not be compiled, but which should still
 #   be processed for API bundle generation.
 #
-# configs [optional]
-#   Extra configs to apply to the compile step.
-#
 # deps [optional]
 #   If any deps are specified they will be inherited by the static library
 #   target.
@@ -201,9 +198,6 @@ template("json_schema_api") {
   lib_deps = []
   lib_public_deps = []
   lib_extra_configs = []
-  if (defined(invoker.configs)) {
-    lib_extra_configs += invoker.configs
-  }
 
   if (schemas) {
     lib_sources += get_target_outputs(":$schema_generator_name")
diff --git a/build/precompile.h b/build/precompile.h
index 50a9b87..32c2f11 100644
--- a/build/precompile.h
+++ b/build/precompile.h
@@ -2,8 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is used as a precompiled header for both C and C++ files. So
-// any C++ headers must go in the __cplusplus block below.
+// Precompiled header for Chromium project on Windows, not used by
+// other build configurations. Using precompiled headers speeds the
+// build up significantly, around 1/4th on VS 2010 on an HP Z600 with 12
+// GB of memory.
+//
+// Numeric comments beside includes are the number of times they were
+// included under src/chrome/browser on 2011/8/20, which was used as a
+// baseline for deciding what to include in the PCH. Includes without
+// a numeric comment are generally included at least 5 times. It may
+// be possible to tweak the speed of the build by commenting out or
+// removing some of the less frequently used headers.
 
 #if defined(BUILD_PRECOMPILE_H_)
 #error You shouldn't include the precompiled header file more than once.
@@ -13,38 +22,83 @@
 
 #define _USE_MATH_DEFINES
 
+// The Windows header needs to come before almost all the other
+// Windows-specific headers.
+#include <Windows.h>
+#include <dwmapi.h>
+#include <shellapi.h>
+#include <wtypes.h>  // 2
+
+// Defines in atlbase.h cause conflicts; if we could figure out how
+// this family of headers can be included in the PCH, it might speed
+// up the build as several of them are used frequently.
+/*
+#include <atlbase.h>
+#include <atlapp.h>
+#include <atlcom.h>
+#include <atlcrack.h>  // 2
+#include <atlctrls.h>  // 2
+#include <atlmisc.h>  // 2
+#include <atlsafe.h>  // 1
+#include <atltheme.h>  // 1
+#include <atlwin.h>  // 2
+*/
+
+// Objbase.h and other files that rely on it bring in [ #define
+// interface struct ] which can cause problems in a multi-platform
+// build like Chrome's. #undef-ing it does not work as there are
+// currently 118 targets that break if we do this, so leaving out of
+// the precompiled header for now.
+//#include <commctrl.h>  // 2
+//#include <commdlg.h>  // 3
+//#include <cryptuiapi.h>  // 2
+//#include <Objbase.h>  // 2
+//#include <objidl.h>  // 1
+//#include <ole2.h>  // 1
+//#include <oleacc.h>  // 2
+//#include <oleauto.h>  // 1
+//#include <oleidl.h>  // 1
+//#include <propkey.h>  // 2
+//#include <propvarutil.h>  // 2
+//#include <pstore.h>  // 2
+//#include <shlguid.h>  // 1
+//#include <shlwapi.h>  // 1
+//#include <shobjidl.h>  // 4
+//#include <urlhist.h>  // 2
+
+// Caused other conflicts in addition to the 'interface' issue above.
+// #include <shlobj.h>
+
 #include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
+#include <limits.h>  // 4
 #include <math.h>
-#include <memory.h>
+#include <memory.h>  // 1
 #include <signal.h>
-#include <stdarg.h>
+#include <stdarg.h>  // 1
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
-
-#if defined(__cplusplus)
+#include <time.h>  // 4
 
 #include <algorithm>
-#include <bitset>
+#include <bitset>  // 3
 #include <cmath>
 #include <cstddef>
-#include <cstdio>
-#include <cstdlib>
+#include <cstdio>  // 3
+#include <cstdlib>  // 2
 #include <cstring>
 #include <deque>
-#include <fstream>
+#include <fstream>  // 3
 #include <functional>
-#include <iomanip>
-#include <iosfwd>
+#include <iomanip>  // 2
+#include <iosfwd>  // 2
 #include <iterator>
 #include <limits>
 #include <list>
 #include <map>
-#include <numeric>
+#include <numeric>  // 2
 #include <ostream>
 #include <queue>
 #include <set>
@@ -53,5 +107,3 @@
 #include <string>
 #include <utility>
 #include <vector>
-
-#endif  // __cplusplus
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index 1ac3623..454cdde 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -80,7 +80,9 @@ template("msvc_toolchain") {
 
     tool("cc") {
       rspfile = "{{output}}.rsp"
-      precompiled_header_type = "msvc"
+
+      # TODO(brettw) enable this when GN support in the binary has been rolled.
+      #precompiled_header_type = "msvc"
       pdbname = "{{target_out_dir}}/{{target_output_name}}_c.pdb"
       command = "ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
       depsformat = "msvc"
@@ -93,7 +95,9 @@ template("msvc_toolchain") {
 
     tool("cxx") {
       rspfile = "{{output}}.rsp"
-      precompiled_header_type = "msvc"
+
+      # TODO(brettw) enable this when GN support in the binary has been rolled.
+      #precompiled_header_type = "msvc"
 
       # The PDB name needs to be different between C and C++ compiled files.
       pdbname = "{{target_out_dir}}/{{target_output_name}}_cc.pdb"
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index c4cdb2d..67daed5 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -509,8 +509,6 @@ component("cc") {
     ]
   }
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   public_deps = [
     "//cc/base",
     "//skia",
@@ -664,7 +662,6 @@ source_set("test_support") {
     "test/test_web_graphics_context_3d.h",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
   include_dirs = [
     ".",
     "test",
@@ -848,7 +845,6 @@ test("cc_unittests") {
     "test/run_all_unittests.cc",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
   data = [
     "test/data/",
   ]
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 1343cb6..7ddc938 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -60,7 +60,6 @@ if (is_desktop_linux) {
 source_set("browser") {
   configs += [
     "//build/config/compiler:wexit_time_destructors",
-    "//build/config:precompiled_headers",
     "//third_party/WebKit/public:debug_devtools",
   ]
   defines = []
@@ -1036,8 +1035,6 @@ source_set("test_support") {
     "ui/webui/signin/login_ui_test_utils.h",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   public_deps = [
     ":browser",
     "//chrome/browser/ui:test_support",
diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
index 976801b..7b4e203 100644
--- a/chrome/browser/devtools/BUILD.gn
+++ b/chrome/browser/devtools/BUILD.gn
@@ -52,7 +52,6 @@ static_library("devtools") {
   configs += [
     "//build/config/compiler:no_size_t_to_int_warning",
     "//build/config/compiler:wexit_time_destructors",
-    "//build/config:precompiled_headers",
     "//third_party/WebKit/public:debug_devtools",
   ]
 
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 0acb058..61bb6de 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -21,7 +21,6 @@ source_set("extensions") {
                          ".",
                          "//chrome")
 
-  configs += [ "//build/config:precompiled_headers" ]
   defines = []
 
   # Since browser and browser_extensions actually depend on each other,
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index e13e575..186b135 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -19,7 +19,6 @@ source_set("ui") {
   libs = []
 
   configs += [
-    "//build/config:precompiled_headers",
     "//build/config/compiler:wexit_time_destructors",
     "//third_party/WebKit/public:debug_devtools",
   ]
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 21ab88e..fc85ced 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -40,10 +40,7 @@ static_library("common") {
   sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome")
   defines = []
 
-  configs += [
-    "//build/config:precompiled_headers",
-    "//build/config/compiler:wexit_time_destructors",
-  ]
+  configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
   public_deps = [
     "//chrome/common:constants",
diff --git a/chrome/common/extensions/api/BUILD.gn b/chrome/common/extensions/api/BUILD.gn
index 026b678..435a2ef 100644
--- a/chrome/common/extensions/api/BUILD.gn
+++ b/chrome/common/extensions/api/BUILD.gn
@@ -11,7 +11,6 @@ assert(enable_extensions)
 json_schema_api("api") {
   schemas = true
   bundle = true
-  configs = [ "//build/config:precompiled_headers" ]
   bundle_name = "Chrome"
 
   deps = schema_dependencies
@@ -21,7 +20,6 @@ json_schema_api("api") {
 json_schema_api("api_registration") {
   impl_dir = "//chrome/browser/extensions/api"
   bundle_registration = true
-  configs = [ "//build/config:precompiled_headers" ]
   bundle_name = "Chrome"
 
   deps = [
diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
index ceedefd..e21ff8c 100644
--- a/chrome/installer/util/BUILD.gn
+++ b/chrome/installer/util/BUILD.gn
@@ -68,12 +68,8 @@ static_library("util") {
       "//third_party/lzma_sdk",
     ]
 
-    configs += [
-      "//build/config:precompiled_headers",
-
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      "//build/config/compiler:no_size_t_to_int_warning",
-    ]
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
     # TODO(GYP) hook up corresponding version of installer_util_nacl_win64 in GN
     sources += [
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 44c2c74..a321e4f 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -84,8 +84,6 @@ source_set("test_support") {
     "logging/win/test_log_collector.h",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   # New deps should go in the non-iOS section below.
   public_deps = [
     "//content/test:test_support",
@@ -230,7 +228,6 @@ if (!is_android) {
                     ".",
                     "//chrome")
 
-    configs += [ "//build/config:precompiled_headers" ]
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
     ldflags = []
 
@@ -550,8 +547,6 @@ if (!is_android) {
             ".",
             "//chrome")
 
-    configs += [ "//build/config:precompiled_headers" ]
-
     deps = [
       ":browser_tests_js_webui",
       ":sync_integration_test_support",
@@ -1158,7 +1153,6 @@ if (!is_android) {
                     ".",
                     "//chrome")
 
-    configs += [ "//build/config:precompiled_headers" ]
     defines = []
 
     deps = [
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
index edcf002..ead790a 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -13,7 +13,6 @@ gypi_values = exec_script("//build/gypi_to_gn.py",
 static_library("utility") {
   sources = rebase_path(gypi_values.chrome_utility_sources, ".", "..")
   defines = []
-  configs += [ "//build/config:precompiled_headers" ]
 
   public_deps = []
   deps = [
diff --git a/components/autofill/core/browser/BUILD.gn b/components/autofill/core/browser/BUILD.gn
index 80a78ee..143aebe 100644
--- a/components/autofill/core/browser/BUILD.gn
+++ b/components/autofill/core/browser/BUILD.gn
@@ -136,8 +136,6 @@ static_library("browser") {
     "webdata/autofill_webdata_service_observer.h",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   deps = [
     "//base",
     "//base:i18n",
diff --git a/components/policy/core/common/BUILD.gn b/components/policy/core/common/BUILD.gn
index c6cce1b..dc931e6 100644
--- a/components/policy/core/common/BUILD.gn
+++ b/components/policy/core/common/BUILD.gn
@@ -126,8 +126,6 @@ source_set("common") {
       "schema_registry_tracking_policy_provider.h",
     ]
 
-    configs += [ "//build/config:precompiled_headers" ]
-
     deps = [
       "//base:prefs",
       "//base/third_party/dynamic_annotations",
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index fd917b3..2b5c7c2 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -13,7 +13,6 @@ source_set("browser") {
   # internal content ones) should depend on the public one.
   visibility = [ "//content/public/browser:browser_sources" ]
 
-  configs += [ "//build/config:precompiled_headers" ]
   defines = []
   libs = []
   ldflags = []
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 9698873..b2e978a 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -16,8 +16,6 @@ source_set("child") {
                         ".",
                         "//content")
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   public_deps = [
     "//third_party/mojo/src/mojo/edk/system",
   ]
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 1f40c1a..aec3607 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -132,7 +132,6 @@ source_set("common") {
 
   configs += [
     "//content:content_implementation",
-    "//build/config:precompiled_headers",
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 5319c05..ebe488e 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -43,10 +43,7 @@ source_set("browser_sources") {
     sources -= [ "context_factory.h" ]
   }
 
-  configs += [
-    "//build/config:precompiled_headers",
-    "//content:content_implementation",
-  ]
+  configs += [ "//content:content_implementation" ]
 
   public_deps = [
     "//content/public/common:mojo_bindings",
diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn
index ade86a2..3ae9297 100644
--- a/content/public/common/BUILD.gn
+++ b/content/public/common/BUILD.gn
@@ -34,10 +34,7 @@ source_set("common_sources") {
                         ".",
                         "//content")
 
-  configs += [
-    "//build/config:precompiled_headers",
-    "//content:content_implementation",
-  ]
+  configs += [ "//content:content_implementation" ]
 
   public_deps = [
     "//content/common",
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index d5b4c1e..661b33b 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -173,12 +173,8 @@ static_library("content_shell_lib") {
     "utility/shell_content_utility_client.h",
   ]
 
-  configs += [
-    "//build/config:precompiled_headers",
-
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   defines = [ "CONTENT_SHELL_VERSION=\"$content_shell_version\"" ]
 
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 07ee03f..f3f3498 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -22,7 +22,6 @@ content_tests_gypi_values =
 # GYP version //content/content_tests.gypi:test_support_content
 source_set("test_support") {
   testonly = true
-  configs += [ "//build/config:precompiled_headers" ]
   public_deps = [
     "//content/public/app:both",
     "//content/public/browser",
@@ -310,10 +309,7 @@ if (!is_mac) {
 
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
-    configs += [
-      "//build/config:precompiled_headers",
-      "//build/config/compiler:no_size_t_to_int_warning",
-    ]
+    configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
     deps = [
       ":browsertest_support",
@@ -499,8 +495,6 @@ test("content_unittests") {
     }
   }
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   deps = [
     ":test_support",
     "//base/allocator",
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index fca8f94..d64840d 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -148,8 +148,6 @@ test("extensions_unittests") {
     "shell/browser/shell_display_info_provider.cc",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   deps = [
     ":extensions_resources",
     ":shell_and_test_pak",
diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
index 29791b4..d9c62bb 100644
--- a/extensions/browser/BUILD.gn
+++ b/extensions/browser/BUILD.gn
@@ -31,12 +31,8 @@ source_set("browser") {
     "//third_party/re2",
   ]
 
-  configs += [
-    "//build/config:precompiled_headers",
-
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   if (enable_extensions) {
     # Includes all API implementations and the ExtensionsApiClient
diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn
index c76d9b1..03e194c 100644
--- a/extensions/common/BUILD.gn
+++ b/extensions/common/BUILD.gn
@@ -34,12 +34,8 @@ if (enable_extensions) {
                           ".",
                           "//extensions")
 
-    configs += [
-      "//build/config:precompiled_headers",
-
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      "//build/config/compiler:no_size_t_to_int_warning",
-    ]
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
     deps = [
       ":common_constants",
diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn
index ee300ca..688148e 100644
--- a/extensions/renderer/BUILD.gn
+++ b/extensions/renderer/BUILD.gn
@@ -13,12 +13,8 @@ source_set("renderer") {
                         ".",
                         "//extensions")
 
-  configs += [
-    "//build/config:precompiled_headers",
-
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   deps = [
     "//chrome:resources",
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
index 7748abab..214dade 100644
--- a/gpu/BUILD.gn
+++ b/gpu/BUILD.gn
@@ -231,12 +231,7 @@ test("gpu_unittests") {
     "config/gpu_util_unittest.cc",
   ]
 
-  configs += [
-    "//build/config:precompiled_headers",
-
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   deps = [
     ":gpu",
diff --git a/gpu/command_buffer/service/BUILD.gn b/gpu/command_buffer/service/BUILD.gn
index 6749c01..62fce76 100644
--- a/gpu/command_buffer/service/BUILD.gn
+++ b/gpu/command_buffer/service/BUILD.gn
@@ -135,7 +135,6 @@ source_set("service_sources") {
   ]
 
   configs += [
-    "//build/config:precompiled_headers",
     "//gpu:gpu_implementation",
     "//third_party/khronos:khronos_headers",
   ]
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 98250f2..52935a6 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -275,7 +275,6 @@ component("media") {
   configs += [
     ":media_config",
     ":media_implementation",
-    "//build/config:precompiled_headers",
 
     # TODO(wolenetz): Fix size_t to int trunctaion in win64.
     # See http://crbug.com/171009
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index bedc24f..5088339 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -210,7 +210,6 @@ source_set("base") {
   configs += [
     # This target uses the ALLOCATOR_SHIM define.
     "//base/allocator:allocator_shim_define",
-    "//build/config:precompiled_headers",
     "//media:media_config",
     "//media:media_implementation",
   ]
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 7e2be2c..ab8f1fe 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -78,12 +78,8 @@ component("net") {
     "NET_IMPLEMENTATION",
   ]
 
-  configs += [
-    "//build/config:precompiled_headers",
-
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
   public_configs = [ ":net_config" ]
   include_dirs = []
 
@@ -692,12 +688,8 @@ source_set("test_support") {
     "url_request/url_request_test_util.h",
   ]
 
-  configs += [
-    "//build/config:precompiled_headers",
-
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   public_deps = [
     "//base",
@@ -1316,12 +1308,8 @@ if (!is_mac) {
   test("net_unittests") {
     sources = gypi_values.net_test_sources
 
-    configs += [
-      "//build/config:precompiled_headers",
-
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      "//build/config/compiler:no_size_t_to_int_warning",
-    ]
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     defines = []
 
     deps = [
diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
index d14ad70..ae8b8b7 100644
--- a/ppapi/BUILD.gn
+++ b/ppapi/BUILD.gn
@@ -34,7 +34,6 @@ shared_library("ppapi_tests") {
   sources = ppapi_sources.test_common_source_files +
             ppapi_sources.test_trusted_source_files
 
-  configs += [ "//build/config:precompiled_headers" ]
   defines = [ "GL_GLEXT_PROTOTYPES" ]
   include_dirs = [ "lib/gl/include" ]
 
diff --git a/ppapi/cpp/BUILD.gn b/ppapi/cpp/BUILD.gn
index 63b3f60..2e121be 100644
--- a/ppapi/cpp/BUILD.gn
+++ b/ppapi/cpp/BUILD.gn
@@ -23,5 +23,4 @@ source_set("cpp") {
 # themselves.
 source_set("objects") {
   sources = rebase_path(ppapi_sources.cpp_source_files, ".", "..")
-  configs += [ "//build/config:precompiled_headers" ]
 }
diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn
index bd378d5..62a5370 100644
--- a/ppapi/proxy/BUILD.gn
+++ b/ppapi/proxy/BUILD.gn
@@ -265,10 +265,7 @@ component("proxy") {
     ]
   }
 
-  configs += [
-    ":proxy_implementation",
-    "//build/config:precompiled_headers",
-  ]
+  configs += [ ":proxy_implementation" ]
 
   deps = [
     "//base",
diff --git a/ppapi/shared_impl/BUILD.gn b/ppapi/shared_impl/BUILD.gn
index 25ad904..9d205ec 100644
--- a/ppapi/shared_impl/BUILD.gn
+++ b/ppapi/shared_impl/BUILD.gn
@@ -151,7 +151,6 @@ component("shared_impl") {
     ]
   }
 
-  configs += [ "//build/config:precompiled_headers" ]
   defines = [
     "PPAPI_SHARED_IMPLEMENTATION",
 
diff --git a/ppapi/thunk/BUILD.gn b/ppapi/thunk/BUILD.gn
index b4adef9..c62534f 100644
--- a/ppapi/thunk/BUILD.gn
+++ b/ppapi/thunk/BUILD.gn
@@ -187,7 +187,6 @@ source_set("thunk") {
     ]
   }
 
-  configs += [ "//build/config:precompiled_headers" ]
   defines = [
     # This target goes in the same library as shared_impl (in GYP they are the
     # same).
diff --git a/remoting/protocol/BUILD.gn b/remoting/protocol/BUILD.gn
index 819ff5d..51ceb34 100644
--- a/remoting/protocol/BUILD.gn
+++ b/remoting/protocol/BUILD.gn
@@ -10,7 +10,6 @@ source_set("protocol") {
                         "//remoting")
 
   configs += [
-    "//build/config:precompiled_headers",
     "//build/config/compiler:no_size_t_to_int_warning",
     "//build/config/compiler:wexit_time_destructors",
   ]
diff --git a/sandbox/win/BUILD.gn b/sandbox/win/BUILD.gn
index ade3e99..f707b7e 100644
--- a/sandbox/win/BUILD.gn
+++ b/sandbox/win/BUILD.gn
@@ -159,8 +159,6 @@ source_set("sandbox") {
     ]
   }
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   deps = [
     "//base",
     "//base:base_static",
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index a3616d3..9eb998c 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -441,7 +441,6 @@ component("skia") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_library_config",
-    "//build/config:precompiled_headers",
     "//build/config/compiler:no_chromium_code",
   ]
   public_configs = [ ":skia_config" ]
diff --git a/storage/browser/BUILD.gn b/storage/browser/BUILD.gn
index 3c669fa..60cac60 100644
--- a/storage/browser/BUILD.gn
+++ b/storage/browser/BUILD.gn
@@ -171,8 +171,6 @@ component("browser") {
 
   defines = [ "STORAGE_BROWSER_IMPLEMENTATION" ]
   configs += [
-    "//build/config:precompiled_headers",
-
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
     "//build/config/compiler:wexit_time_destructors",
diff --git a/sync/BUILD.gn b/sync/BUILD.gn
index 237abd9..1f44388 100644
--- a/sync/BUILD.gn
+++ b/sync/BUILD.gn
@@ -406,8 +406,6 @@ source_set("sync_core") {
     "util/time.h",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   public_deps = [
     "//sync/internal_api/attachments/proto",
   ]
@@ -653,8 +651,6 @@ test("sync_unit_tests") {
     "util/protobuf_unittest.cc",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   deps = [
     ":test_support_sync_core",
     ":test_support_sync_internal_api",
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index 721611e..000f319 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -232,12 +232,8 @@ component("gfx") {
     "win/window_impl.h",
   ]
 
-  configs += [
-    "//build/config:precompiled_headers",
-
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   defines = [ "GFX_IMPLEMENTATION" ]
 
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index 8eb50dd..9fdcc94 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -104,7 +104,6 @@ component("gl") {
     "sync_control_vsync_provider.h",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
   defines = [ "GL_IMPLEMENTATION" ]
 
   include_dirs = [
diff --git a/ui/message_center/BUILD.gn b/ui/message_center/BUILD.gn
index 7e0bc37..7bd9e08 100644
--- a/ui/message_center/BUILD.gn
+++ b/ui/message_center/BUILD.gn
@@ -23,12 +23,8 @@ component("message_center") {
     "//url",
   ]
 
-  configs += [
-    "//build/config:precompiled_headers",
-
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   defines = [ "MESSAGE_CENTER_IMPLEMENTATION" ]
 
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index ae64118..c14f089 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -19,12 +19,8 @@ component("views") {
   all_dependent_configs = [ ":flags" ]
   sources = gypi_values.views_sources
 
-  configs += [
-    "//build/config:precompiled_headers",
-
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   defines = [ "VIEWS_IMPLEMENTATION" ]
 
@@ -142,8 +138,6 @@ static_library("test_support") {
   testonly = true
   sources = gypi_values.views_test_support_sources
 
-  configs += [ "//build/config:precompiled_headers" ]
-
   public_deps = [
     ":views",
   ]
diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn
index 80a5b65..36441c46 100644
--- a/ui/wm/BUILD.gn
+++ b/ui/wm/BUILD.gn
@@ -70,7 +70,6 @@ component("wm") {
     "wm_export.h",
   ]
 
-  configs += [ "//build/config:precompiled_headers" ]
   defines = [ "WM_IMPLEMENTATION" ]
 
   deps = [