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

trunk/src/content/content_shell.gypi

Index: trunk/src/content/content_shell.gypi
===================================================================
--- trunk/src/content/content_shell.gypi	(revision 209769)
+++ trunk/src/content/content_shell.gypi	(working copy)
@@ -27,18 +27,18 @@
         'chromium_code': 1,
       },
       'dependencies': [
-        'content.gyp:content_app',
-        'content.gyp:content_browser',
-        'content.gyp:content_common',
-        'content.gyp:content_gpu',
-        'content.gyp:content_plugin',
-        'content.gyp:content_ppapi_plugin',
-        'content.gyp:content_renderer',
-        'content.gyp:content_utility',
-        'content.gyp:content_worker',
-        'content_resources.gyp:content_resources',
+        'content_app',
+        'content_browser',
+        'content_common',
+        'content_gpu',
+        'content_plugin',
+        'content_ppapi_plugin',
+        'content_renderer',
         'content_shell_resources',
+        'content_utility',
+        'content_worker',
         'test_support_content',
+        'content_resources.gyp:content_resources',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../ipc/ipc.gyp:ipc',
@@ -664,7 +664,7 @@
           'target_name': 'content_shell_java',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_java',
+            'content_java',
           ],
           'variables': {
             'java_in_dir': '../content/shell/android/java',
@@ -691,7 +691,7 @@
           'target_name': 'content_shell_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_java',
+            'content_java',
             'content_java_test_support',
             'content_shell_java',
             'libcontent_shell_content_view',
Property changes on: trunk\src\content\content_shell.gypi
___________________________________________________________________
Added: svn:mergeinfo