Reland "Add browser tests for AppLaunchHandler."

This reverts commit b9a6819e.

Reason for revert: <INSERT REASONING HERE>
Fix the browser tests.

Original change's description:
> Revert "Add browser tests for AppLaunchHandler."
>
> This reverts commit dd223e70.
>
> Reason for revert: these tests have been failing constently on MSAN builders
> https://ci.chromium.org/p/chromium/builders/ci/Linux%20ChromiumOS%20MSan%20Tests
>
> Original change's description:
> > Add browser tests for AppLaunchHandler.
> >
> > Add browser tests for AppLaunchHandler to verify the restoration
> > process.
> >
> > BUG=1146900
> >
> > Change-Id: Ibeaf262080a24c680718888ee081cc62c5b21a3a
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2619245
> > Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
> > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#843901}
>
> TBR=xiyuan@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com,nancylingwang@chromium.org
>
> Change-Id: Icc6cc9ccbf6fcb0759bf2d03efd2d25a31d90d44
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1146900
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2632606
> Reviewed-by: Anatoliy Potapchuk <apotapchuk@chromium.org>
> Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#844015}

TBR=xiyuan@chromium.org,apotapchuk@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com,nancylingwang@chromium.org


Bug: 1146900
Change-Id: I3b6706aa4dba74e8cf84426cc68cbf065e70748b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2633481Reviewed-by: Nancy Wang <nancylingwang@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Anatoliy Potapchuk <apotapchuk@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844442}

chrome/browser/apps/app_service/app_launch_params.cc

@@ -21,6 +21,7 @@ AppLaunchParams::AppLaunchParams(const std::string& app_id,
 AppLaunchParams::AppLaunchParams(const std::string& app_id,
                                  apps::mojom::LaunchContainer container,
                                  WindowOpenDisposition disposition,
+                                 apps::mojom::AppLaunchSource source,
                                  int64_t display_id,
                                  const std::vector<base::FilePath>& files,
                                  const apps::mojom::IntentPtr& intentPtr)
@@ -28,6 +29,7 @@ AppLaunchParams::AppLaunchParams(const std::string& app_id,
       container(container),
       disposition(disposition),
       command_line(base::CommandLine::NO_PROGRAM),
+      source(source),
       display_id(display_id),
       launch_files(files),
       intent(intentPtr ? intentPtr.Clone() : nullptr) {}

chrome/browser/apps/app_service/app_launch_params.h

@@ -28,6 +28,7 @@ struct AppLaunchParams {
   AppLaunchParams(const std::string& app_id,
                   apps::mojom::LaunchContainer container,
                   WindowOpenDisposition disposition,
+                  apps::mojom::AppLaunchSource source,
                   int64_t display_id,
                   const std::vector<base::FilePath>& files,
                   const apps::mojom::IntentPtr& intentPtr);

chrome/browser/apps/app_service/extension_apps_chromeos.cc

@@ -694,9 +694,9 @@ void ExtensionAppsChromeOs::GetMenuModelForChromeBrowserApp(
 
 content::WebContents* ExtensionAppsChromeOs::LaunchImpl(
     AppLaunchParams&& params) {
-  AppLaunchParams params_for_restore(params.app_id, params.container,
-                                     params.disposition, params.display_id,
-                                     params.launch_files, params.intent);
+  AppLaunchParams params_for_restore(
+      params.app_id, params.container, params.disposition, params.source,
+      params.display_id, params.launch_files, params.intent);
 
   auto* web_contents = ExtensionAppsBase::LaunchImpl(std::move(params));
 

chrome/browser/apps/app_service/web_apps_chromeos.cc

@@ -607,9 +607,9 @@ void WebAppsChromeOs::SetIconEffect(const std::string& app_id) {
 
 content::WebContents* WebAppsChromeOs::LaunchAppWithParams(
     AppLaunchParams params) {
-  AppLaunchParams params_for_restore(params.app_id, params.container,
-                                     params.disposition, params.display_id,
-                                     params.launch_files, params.intent);
+  AppLaunchParams params_for_restore(
+      params.app_id, params.container, params.disposition, params.source,
+      params.display_id, params.launch_files, params.intent);
 
   auto* web_contents = WebAppsBase::LaunchAppWithParams(std::move(params));
 

chrome/browser/chromeos/full_restore/app_launch_handler.cc

@@ -201,6 +201,7 @@ void AppLaunchHandler::LaunchWebAppOrExtension(
         app_id,
         static_cast<apps::mojom::LaunchContainer>(it.second->container.value()),
         static_cast<WindowOpenDisposition>(it.second->disposition.value()),
+        apps::mojom::AppLaunchSource::kSourceChromeInternal,
         it.second->display_id.value(),
         it.second->file_paths.has_value() ? it.second->file_paths.value()
                                           : std::vector<base::FilePath>{},

chrome/test/BUILD.gn

@@ -2490,6 +2490,7 @@ if (!is_android) {
         "../browser/chromeos/file_manager/video_player_browsertest.cc",
         "../browser/chromeos/file_manager/video_player_jstest.cc",
         "../browser/chromeos/first_run/drive_first_run_browsertest.cc",
+        "../browser/chromeos/full_restore/app_launch_handler_browsertest.cc",
         "../browser/chromeos/input_method/input_method_engine_browsertests.cc",
         "../browser/chromeos/input_method/native_input_method_engine_browsertest.cc",
         "../browser/chromeos/input_method/textinput_browsertest.cc",