[Profile picker] Skip the picker whenever opening an app

This CL makes sure the profile picker is skipped when an app is
explicitly requested using a command-line parameter.

Bug: 1123543
Change-Id: If894b3144946ea7d71bcfdf921563d65d4045cee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2464927
Commit-Queue: Tommy Martino <tmartino@chromium.org>
Auto-Submit: Jan Krcal <jkrcal@chromium.org>
Reviewed-by: Tommy Martino <tmartino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816571}

chrome/browser/ui/startup/startup_browser_creator.cc

@@ -308,6 +308,15 @@ bool ShouldShowProfilePicker(const base::CommandLine& command_line,
     return false;
   }
 
+  // Don't show the picker if an app is explicitly requested to open. This URL
+  // param should be ideally paired with switches::kProfileDirectory but it's
+  // better to err on the side of opening the last profile than to err on the
+  // side of not opening the app directly.
+  if (command_line.HasSwitch(switches::kApp) ||
+      command_line.HasSwitch(switches::kAppId)) {
+    return false;
+  }
+
 // If the browser is launched due to activation on Windows native notification,
 // the profile id encoded in the notification launch id should be chosen over
 // the profile picker.

chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

@@ -1976,4 +1976,26 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorPickerTest,
   Browser* new_browser = FindOneOtherBrowser(browser());
   EXPECT_TRUE(new_browser);
 }
+
+IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorPickerTest, SkipsPickerInAppMode) {
+  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
+  command_line.AppendSwitch(switches::kApp);
+
+  StartWithTwoProfiles(command_line);
+
+  // Skips the picker and creates a new browser window.
+  Browser* new_browser = FindOneOtherBrowser(browser());
+  EXPECT_TRUE(new_browser);
+}
+
+IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorPickerTest, SkipsPickerWithAppId) {
+  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
+  command_line.AppendSwitch(switches::kAppId);
+
+  StartWithTwoProfiles(command_line);
+
+  // Skips the picker and creates a new browser window.
+  Browser* new_browser = FindOneOtherBrowser(browser());
+  EXPECT_TRUE(new_browser);
+}
 #endif  // !defined(OS_CHROMEOS)