[IntentHandling] Fix empty activity name issue.

Currently it is possible to have empty activity name return from intent
querying. Update the logic to return the app name if the activity name
is empty.

BUG=1092784

Change-Id: I4af2406b5627d8d68ac3d6ee7f03c0e7175116ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2336008
Commit-Queue: Maggie Cai <mxcai@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794909}

chrome/browser/apps/app_service/app_service_proxy.cc

@@ -529,18 +529,17 @@ std::vector<AppIdAndActivityName> AppServiceProxy::GetAppsForIntent(
         if (apps_util::IntentMatchesFilter(intent, filter)) {
           AppIdAndActivityName app_id_and_activity;
           app_id_and_activity.app_id = update.AppId();
-          if (base::FeatureList::IsEnabled(features::kIntentHandlingSharing) &&
-              filter->activity_name.has_value()) {
-            std::string activity_name = filter->activity_name.value();
-            if (activity_name.empty()) {
-              activity_name = update.Name();
-            }
-            if (base::Contains(existing_activities, activity_name)) {
-              continue;
-            }
-            existing_activities.insert(activity_name);
-            app_id_and_activity.activity_name = activity_name;
+          std::string activity_name;
+          if (filter->activity_name && !filter->activity_name.value().empty()) {
+            activity_name = filter->activity_name.value();
+          } else {
+            activity_name = update.Name();
           }
+          if (base::Contains(existing_activities, activity_name)) {
+            continue;
+          }
+          existing_activities.insert(activity_name);
+          app_id_and_activity.activity_name = activity_name;
           app_id_and_activities.push_back(app_id_and_activity);
         }
       }