Revert of Move content_gl_tests.isolate to content.

content/content_tests.gypi

 # Copyright (c) 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': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 967 matching lines @@
           'dependencies': [
             'content_unittests',
           ],
           'includes': [
             '../build/isolate.gypi',
             'content_unittests.isolate',
           ],
           'sources': [
             'content_unittests.isolate',
           ],
-        },
-      ],
-      'conditions': [
-        ['archive_gpu_tests==1', {
-          'targets': [
-            {
-              'target_name': 'content_gl_tests_run',
-              'type': 'none',
-              'dependencies': [
-                'content_shell_and_tests.gyp:content_gl_tests',
-              ],
-              'includes': [
-                '../build/isolate.gypi',
-                'content_gl_tests.isolate',
-              ],
-              'sources': [
-                'content_gl_tests.isolate',
-              ],
-            },
-          ],
-        }],
+       },
       ],
     }],
     ['OS!="ios"', {
       'targets': [
         {
           'target_name': 'content_perftests',
           'type': '<(gtest_target_type)',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
             'content.gyp:content_browser',
@@ skipping 384 matching lines @@
           ],
           'sources': [
             'common/gpu/client/gl_helper_unittest.cc',
             'common/gpu/client/gpu_in_process_context_tests.cc',
           ],
           'conditions': [
             ['OS=="android"', {
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
-            }, {
-              'dependencies': [
-                # Runtime dependencis.
-                '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-                '../third_party/mesa/mesa.gyp:osmesa',
-              ],
             }],
           ],
         },
         {
           'target_name': 'content_gl_benchmark',
           'type': '<(gtest_target_type)',
           'dependencies': [
             'content.gyp:content_common',
             'test_support_content',
             '../base/base.gyp:test_support_base',
@@ skipping 486 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }