Don't enable app shims in tests. (Mac)

apps/app_shim/app_shim_mac.cc

Index: apps/app_shim/app_shim_mac.cc
diff --git a/apps/app_shim/app_shim_mac.cc b/apps/app_shim/app_shim_mac.cc
index becce615ba21e392443e8d3cce8143fdd45d1a10..a809fa74e58e1532a070c461e2135ce31b6fd80f 100644
--- a/apps/app_shim/app_shim_mac.cc
+++ b/apps/app_shim/app_shim_mac.cc
@@ -10,8 +10,10 @@
 namespace apps {
 
 bool IsAppShimsEnabled() {
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableAppShims);
+  // Disable app shims in tests because shims created in ~/Applications will not
+  // be cleaned up.
+  return !(CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType) ||
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAppShims));
 }
 
 }  // namespace apps