Revert of Make GN build match gyp (/bigobj everywhere) and remove now-unnecessary settings

content/content_shell_and_tests.gyp

Index: content/content_shell_and_tests.gyp
diff --git a/content/content_shell_and_tests.gyp b/content/content_shell_and_tests.gyp
index 41106649ee800bf94bb47d1c79d66267f2ce8b3b..b3c3c4c20bf0e27cfa021ede08496c35f2fd9522 100644
--- a/content/content_shell_and_tests.gyp
+++ b/content/content_shell_and_tests.gyp
@@ -5,6 +5,18 @@
 {
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
+  },
+  'target_defaults': {
+    'conditions': [
+      # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
+      ['OS=="win" and target_arch=="x64"', {
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'AdditionalOptions': ['/bigobj'],
+          },
+        },
+      }],
+    ],
   },
   'includes': [
     'content_tests.gypi',