app-service: remove left over code in CreateAppLaunchParamsForIntent

Cleans up left over code in https://crrev.com/c/2265693. Also adds a
test to verify full url is used when launching a web app from intent.

Fixed: 1157281
Change-Id: I47597bc93903ab9b8aa80bf3ddfa484676640e1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2589258
Commit-Queue: Jiewei Qian  <qjw@chromium.org>
Reviewed-by: Maggie Cai <mxcai@chromium.org>
Reviewed-by: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836950}

chrome/browser/apps/app_service/launch_utils.cc

@@ -166,16 +166,6 @@ apps::AppLaunchParams CreateAppLaunchParamsForIntent(
   if (intent->url.has_value()) {
     params.source = apps::mojom::AppLaunchSource::kSourceIntentUrl;
     params.override_url = intent->url.value();
-    LOG(ERROR) << "url is:" << params.override_url.spec();
-    std::string port;
-    if (intent->url->has_port()) {
-      port = ":" + intent->url->port();
-    }
-    params.override_url =
-        GURL(intent->url->scheme() + url::kStandardSchemeSeparator +
-             intent->url->host() + port + intent->url->path());
-    LOG(ERROR) << "url is:" << params.override_url.spec();
-    DCHECK(params.override_url.is_valid());
   }
 
   params.intent = std::move(intent);

chrome/browser/apps/app_service/launch_utils_unittest.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/apps/app_service/app_launch_params.h"
+#include "components/services/app_service/public/cpp/intent_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/types/display_constants.h"
 
@@ -75,3 +76,19 @@ TEST_F(LaunchUtilsTest, PreferContainerWithWindow) {
   EXPECT_EQ(preferred_container, params.container);
   EXPECT_EQ(WindowOpenDisposition::NEW_FOREGROUND_TAB, params.disposition);
 }
+
+TEST_F(LaunchUtilsTest, UseIntentFullUrlInLaunchParams) {
+  auto container = apps::mojom::LaunchContainer::kLaunchContainerNone;
+  auto disposition = WindowOpenDisposition::NEW_WINDOW;
+
+  const GURL url = GURL("https://example.com/?query=1#frag");
+  auto intent = apps_util::CreateIntentFromUrl(url);
+
+  auto params = apps::CreateAppLaunchParamsForIntent(
+      app_id, apps::GetEventFlags(container, disposition, true),
+      apps::mojom::AppLaunchSource::kSourceIntentUrl,
+      display::kInvalidDisplayId,
+      apps::mojom::LaunchContainer::kLaunchContainerWindow, std::move(intent));
+
+  EXPECT_EQ(url, params.override_url);
+}