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

The Launch test failed on mac 10.7 tests:
http://build.chromium.org/p/chromium.mac/builders/Mac%2010.7%20Tests%20%28dbg%29%283%29/builds/24632.

> [Mac] Add interactive App Shim test.
> 
> This test creates shims in the user data dir and actually starts them up and
> expects them to connect to the IPC socket.
> 
> BUG=168080
> 
> Review URL: https://codereview.chromium.org/316493002

TBR=jackhou@chromium.org

Review URL: https://codereview.chromium.org/325123004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276385 0039d316-1c4b-4281-b951-d872f2087c98

apps/app_shim/chrome_main_app_mode_mac.mm

@@ -611,11 +611,7 @@ int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info) {
   main_message_loop.set_thread_name("MainThread");
   base::PlatformThread::SetName("CrAppShimMain");
 
-  // In tests, launching Chrome does nothing, and we won't get a ping response,
-  // so just assume the socket exists.
-  if (pid == -1 &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          app_mode::kLaunchedForTest)) {
+  if (pid == -1) {
     // Launch Chrome if it isn't already running.
     ProcessSerialNumber psn;
     CommandLine command_line(CommandLine::NO_PROGRAM);

chrome/browser/web_applications/web_app_mac.h

@@ -14,11 +14,6 @@
 #include "chrome/browser/web_applications/web_app.h"
 #include "extensions/common/manifest_handlers/file_handler_info.h"
 
-// Whether to enable update and launch of app shims in tests. (Normally shims
-// are never created or launched in tests). Note that update only creates
-// internal shim bundles, i.e. it does not create new shims in ~/Applications.
-extern bool g_app_shims_allow_update_and_launch_in_tests;
-
 namespace web_app {
 
 // Returns the full path of the .app shim that would be created by

chrome/browser/web_applications/web_app_mac.mm

@@ -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.
@@ -859,10 +857,8 @@ base::FilePath GetAppInstallPath(const ShortcutInfo& shortcut_info) {
 }
 
 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,
@@ -974,10 +970,8 @@ void UpdatePlatformShortcuts(
     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);

chrome/chrome_tests.gypi

@@ -44,7 +44,6 @@
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
-        '../apps/app_shim/app_shim_interactive_uitest_mac.mm',
         '../apps/app_shim/app_shim_quit_interactive_uitest_mac.mm',
         '../apps/app_window_interactive_uitest.cc',
         '../ui/base/clipboard/clipboard_unittest.cc',

chrome/common/mac/app_mode_common.h

@@ -37,10 +37,6 @@ extern const char kAppListModeId[];
 // launch_now = false. This associates the shim without launching the app.
 extern const char kLaunchedByChromeProcessId[];
 
-// Indicates to the shim that it was launched for a test, so don't attempt to
-// launch Chrome.
-extern const char kLaunchedForTest[];
-
 // Path to an app shim bundle. Indicates to Chrome that this shim attempted to
 // launch but failed.
 extern const char kAppShimError[];

chrome/common/mac/app_mode_common.mm

@@ -14,7 +14,6 @@ const char kAppShimSocketSymlinkName[] = "App Shim Socket";
 const char kAppListModeId[] = "app_list";
 
 const char kLaunchedByChromeProcessId[] = "launched-by-chrome-process-id";
-const char kLaunchedForTest[] = "launched-for-test";
 
 const char kAppShimError[] = "app-shim-error";