Remove build_overrides/v8.gni.

Chrome now uses the default_args system for specifying its own definitions of
these variables so the separate file in build_overrides is no longer necessary.

BUG=684096

Review-Url: https://codereview.chromium.org/2652263003
Cr-Commit-Position: refs/heads/master@{#42712}

BUILD.gn

@@ -30,15 +30,7 @@ declare_args() {
   v8_deprecation_warnings = false
 
   # Enable compiler warnings when using V8_DEPRECATE_SOON apis.
-  #
-  # TODO(brettw) http://crbug.com/684096 Remove the define condition and the
-  # v8_imminent_deprecation_warnings_default variable when the build_override
-  # conversion is complete. This value should just default to true.
-  if (defined(v8_imminent_deprecation_warnings_default)) {
-    v8_imminent_deprecation_warnings = v8_imminent_deprecation_warnings_default
-  } else {
-    v8_imminent_deprecation_warnings = false
-  }
+  v8_imminent_deprecation_warnings = false
 
   # Embeds the given script into the snapshot.
   v8_embed_script = ""
@@ -89,31 +81,17 @@ declare_args() {
   # if files export symbols used by later files, they should go first.
   #
   # This default is used by cctests. Projects using V8 will want to override.
-  #
-  # TODO(brettw) http://crbug.com/684096 Remove the define condition when the
-  # build_override conversion is complete.
-  if (!defined(v8_extra_library_files)) {
-    v8_extra_library_files = [ "//test/cctest/test-extra.js" ]
-  }
+  v8_extra_library_files = [ "//test/cctest/test-extra.js" ]
 
   # Like v8_extra_library_files but for experimental features.
   #
   # This default is used by cctests. Projects using V8 will want to override.
-  #
-  # TODO(brettw) http://crbug.com/684096 Remove the define condition when the
-  # build_override conversion is complete.
-  if (!defined(v8_experimental_extra_library_files)) {
-    v8_experimental_extra_library_files =
-        [ "//test/cctest/test-experimental-extra.js" ]
-  }
+  v8_experimental_extra_library_files =
+      [ "//test/cctest/test-experimental-extra.js" ]
 
-  if (defined(v8_enable_gdbjit_default)) {
-    v8_enable_gdbjit = v8_enable_gdbjit_default
-  } else {
-    v8_enable_gdbjit = ((v8_current_cpu == "x86" || v8_current_cpu == "x64" ||
-                         v8_current_cpu == "x87") && (is_linux || is_mac)) ||
-                       (v8_current_cpu == "ppc64" && is_linux)
-  }
+  v8_enable_gdbjit = ((v8_current_cpu == "x86" || v8_current_cpu == "x64" ||
+                       v8_current_cpu == "x87") && (is_linux || is_mac)) ||
+                     (v8_current_cpu == "ppc64" && is_linux)
 }
 
 # Derived defaults.

build_overrides/v8.gni

-# Copyright 2015 The V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file should be empty.
-
-# TODO(brettw) http://crbug.com/684096 Remove this when all callers are updated
-# to use the new build overrides system.

gni/v8.gni

@@ -4,7 +4,6 @@
 
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/v8_target_cpu.gni")
-import("//build_overrides/v8.gni")
 
 declare_args() {
   # Includes files needed for correctness fuzzing.
@@ -35,16 +34,8 @@ declare_args() {
   # add a dependency on the ICU library.
   v8_enable_i18n_support = true
 
-  # TODO(brettw) http://crbug.com/684096 Remove the define condition and the
-  # v8_enable_inspector_override variable when the build_override conversion is
-  # complete. This value should just default to true.
-  if (defined(v8_enable_inspector_override)) {
-    # Enable inspector. See include/v8-inspector.h.
-    v8_enable_inspector = v8_enable_inspector_override
-  } else {
-    # Enable inspector. See include/v8-inspector.h.
-    v8_enable_inspector = true
-  }
+  # Enable inspector. See include/v8-inspector.h.
+  v8_enable_inspector = true
 
   # Use static libraries instead of source_sets.
   v8_static_library = false