Rename mojo_application GN templates to service*

content/content.gyp

Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index d06051241f1e9d51b13ccfcb67d746fcb2347852..82a8220392b267d317846fbee4ee6399540622ce 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -62,15 +62,15 @@
       'target_name': 'content_app_browser_manifest',
       'type': 'none',
       'variables': {
-        'application_type': 'exe',
-        'application_name': 'content_browser',
+        'type': 'exe',
+        'name': 'content_browser',
         'packaged_manifests': [
           '<(PRODUCT_DIR)/Mojo Applications/user/manifest.json',
         ],
         'source_manifest': '<(DEPTH)/content/public/app/mojo/content_browser_manifest.json',
       },
       'includes': [
-        '../mojo/public/mojo_application_manifest.gypi',
+        '../services/shell/public/service_manifest.gypi',
       ],
       'dependencies': [
         '../services/user/user.gyp:user_app_manifest',
@@ -82,12 +82,12 @@
       'target_name': 'content_app_gpu_manifest',
       'type': 'none',
       'variables': {
-        'application_type': 'exe',
-        'application_name': 'content_gpu',
+        'type': 'exe',
+        'name': 'content_gpu',
         'source_manifest': '<(DEPTH)/content/public/app/mojo/content_gpu_manifest.json',
       },
       'includes': [
-        '../mojo/public/mojo_application_manifest.gypi',
+        '../services/shell/public/service_manifest.gypi',
       ],
       'hard_dependency': 1,
     },
@@ -96,12 +96,12 @@
       'target_name': 'content_app_renderer_manifest',
       'type': 'none',
       'variables': {
-        'application_type': 'exe',
-        'application_name': 'content_renderer',
+        'type': 'exe',
+        'name': 'content_renderer',
         'source_manifest': '<(DEPTH)/content/public/app/mojo/content_renderer_manifest.json',
       },
       'includes': [
-        '../mojo/public/mojo_application_manifest.gypi',
+        '../services/shell/public/service_manifest.gypi',
       ],
       'hard_dependency': 1,
     },
@@ -110,12 +110,12 @@
       'target_name': 'content_app_utility_manifest',
       'type': 'none',
       'variables': {
-        'application_type': 'exe',
-        'application_name': 'content_utility',
+        'type': 'exe',
+        'name': 'content_utility',
         'source_manifest': '<(DEPTH)/content/public/app/mojo/content_utility_manifest.json',
       },
       'includes': [
-        '../mojo/public/mojo_application_manifest.gypi',
+        '../services/shell/public/service_manifest.gypi',
       ],
       'hard_dependency': 1,
     },