Revert 277743 "[Mac] Add interactive App Shim test."

trunk/src/chrome/browser/web_applications/web_app_mac.mm

Index: trunk/src/chrome/browser/web_applications/web_app_mac.mm
===================================================================
--- trunk/src/chrome/browser/web_applications/web_app_mac.mm	(revision 277753)
+++ trunk/src/chrome/browser/web_applications/web_app_mac.mm	(working copy)
@@ -47,8 +47,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_family.h"
 
-bool g_app_shims_allow_update_and_launch_in_tests = false;
-
 namespace {
 
 // Launch Services Key to run as an agent app, which doesn't launch in the dock.
@@ -566,11 +564,7 @@
       return succeeded;
     }
 
-    // Remove the quarantine attribute from both the bundle and the executable.
     base::mac::RemoveQuarantineAttribute(dst_path.Append(app_name));
-    base::mac::RemoveQuarantineAttribute(
-        dst_path.Append(app_name)
-            .Append("Contents").Append("MacOS").Append("app_mode_loader"));
     ++succeeded;
   }
 
@@ -869,10 +863,8 @@
 }
 
 void MaybeLaunchShortcut(const ShortcutInfo& shortcut_info) {
-  if (AppShimsDisabledForTest() &&
-      !g_app_shims_allow_update_and_launch_in_tests) {
+  if (AppShimsDisabledForTest())
     return;
-  }
 
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
@@ -984,10 +976,8 @@
     const ShortcutInfo& shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
-  if (AppShimsDisabledForTest() &&
-      !g_app_shims_allow_update_and_launch_in_tests) {
+  if (AppShimsDisabledForTest())
     return;
-  }
 
   WebAppShortcutCreator shortcut_creator(
       app_data_path, shortcut_info, file_handlers_info);