[Mac Fix-It] Changed OpenApplicationWithPath to use NSWorkspace.

chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm

 // Copyright 2014 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 <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/switches.h"
 #include "base/auto_reset.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/launch_services_util.h"
+#import "base/mac/launch_services_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
@@ skipping 300 matching lines @@
 
     EXPECT_FALSE(GetFirstHostedAppWindow());
     EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
   }
 
   // Case 2: Launch the shim, it should start the hosted app.
   {
     HostedAppBrowserListObserver listener(app->id());
     base::CommandLine shim_cmdline(base::CommandLine::NO_PROGRAM);
     shim_cmdline.AppendSwitch(app_mode::kLaunchedForTest);
-    ProcessSerialNumber shim_psn;
-    ASSERT_TRUE(base::mac::OpenApplicationWithPath(
-        shim_path_, shim_cmdline, kLSLaunchDefaults, &shim_psn));
+    base::Process shim_process = base::mac::OpenApplicationWithPath(
+        shim_path_, shim_cmdline, NSWorkspaceLaunchDefault);
+    ASSERT_TRUE(shim_process.IsValid());
     listener.WaitUntilAdded();
 
     ASSERT_TRUE(GetFirstHostedAppWindow());
     EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 
     // If the window is closed, the shim should quit.
-    pid_t shim_pid;
-    EXPECT_EQ(noErr, GetProcessPID(&shim_psn, &shim_pid));
     GetFirstHostedAppWindow()->window()->Close();
     // Wait for the window to be closed.
     listener.WaitUntilRemoved();
-    base::Process shim_process(shim_pid);
     int exit_code;
     ASSERT_TRUE(shim_process.WaitForExitWithTimeout(
                     TestTimeouts::action_timeout(), &exit_code));
 
     EXPECT_FALSE(GetFirstHostedAppWindow());
     EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
   }
 }
 
 // Test that launching the shim for an app starts the app, and vice versa.
@@ skipping 37 matching lines @@
 
     EXPECT_FALSE(GetFirstAppWindow());
     EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
   }
 
   // Case 2: Launch the shim, it should start the app.
   {
     ExtensionTestMessageListener launched_listener("Launched", false);
     base::CommandLine shim_cmdline(base::CommandLine::NO_PROGRAM);
     shim_cmdline.AppendSwitch(app_mode::kLaunchedForTest);
-    ProcessSerialNumber shim_psn;
-    ASSERT_TRUE(base::mac::OpenApplicationWithPath(
-        shim_path_, shim_cmdline, kLSLaunchDefaults, &shim_psn));
+    base::Process shim_process = base::mac::OpenApplicationWithPath(
+        shim_path_, shim_cmdline, NSWorkspaceLaunchDefault);
+    ASSERT_TRUE(shim_process.IsValid());
     ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
     ASSERT_TRUE(GetFirstAppWindow());
     EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 
     // If the window is closed, the shim should quit.
-    pid_t shim_pid;
-    EXPECT_EQ(noErr, GetProcessPID(&shim_psn, &shim_pid));
     GetFirstAppWindow()->GetBaseWindow()->Close();
-    base::Process shim_process(shim_pid);
     int exit_code;
     ASSERT_TRUE(shim_process.WaitForExitWithTimeout(
                     TestTimeouts::action_timeout(), &exit_code));
 
     EXPECT_FALSE(GetFirstAppWindow());
     EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
   }
 }
 
 // Test that the shim's lifetime depends on the visibility of windows. I.e. the
@@ skipping 175 matching lines @@
   // This actually happens in multiple launches of the shim:
   // (1) The shim will fail and instead launch Chrome with --app-id so that the
   //     app starts.
   // (2) Chrome launches the shim in response to an app starting, this time the
   //     shim launches Chrome with --app-shim-error, which causes Chrome to
   //     rebuild the shim.
   // (3) After rebuilding, Chrome again launches the shim and expects it to
   //     behave normally.
   ExtensionTestMessageListener launched_listener("Launched", false);
   base::CommandLine shim_cmdline(base::CommandLine::NO_PROGRAM);
-  ASSERT_TRUE(base::mac::OpenApplicationWithPath(
-      shim_path, shim_cmdline, kLSLaunchDefaults, NULL));
+  base::Process shim_process = base::mac::OpenApplicationWithPath(
+      shim_path, shim_cmdline, NSWorkspaceLaunchDefault);
+  ASSERT_TRUE(shim_process.IsValid());
 
   // Wait for the app to start (1). At this point there is no shim host.
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
   EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
 
   // Wait for the rebuilt shim to connect (3). This does not race with the app
   // starting (1) because Chrome only launches the shim (2) after the app
   // starts. Then Chrome must handle --app-shim-error on the UI thread before
   // the shim is rebuilt.
   WindowedAppShimLaunchObserver(app->id()).Wait();
 
   EXPECT_TRUE(GetFirstAppWindow());
   EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 }
 
 #endif  // defined(ARCH_CPU_64_BITS)
 
 }  // namespace apps