Revert of New build flag system, convert Google Now flag

chrome/chrome_features.gypi

Index: chrome/chrome_features.gypi
diff --git a/chrome/chrome_features.gypi b/chrome/chrome_features.gypi
deleted file mode 100644
index a4d875670a3c33f6f41fad3d9b80cd953c631e32..0000000000000000000000000000000000000000
--- a/chrome/chrome_features.gypi
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2015 The Chromium 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 is the GYP equivalent of //chrome/common/features.gni.
-# Please keep in sync!
-
-{
-  'variables': {
-    'variables': {
-      # Conditional variables.
-      'conditions': [
-        ['OS=="android" or OS=="ios"', {
-          'enable_google_now%': 0,
-        }, {
-          'enable_google_now%': 1,
-        }]
-      ],
-    },
-
-    # Anything in the conditions needs to be copied to the outer scope to be
-    # accessible.
-    'enable_google_now%': '<(enable_google_now)',
-
-    # Grit defines based on the feature flags. These must be manually added to
-    # grit targets.
-    'chrome_grit_defines': [
-      '-D', 'enable_google_now=<(enable_google_now)',
-    ]
-  },
-}