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

trunk/src/ui/views/views.gyp

 # 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.
 {
   'variables': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'conditions': [
       ['use_aura==1', {
@@ skipping 614 matching lines @@
           ],
         }],
       ],
     },  # target_name: views_test_support
     {
       'target_name': 'views_with_content_test_support',
       'type': 'static_library',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../content/content.gyp:content',
-        '../../content/content_shell_and_tests.gyp:test_support_content',
+        '../../content/content.gyp:test_support_content',
         '../../ipc/ipc.gyp:test_support_ipc',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../ui.gyp:ui',
         'controls/webview/webview.gyp:webview',
         'views_test_support',
         'views',
       ],
       'include_dirs': [
         '..',
@@ skipping 320 matching lines @@
         }],
       ],
     },  # target_name: views_examples_with_content_lib
     {
       'target_name': 'views_examples_with_content_exe',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../chrome/chrome_resources.gyp:packed_resources',
+        '../../content/content.gyp:content_shell_lib',
         '../../content/content.gyp:content',
-        '../../content/content_shell_and_tests.gyp:test_support_content',
-        '../../content/content_shell_and_tests.gyp:content_shell_lib',
+        '../../content/content.gyp:test_support_content',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'views',
         'views_examples_with_content_lib',
         'views_test_support'
       ],
       'include_dirs': [
@@ skipping 38 matching lines @@
           'sources/': [
             # This is needed because the aura rule strips it from the default
             # sources list.
             ['include', '^../../content/app/startup_helper_win.cc'],
           ],
         }],
       ],
     },  # target_name: views_examples_with_content_exe
   ],
 }