Mac: Give app_shim code a nicer home

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 9a4f10d2dc5be8878f6d8019a4a690d0d5c897c5..85ad8608d00e6c85d852826baebff6824284cfbe 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -135,7 +135,8 @@
     }],  # OS!="ios"
     ['OS=="mac"', {
       'includes': [
-        '../apps/app_shim/app_shim.gypi',
+        'app_shim/app_shim.gypi',
+        'browser/apps/app_shim/browser_app_shim.gypi',
       ],
       'targets': [
         {
@@ -281,60 +282,6 @@
           ],
         },  # target app_mode_app_support
         {
-          # This produces the template for app mode loader bundles. It's a
-          # template in the sense that parts of it need to be "filled in" by
-          # Chrome before it can be executed.
-          'target_name': 'app_mode_app',
-          'type': 'executable',
-          'mac_bundle' : 1,
-          'variables': {
-            'enable_wexit_time_destructors': 1,
-            'mac_real_dsym': 1,
-          },
-          'product_name': 'app_mode_loader',
-          'dependencies': [
-            'app_mode_app_support',
-            'infoplist_strings_tool',
-          ],
-          'sources': [
-            'app/app_mode_loader_mac.mm',
-            'app/app_mode-Info.plist',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
-              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
-            ],
-          },
-          'mac_bundle_resources!': [
-            'app/app_mode-Info.plist',
-          ],
-          'mac_bundle_resources/': [
-            ['exclude', '.*'],
-          ],
-          'xcode_settings': {
-            'INFOPLIST_FILE': 'app/app_mode-Info.plist',
-            'APP_MODE_APP_BUNDLE_ID': '<(mac_bundle_id).app.@APP_MODE_SHORTCUT_ID@',
-          },
-          'postbuilds' : [
-            {
-              # Modify the Info.plist as needed.  The script explains why this
-              # is needed.  This is also done in the chrome and chrome_dll
-              # targets.  In this case, --breakpad=0, --keystone=0, and --scm=0
-              # are used because Breakpad, Keystone, and SCM keys are
-              # never placed into the app mode loader.
-              'postbuild_name': 'Tweak Info.plist',
-              'action': ['<(tweak_info_plist_path)',
-                         '--breakpad=0',
-                         '--keystone=0',
-                         '--scm=0'],
-            },
-          ],
-        },  # target app_mode_app
-        {
           # Convenience target to build a disk image.
           'target_name': 'build_app_dmg',
           # Don't place this in the 'all' list; most won't want it.