Revert 157650 - This is followup from Charlie's comments on Fady's cl: http://chromiumcodereview.ap…

content/content_tests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 619 matching lines @@
           'sources': [
             'browser/accessibility/cross_platform_accessibility_browsertest.cc',
             'browser/accessibility/dump_accessibility_tree_browsertest.cc',
             'browser/accessibility/dump_accessibility_tree_helper.cc',
             'browser/accessibility/dump_accessibility_tree_helper.h',
             'browser/accessibility/dump_accessibility_tree_helper_mac.mm',
             'browser/accessibility/dump_accessibility_tree_helper_win.cc',
             'browser/appcache/appcache_browsertest.cc',
             'browser/audio_browsertest.cc',
             'browser/bookmarklet_browsertest.cc',
-            'browser/browser_plugin/browser_plugin_host_browsertest.cc',
-            'browser/browser_plugin/test_browser_plugin_embedder.cc',
-            'browser/browser_plugin/test_browser_plugin_embedder.h',
-            'browser/browser_plugin/test_browser_plugin_guest.cc',
-            'browser/browser_plugin/test_browser_plugin_guest.h',
             'browser/child_process_security_policy_browsertest.cc',
             'browser/database_browsertest.cc',
             'browser/device_orientation/device_orientation_browsertest.cc',
             'browser/dom_storage/dom_storage_browsertest.cc',
             'browser/download/download_browsertest.cc',
             'browser/download/mhtml_generation_browsertest.cc',
             'browser/download/save_package_browsertest.cc',
             'browser/fileapi/blob_layout_browsertest.cc',
             'browser/fileapi/file_system_browsertest.cc',
             'browser/in_process_webkit/indexed_db_browsertest.cc',
@@ skipping 238 matching lines @@
             'apk_name': 'ContentShellTest',
             'java_in_dir': 'shell/android/javatests',
             'resource_dir': '../res',
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }