remove build_webkit_exes_from_webkit_gyp flag

webkit/webkit.gyp

Index: webkit/webkit.gyp
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 71edcadfbade8e1fa075273cdcd88269e0e9123f..78b440367bf46716d386852f9a2e77fa0594a47e 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
 
@@ -11,57 +11,20 @@
   'variables': {
     'chromium_code': 1,
   },
-  'conditions': [
-    # TODO(dpranke): See https://bugs.webkit.org/show_bug.cgi?id=68463 , 
-    # flag in build/common.gypi.
-    ['build_webkit_exes_from_webkit_gyp==1', {
-      'targets': [
-        {
-          'target_name': 'pull_in_webkit_unit_tests',
-          'type': 'none',
-          'dependencies': [
-            '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_unit_tests'
-          ],
-        },
-        {
-          'target_name': 'pull_in_copy_TestNetscapePlugIn',
-          'type': 'none',
-          'dependencies': [
-            '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNestcapePlugIn'
-          ],
-        },
-        {
-          'target_name': 'pull_in_DumpRenderTree',
-          'type': 'none',
-          'dependencies': [
-            '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree'
-          ],
-        },
-      ],
-    }, {  # build_webkit_exes_from_webkit_gyp==0
-      'targets': [
-        {
-          'target_name': 'pull_in_webkit_unit_tests',
-          'type': 'none',
-          'dependencies': [
-            '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests'
-          ],
-        },
-        {
-          'target_name': 'pull_in_copy_TestNetscapePlugIn',
-          'type': 'none',
-          'dependencies': [
-            '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:copy_TestNetscapePlugIn'
-          ],
-        },
-        {
-          'target_name': 'pull_in_DumpRenderTree',
-          'type': 'none',
-          'dependencies': [
-            '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree'
-          ],
-        },
-      ],
-    }]
+  'targets': [
+    {
+        'target_name': 'pull_in_webkit_unit_tests',
+        'type': 'none',
+        'dependencies': [
+        '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests'

[tony, 2012/01/21 00:39:46]

Nit: indention

+        ],
+    },
+    {
+        'target_name': 'pull_in_DumpRenderTree',
+        'type': 'none',
+        'dependencies': [
+        '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree'

[tony, 2012/01/21 00:39:46]

Nit: indention

+        ],
+    },
   ], # targets
 }