Mac: Give app_shim code a nicer home

chrome/browser/apps/app_shim/browser_app_shim.gypi

Index: chrome/browser/apps/app_shim/browser_app_shim.gypi
diff --git a/apps/app_shim/app_shim.gypi b/chrome/browser/apps/app_shim/browser_app_shim.gypi
similarity index 67%
rename from apps/app_shim/app_shim.gypi
rename to chrome/browser/apps/app_shim/browser_app_shim.gypi
index 51a729a869d0e7cb4a942303c8e7e3f8a014629d..4c6c9aa80c82aad5bb81d82cc6a86a1d6814ac7a 100644
--- a/apps/app_shim/app_shim.gypi
+++ b/chrome/browser/apps/app_shim/browser_app_shim.gypi
@@ -5,18 +5,14 @@
 {
   'targets': [
     {
-      'target_name': 'app_shim',
+      # This is the part of the Chrome browser process responsible for launching
+      # and communicating with app_shim processes on Mac.
+      'target_name': 'browser_app_shim',
       'type': 'static_library',
-      # Since app_shim and browser depend on each other, we omit the dependency
-      # on browser here.
       'dependencies': [
-        '../chrome/chrome_resources.gyp:chrome_strings',
+        # Since browser_app_shim and browser depend on each other, we omit the
+        # dependency on browser here.
         '../content/content.gyp:content_common',
-        '../skia/skia.gyp:skia',
-      ],
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(grit_out_dir)',
       ],
       'sources': [
         'app_shim_handler_mac.cc',
@@ -25,7 +21,6 @@
         'app_shim_host_mac.h',
         'app_shim_host_manager_mac.h',
         'app_shim_host_manager_mac.mm',
-        'chrome_main_app_mode_mac.mm',
         'extension_app_shim_handler_mac.cc',
         'extension_app_shim_handler_mac.h',
         'unix_domain_socket_acceptor.cc',