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

trunk/src/content/content_tests.gypi

Index: trunk/src/content/content_tests.gypi
===================================================================
--- trunk/src/content/content_tests.gypi	(revision 209769)
+++ trunk/src/content/content_tests.gypi	(working copy)
@@ -16,9 +16,9 @@
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui_test_support',
         '../url/url.gyp:url_lib',
-        'content.gyp:content_app',
-        'content.gyp:content_browser',
-        'content.gyp:content_common',
+        'content_app',
+        'content_browser',
+        'content_common',
       ],
       'include_dirs': [
         '..',
@@ -161,10 +161,10 @@
           ],
         }, {  # OS != "ios"
           'dependencies': [
-            'content.gyp:content_child',
-            'content.gyp:content_ppapi_plugin',
-            'content.gyp:content_utility',
-            'content.gyp:content_worker',
+            'content_child',
+            'content_ppapi_plugin',
+            'content_utility',
+            'content_worker',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
@@ -245,8 +245,8 @@
       'type': '<(gtest_target_type)',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
-        'content.gyp:content_browser',
-        'content.gyp:content_common',
+        'content_browser',
+        'content_common',
         'test_support_content',
         'browser/speech/proto/speech_proto.gyp:speech_proto',
         '../base/base.gyp:test_support_base',
@@ -561,11 +561,11 @@
           ],
         }, {  # OS != "ios"
           'dependencies': [
-            'content.gyp:content_browser',
-            'content.gyp:content_child',
-            'content.gyp:content_gpu',
-            'content.gyp:content_plugin',
-            'content.gyp:content_renderer',
+            'content_browser',
+            'content_child',
+            'content_gpu',
+            'content_plugin',
+            'content_renderer',
             'content_resources.gyp:content_resources',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../gpu/gpu.gyp:gpu',
@@ -736,10 +736,10 @@
           'type': '<(gtest_target_type)',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content.gyp:content_common',
-            'content.gyp:content_gpu',
-            'content.gyp:content_plugin',
-            'content.gyp:content_renderer',
+            'content_common',
+            'content_gpu',
+            'content_plugin',
+            'content_renderer',
             'content_shell_lib',
             'content_shell_pak',
             'test_support_content',
@@ -987,7 +987,7 @@
           'type': '<(gtest_target_type)',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content.gyp:content_common',
+            'content_common',
             'test_support_content',
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
@@ -1008,7 +1008,7 @@
           'type': '<(gtest_target_type)',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content.gyp:content_common',
+            'content_common',
             'test_support_content',
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
@@ -1031,7 +1031,7 @@
             'target_name': 'video_decode_accelerator_unittest',
             'type': '<(gtest_target_type)',
             'dependencies': [
-              'content.gyp:content',
+              'content',
               '../base/base.gyp:base',
               '../testing/gtest.gyp:gtest',
               '../media/media.gyp:media',
@@ -1100,7 +1100,7 @@
           'target_name': 'h264_parser_unittest',
           'type': 'executable',
           'dependencies': [
-            'content.gyp:content_common',
+            'content_common',
             '../base/base.gyp:base',
             '../testing/gtest.gyp:gtest',
           ],
@@ -1127,7 +1127,7 @@
           'target_name': 'content_unittests_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_java',
+            'content_java',
             'content_unittests',
           ],
           'variables': {
@@ -1140,8 +1140,8 @@
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_java',
             'content_browsertests',
+            'content_java',
             'content_java_test_support',
             'content_shell_java',
           ],
@@ -1193,8 +1193,8 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
-            'content.gyp:content_common',
-            'content.gyp:content_java',
+            'content_common',
+            'content_java',
           ],
           'variables': {
             'java_in_dir': '../content/public/test/android/javatests',
@@ -1205,7 +1205,7 @@
           'target_name': 'content_shell_test_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_java',
+            'content_java',
             'content_java_test_support',
             'content_shell_apk_java',
             '../base/base.gyp:base_java',
Property changes on: trunk\src\content\content_tests.gypi
___________________________________________________________________
Added: svn:mergeinfo