Store target app name in Web Share prefs, and add extra logic.

chrome/browser/extensions/bookmark_app_helper.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/bookmark_app_helper.h"
 
 #include <stddef.h>
 
 #include <cctype>
 #include <string>
@@ skipping 567 matching lines @@
   OnDidGetManifest(GURL(), manifest);
 }
 
 void BookmarkAppHelper::OnDidGetManifest(const GURL& manifest_url,
                                          const content::Manifest& manifest) {
   if (contents_->IsBeingDestroyed())
     return;
 
   UpdateWebAppInfoFromManifest(manifest, &web_app_info_);
 
-  if (!ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) {
-    const std::string& manifest_url_string = manifest_url.spec();
-
-    base::Optional<std::string> url_template;
-    if (manifest.share_target.has_value() &&
-        !manifest.share_target.value().url_template.is_null()) {
-      url_template = base::Optional<std::string>(base::UTF16ToUTF8(
-          manifest.share_target.value().url_template.string()));
-    }
-
-    // Add this site as a share target, if it declares a url_template in its
-    // manifest, or remove if it doesn't.
-    UpdateShareTargetInPrefs(manifest_url_string, std::move(url_template),
-                             profile_->GetPrefs());
-  }
+  if (!ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare"))
+    UpdateShareTargetInPrefs(manifest_url, manifest, profile_->GetPrefs());
 
   // Add urls from the WebApplicationInfo.
   std::vector<GURL> web_app_info_icon_urls;
   for (std::vector<WebApplicationInfo::IconInfo>::const_iterator it =
            web_app_info_.icons.begin();
        it != web_app_info_.icons.end();
        ++it) {
     if (it->url.is_valid())
       web_app_info_icon_urls.push_back(it->url);
   }
@@ skipping 213 matching lines @@
       extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
 }
 
 bool IsValidBookmarkAppUrl(const GURL& url) {
   URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes);
   origin_only_pattern.SetMatchAllURLs(true);
   return url.is_valid() && origin_only_pattern.MatchesURL(url);
 }
 
 }  // namespace extensions