desktop-pwas: fix PWA file-handler icon paths

This change fixes an issue where PWA custom icons were not showing up
in the Open With menu on Windows when a PWA is registered as a file
handler on Windows.

A PWA's custom icon is located at:
<user data>/<profile>/Web Applications/<app ID>/<app name>.ico

Currently, the value of DefaultIcon as registered with Windows is:
<user data>/<profile>/Web Applications/<app ID>/<app name>.exe/<app name>.ico

Windows fails to find the icon file and instead displays a generic
icon. This is caused by GetIconFilePath() being passed
|app_launcher_path| (which has value <app name>.exe) as its
|web_app_path| parameter. This change replaces that argument with the
path to <user data>/<profile>/Web Applications/<app ID>.

Bug: 1143966
Change-Id: I4744b9866c85f570c3e9bd794d83a6abb6cd97eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2508648Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Commit-Queue: Jesse McKenna <jessemckenna@google.com>
Cr-Commit-Position: refs/heads/master@{#823194}

chrome/browser/web_applications/components/web_app_file_handler_registration_win.cc

@@ -31,8 +31,10 @@ void RegisterFileHandlersWithOsTask(
     const base::FilePath& profile_path,
     const std::set<base::string16>& file_extensions,
     const base::string16& app_name_extension) {
+  const base::FilePath web_app_path =
+      GetOsIntegrationResourcesDirectoryForApp(profile_path, app_id, GURL());
   base::Optional<base::FilePath> app_specific_launcher_path =
-      CreateAppLauncherFile(app_id, app_name, app_name_extension, profile_path);
+      CreateAppLauncherFile(app_name, app_name_extension, web_app_path);
   if (!app_specific_launcher_path.has_value())
     return;
 
@@ -42,8 +44,7 @@ void RegisterFileHandlersWithOsTask(
   base::string16 user_visible_app_name(app_name);
   user_visible_app_name.append(app_name_extension);
 
-  base::FilePath icon_path =
-      internals::GetIconFilePath(app_specific_launcher_path.value(), app_name);
+  base::FilePath icon_path = internals::GetIconFilePath(web_app_path, app_name);
 
   bool result = ShellUtil::AddFileAssociations(
       GetProgIdForApp(profile_path, app_id), app_specific_launcher_command,

chrome/browser/web_applications/components/web_app_handler_registration_utils_win.cc

@@ -103,8 +103,10 @@ void UpdateAppRegistration(const web_app::AppId& app_id,
   user_visible_app_name.append(app_name_extension);
 
   base::Optional<base::FilePath> app_launcher_path =
-      web_app::CreateAppLauncherFile(app_id, app_name, app_name_extension,
-                                     profile_path);
+      web_app::CreateAppLauncherFile(
+          app_name, app_name_extension,
+          web_app::GetOsIntegrationResourcesDirectoryForApp(profile_path,
+                                                            app_id, GURL()));
   if (!app_launcher_path)
     return;
 
@@ -205,12 +207,9 @@ base::string16 GetProgIdForApp(const base::FilePath& profile_path,
 }
 
 base::Optional<base::FilePath> CreateAppLauncherFile(
-    const AppId& app_id,
     const base::string16& app_name,
     const base::string16& app_name_extension,
-    const base::FilePath& profile_path) {
-  base::FilePath web_app_path =
-      GetOsIntegrationResourcesDirectoryForApp(profile_path, app_id, GURL());
+    const base::FilePath& web_app_path) {
   if (!base::CreateDirectory(web_app_path)) {
     DPLOG(ERROR) << "Unable to create web app dir";
     RecordRegistration(RegistrationResult::kFailToCopyFromGenericLauncher);

chrome/browser/web_applications/components/web_app_handler_registration_utils_win.h

@@ -33,13 +33,12 @@ base::string16 GetProgIdForApp(const base::FilePath& profile_path,
                                const AppId& app_id);
 
 // Makes an app-specific copy of chrome_pwa_launcher.exe that lives in the web
-// application directory. Returns path of the launcher file if successful,
-// base::nullopt otherwise.
+// application directory |web_app_path|. Returns path of the launcher file if
+// successful, base::nullopt otherwise.
 base::Optional<base::FilePath> CreateAppLauncherFile(
-    const AppId& app_id,
     const base::string16& app_name,
     const base::string16& app_name_extension,
-    const base::FilePath& profile_path);
+    const base::FilePath& web_app_path);
 
 // Checks if there is an installation of this app in another profile that needs
 // to be updated with a profile specific name and executes required update.

chrome/browser/web_applications/components/web_app_handler_registration_utils_win_unittest.cc

@@ -59,7 +59,8 @@ class WebAppHandlerRegistrationUtilsWinTest : public testing::Test {
                    const base::string16& app_name_extension,
                    const base::FilePath& profile_path) {
     base::Optional<base::FilePath> launcher_path = CreateAppLauncherFile(
-        app_id, app_name, app_name_extension, profile_path);
+        app_name, app_name_extension,
+        GetOsIntegrationResourcesDirectoryForApp(profile_path, app_id, GURL()));
     ASSERT_TRUE(launcher_path.has_value());
 
     base::CommandLine launcher_command =
@@ -225,8 +226,10 @@ TEST_F(WebAppHandlerRegistrationUtilsWinTest,
 
 TEST_F(WebAppHandlerRegistrationUtilsWinTest, CreateAppLauncherFile) {
   base::string16 app_name_extension = L" extension";
-  base::Optional<base::FilePath> launcher_path = CreateAppLauncherFile(
-      app_id(), app_name(), app_name_extension, profile()->GetPath());
+  base::Optional<base::FilePath> launcher_path =
+      CreateAppLauncherFile(app_name(), app_name_extension,
+                            GetOsIntegrationResourcesDirectoryForApp(
+                                profile()->GetPath(), app_id(), GURL()));
   EXPECT_TRUE(launcher_path.has_value());
   EXPECT_TRUE(base::PathExists(launcher_path.value()));