Revert 209420 "Factor out content shell and tests into a standal..."

trunk/src/content/content_shell_and_tests.gyp

Index: trunk/src/content/content_shell_and_tests.gyp
===================================================================
--- trunk/src/content/content_shell_and_tests.gyp	(revision 209769)
+++ trunk/src/content/content_shell_and_tests.gyp	(working copy)
@@ -1,19 +0,0 @@
-# Copyright 2013 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.
-
-{
-  'variables': {
-    'chromium_code': 1,  # Use higher warning level.
-  },
-  'includes': [
-    'content_tests.gypi',
-  ],
-  'conditions': [
-    ['OS != "ios"', {
-      'includes': [
-        'content_shell.gypi',
-      ],
-    }],
-  ],
-}