Move apps/app_shim to chrome/browser/apps

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 51513ca4e92209427c4476e707ff4c12ebadc972..184893287d352c53fea8ce8716ccd8ce4fe34c99 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -862,8 +862,6 @@
       'sources': [
         '../apps/app_restore_service_browsertest.cc',
         '../apps/app_shim/app_shim_host_manager_browsertest_mac.mm',
-        '../apps/app_shim/test/app_shim_host_manager_test_api_mac.cc',
-        '../apps/app_shim/test/app_shim_host_manager_test_api_mac.h',
         '../apps/load_and_launch_browsertest.cc',
         # TODO(blundell): Bring up a components_browsertests target and move
         # this test to be in that target. crbug.com/283846
@@ -899,9 +897,11 @@
         'browser/apps/app_browsertest_util.cc',
         'browser/apps/app_browsertest_util.h',
         'browser/apps/app_crash_browsertest.cc',
+        'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.cc',
+        'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h',
+        'browser/apps/app_url_redirector_browsertest.cc',
         'browser/apps/app_view_browsertest.cc',
         'browser/apps/app_window_browsertest.cc',
-        'browser/apps/app_url_redirector_browsertest.cc',
         'browser/apps/custom_launcher_page_browsertest_views.cc',
         'browser/apps/drive/drive_app_converter_browsertest.cc',
         'browser/apps/drive/drive_app_provider_browsertest.cc',