Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3808)

Unified Diff: chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm

Issue 2398853002: Remove deprecated APIs from OpenApplicationWithPath. (Closed)
Patch Set: More cleanup. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app_shim/chrome_main_app_mode_mac.mm ('k') | chrome/browser/web_applications/web_app_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
diff --git a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
index 82ed30d343eca4f3f6c3360e9ba1967e3b18f439..e1ebdf2d8ee3b176ceb5e9eb3456f163c04e4bcd 100644
--- a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
+++ b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
@@ -330,17 +330,15 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_HostedAppLaunch) {
HostedAppBrowserListObserver listener(app->id());
base::CommandLine shim_cmdline(base::CommandLine::NO_PROGRAM);
shim_cmdline.AppendSwitch(app_mode::kLaunchedForTest);
- ProcessSerialNumber shim_psn;
+ pid_t shim_pid;
ASSERT_TRUE(base::mac::OpenApplicationWithPath(
- shim_path_, shim_cmdline, kLSLaunchDefaults, &shim_psn));
+ shim_path_, shim_cmdline, NSWorkspaceLaunchDefault, nil, &shim_pid));
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();
@@ -402,17 +400,15 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_Launch) {
ExtensionTestMessageListener launched_listener("Launched", false);
base::CommandLine shim_cmdline(base::CommandLine::NO_PROGRAM);
shim_cmdline.AppendSwitch(app_mode::kLaunchedForTest);
- ProcessSerialNumber shim_psn;
+ pid_t shim_pid;
ASSERT_TRUE(base::mac::OpenApplicationWithPath(
- shim_path_, shim_cmdline, kLSLaunchDefaults, &shim_psn));
+ shim_path_, shim_cmdline, NSWorkspaceLaunchDefault, nil, &shim_pid));
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;
@@ -611,7 +607,7 @@ IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_RebuildShim) {
ExtensionTestMessageListener launched_listener("Launched", false);
base::CommandLine shim_cmdline(base::CommandLine::NO_PROGRAM);
ASSERT_TRUE(base::mac::OpenApplicationWithPath(
- shim_path, shim_cmdline, kLSLaunchDefaults, NULL));
+ shim_path, shim_cmdline, NSWorkspaceLaunchDefault, nil, nullptr));
// Wait for the app to start (1). At this point there is no shim host.
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
« no previous file with comments | « chrome/app_shim/chrome_main_app_mode_mac.mm ('k') | chrome/browser/web_applications/web_app_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698