Remove --disable-app-shims.

chrome/browser/web_applications/web_app_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
-#include "apps/app_shim/app_shim_mac.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/launch_services_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/path_service.h"
@@ skipping 109 matching lines @@
       return false;
   }
 
   ScopedCarbonHandle raw_data(bitmap.getSize());
   ConvertSkiaToARGB(bitmap, &raw_data);
   OSErr result = SetIconFamilyData(icon_family, icon_type, raw_data.Get());
   DCHECK_EQ(noErr, result);
   return result == noErr;
 }
 
+bool AppShimsDisabledForTest() {
+  // Disable app shims in tests because shims created in ~/Applications will not
+  // be cleaned up.
+  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType);
+}
+
 base::FilePath GetWritableApplicationsDirectory() {
   base::FilePath path;
   if (base::mac::GetUserDirectory(NSApplicationDirectory, &path)) {
     if (!base::DirectoryExists(path)) {
       if (!base::CreateDirectory(path))
         return base::FilePath();
 
       // Create a zero-byte ".localized" file to inherit localizations from OSX
       // for folders that have special meaning.
       base::WriteFile(path.Append(".localized"), NULL, 0);
@@ skipping 692 matching lines @@
       inFileViewerRootedAtPath:nil];
 }
 
 base::FilePath GetAppInstallPath(const ShortcutInfo& shortcut_info) {
   WebAppShortcutCreator shortcut_creator(
       base::FilePath(), shortcut_info, extensions::FileHandlersInfo());
   return shortcut_creator.GetApplicationsShortcutPath();
 }
 
 void MaybeLaunchShortcut(const ShortcutInfo& shortcut_info) {
-  if (!apps::IsAppShimsEnabled())
+  if (AppShimsDisabledForTest())
     return;
 
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&LaunchShimOnFileThread, shortcut_info));
 }
 
 // Called when the app's ShortcutInfo (with icon) is loaded when creating app
 // shortcuts.
 void CreateAppShortcutInfoLoaded(
@@ skipping 49 matching lines @@
 
 namespace internals {
 
 bool CreatePlatformShortcuts(
     const base::FilePath& app_data_path,
     const ShortcutInfo& shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info,
     const ShortcutLocations& creation_locations,
     ShortcutCreationReason creation_reason) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  if (AppShimsDisabledForTest())
+    return true;
+
   WebAppShortcutCreator shortcut_creator(
       app_data_path, shortcut_info, file_handlers_info);
   return shortcut_creator.CreateShortcuts(creation_reason, creation_locations);
 }
 
 void DeletePlatformShortcuts(const base::FilePath& app_data_path,
                              const ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   WebAppShortcutCreator shortcut_creator(
       app_data_path, shortcut_info, extensions::FileHandlersInfo());
   shortcut_creator.DeleteShortcuts();
 }
 
 void UpdatePlatformShortcuts(
     const base::FilePath& app_data_path,
     const base::string16& old_app_title,
     const ShortcutInfo& shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  if (AppShimsDisabledForTest())
+    return;
+
   WebAppShortcutCreator shortcut_creator(
       app_data_path, shortcut_info, file_handlers_info);
   shortcut_creator.UpdateShortcuts();
 }
 
 void DeleteAllShortcutsForProfile(const base::FilePath& profile_path) {
   const std::string profile_base_name = profile_path.BaseName().value();
   std::vector<base::FilePath> bundles = GetAllAppBundlesInPath(
       profile_path.Append(chrome::kWebAppDirname), profile_base_name);
 
@@ skipping 21 matching lines @@
   web_app::UpdateShortcutInfoAndIconForApp(
       app,
       profile,
       base::Bind(&web_app::CreateAppShortcutInfoLoaded,
                  profile,
                  app,
                  close_callback));
 }
 
 }  // namespace chrome