Rename GetAppShortcutInfos to GetAppShortcutsMenuItemInfos.

Bug: 1100751
Change-Id: Idc9243d5c08c0bdd331c40c555c4eed8a67669d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2351099Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Commit-Queue: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Cr-Commit-Position: refs/heads/master@{#797504}

chrome/browser/web_applications/components/app_registrar.h

@@ -114,11 +114,11 @@ class AppRegistrar {
 
   // Returns the "shortcuts" field from the app manifest, use |AppIconManager|
   // to load shortcuts menu icons bitmaps data.
-  virtual std::vector<WebApplicationShortcutsMenuItemInfo> GetAppShortcutInfos(
-      const AppId& app_id) const = 0;
+  virtual std::vector<WebApplicationShortcutsMenuItemInfo>
+  GetAppShortcutsMenuItemInfos(const AppId& app_id) const = 0;
 
   // Represents which icon sizes we successfully downloaded from the
-  // ShortcutInfos.
+  // ShortcutsMenuItemInfos.
   virtual std::vector<std::vector<SquareSizePx>>
   GetAppDownloadedShortcutsMenuIconsSizes(const AppId& app_id) const = 0;
 

chrome/browser/web_applications/components/app_shortcut_manager.cc

@@ -177,7 +177,7 @@ void AppShortcutManager::OnShortcutsMenuIconsReadRegisterShortcutsMenu(
     RegisterShortcutsMenuCallback callback,
     ShortcutsMenuIconsBitmaps shortcuts_menu_icons_bitmaps) {
   std::vector<WebApplicationShortcutsMenuItemInfo> shortcuts_menu_item_infos =
-      registrar_->GetAppShortcutInfos(app_id);
+      registrar_->GetAppShortcutsMenuItemInfos(app_id);
   if (!shortcuts_menu_item_infos.empty()) {
     RegisterShortcutsMenuWithOs(app_id, shortcuts_menu_item_infos,
                                 shortcuts_menu_icons_bitmaps);

chrome/browser/web_applications/extensions/bookmark_app_registrar.cc

@@ -240,7 +240,8 @@ std::vector<SquareSizePx> BookmarkAppRegistrar::GetAppDownloadedIconSizes(
 }
 
 std::vector<WebApplicationShortcutsMenuItemInfo>
-BookmarkAppRegistrar::GetAppShortcutInfos(const web_app::AppId& app_id) const {
+BookmarkAppRegistrar::GetAppShortcutsMenuItemInfos(
+    const web_app::AppId& app_id) const {
   std::vector<WebApplicationShortcutsMenuItemInfo> result;
   const Extension* extension = GetBookmarkAppDchecked(app_id);
   if (!extension)

chrome/browser/web_applications/extensions/bookmark_app_registrar.h

@@ -59,7 +59,7 @@ class BookmarkAppRegistrar : public web_app::AppRegistrar,
       const web_app::AppId& app_id) const override;
   std::vector<SquareSizePx> GetAppDownloadedIconSizes(
       const web_app::AppId& app_id) const override;
-  std::vector<WebApplicationShortcutsMenuItemInfo> GetAppShortcutInfos(
+  std::vector<WebApplicationShortcutsMenuItemInfo> GetAppShortcutsMenuItemInfos(
       const web_app::AppId& app_id) const override;
   std::vector<std::vector<SquareSizePx>>
   GetAppDownloadedShortcutsMenuIconsSizes(

chrome/browser/web_applications/manifest_update_manager_browsertest.cc

@@ -1246,7 +1246,9 @@ IN_PROC_BROWSER_TEST_P(ManifestUpdateManagerBrowserTestWithShortcutsMenu,
             ManifestUpdateResult::kAppUpdated);
   histogram_tester_.ExpectBucketCount(kUpdateHistogramName,
                                       ManifestUpdateResult::kAppUpdated, 1);
-  EXPECT_EQ(GetProvider().registrar().GetAppShortcutInfos(app_id).size(), 2u);
+  EXPECT_EQ(
+      GetProvider().registrar().GetAppShortcutsMenuItemInfos(app_id).size(),
+      2u);
 }
 
 IN_PROC_BROWSER_TEST_P(ManifestUpdateManagerBrowserTestWithShortcutsMenu,
@@ -1284,7 +1286,8 @@ IN_PROC_BROWSER_TEST_P(ManifestUpdateManagerBrowserTestWithShortcutsMenu,
             ManifestUpdateResult::kAppUpdated);
   histogram_tester_.ExpectBucketCount(kUpdateHistogramName,
                                       ManifestUpdateResult::kAppUpdated, 1);
-  EXPECT_EQ(GetProvider().registrar().GetAppShortcutInfos(app_id)[0].name,
+  EXPECT_EQ(
+      GetProvider().registrar().GetAppShortcutsMenuItemInfos(app_id)[0].name,
       base::UTF8ToUTF16(kAnotherShortcutsItemName));
 }
 
@@ -1361,7 +1364,8 @@ IN_PROC_BROWSER_TEST_P(ManifestUpdateManagerBrowserTestWithShortcutsMenu,
             ManifestUpdateResult::kAppUpdated);
   histogram_tester_.ExpectBucketCount(kUpdateHistogramName,
                                       ManifestUpdateResult::kAppUpdated, 1);
-  EXPECT_EQ(GetProvider().registrar().GetAppShortcutInfos(app_id)[0].url,
+  EXPECT_EQ(
+      GetProvider().registrar().GetAppShortcutsMenuItemInfos(app_id)[0].url,
       http_server_.GetURL(kAnotherShortcutsItemUrl));
 }
 
@@ -1463,7 +1467,7 @@ IN_PROC_BROWSER_TEST_P(ManifestUpdateManagerBrowserTestWithShortcutsMenu,
                                       ManifestUpdateResult::kAppUpdated, 1);
   EXPECT_EQ(GetProvider()
                 .registrar()
-                .GetAppShortcutInfos(app_id)[0]
+                .GetAppShortcutsMenuItemInfos(app_id)[0]
                 .shortcut_icon_infos[0]
                 .url,
             http_server_.GetURL(kAnotherIconSrc));
@@ -1507,7 +1511,7 @@ IN_PROC_BROWSER_TEST_P(ManifestUpdateManagerBrowserTestWithShortcutsMenu,
                                       ManifestUpdateResult::kAppUpdated, 1);
   EXPECT_EQ(GetProvider()
                 .registrar()
-                .GetAppShortcutInfos(app_id)[0]
+                .GetAppShortcutsMenuItemInfos(app_id)[0]
                 .shortcut_icon_infos[0]
                 .square_size_px,
             kAnotherIconSize);

chrome/browser/web_applications/manifest_update_task.cc

@@ -172,7 +172,7 @@ bool ManifestUpdateTask::IsUpdateNeededForManifest() const {
   if (base::FeatureList::IsEnabled(
           features::kDesktopPWAsAppIconShortcutsMenu) &&
       web_application_info_->shortcuts_menu_item_infos !=
-          registrar_.GetAppShortcutInfos(app_id_)) {
+          registrar_.GetAppShortcutsMenuItemInfos(app_id_)) {
     return true;
   }
 

chrome/browser/web_applications/test/test_app_registrar.cc

@@ -160,7 +160,7 @@ std::vector<SquareSizePx> TestAppRegistrar::GetAppDownloadedIconSizes(
 }
 
 std::vector<WebApplicationShortcutsMenuItemInfo>
-TestAppRegistrar::GetAppShortcutInfos(const AppId& app_id) const {
+TestAppRegistrar::GetAppShortcutsMenuItemInfos(const AppId& app_id) const {
   NOTIMPLEMENTED();
   return {};
 }

chrome/browser/web_applications/test/test_app_registrar.h

@@ -70,7 +70,7 @@ class TestAppRegistrar : public AppRegistrar {
       const AppId& app_id) const override;
   std::vector<SquareSizePx> GetAppDownloadedIconSizes(
       const AppId& app_id) const override;
-  std::vector<WebApplicationShortcutsMenuItemInfo> GetAppShortcutInfos(
+  std::vector<WebApplicationShortcutsMenuItemInfo> GetAppShortcutsMenuItemInfos(
       const AppId& app_id) const override;
   std::vector<std::vector<SquareSizePx>>
   GetAppDownloadedShortcutsMenuIconsSizes(const AppId& app_id) const override;

chrome/browser/web_applications/web_app_migration_manager.cc

@@ -241,7 +241,7 @@ std::unique_ptr<WebApp> WebAppMigrationManager::MigrateBookmarkApp(
   if (base::FeatureList::IsEnabled(
           features::kDesktopPWAsAppIconShortcutsMenu)) {
     web_app->SetShortcutsMenuItemInfos(
-        bookmark_app_registrar_.GetAppShortcutInfos(app_id));
+        bookmark_app_registrar_.GetAppShortcutsMenuItemInfos(app_id));
     web_app->SetDownloadedShortcutsMenuIconsSizes(
         bookmark_app_registrar_.GetAppDownloadedShortcutsMenuIconsSizes(
             app_id));

chrome/browser/web_applications/web_app_migration_manager_browsertest.cc

@@ -414,7 +414,7 @@ IN_PROC_BROWSER_TEST_F(WebAppMigrationManagerBrowserTestWithShortcutsMenu,
   EXPECT_TRUE(provider().registrar().IsInstalled(app_id));
 
   std::vector<WebApplicationShortcutsMenuItemInfo> shortcuts_menu_item_infos =
-      provider().registrar().GetAppShortcutInfos(app_id);
+      provider().registrar().GetAppShortcutsMenuItemInfos(app_id);
   EXPECT_EQ(shortcuts_menu_item_infos.size(), 2u);
   EXPECT_EQ(shortcuts_menu_item_infos[0].name, base::UTF8ToUTF16("shortcut1"));
   EXPECT_EQ(shortcuts_menu_item_infos[0].shortcut_icon_infos.size(), 1u);

chrome/browser/web_applications/web_app_registrar.cc

@@ -151,7 +151,7 @@ std::vector<SquareSizePx> WebAppRegistrar::GetAppDownloadedIconSizes(
 }
 
 std::vector<WebApplicationShortcutsMenuItemInfo>
-WebAppRegistrar::GetAppShortcutInfos(const AppId& app_id) const {
+WebAppRegistrar::GetAppShortcutsMenuItemInfos(const AppId& app_id) const {
   auto* web_app = GetAppById(app_id);
   return web_app ? web_app->shortcuts_menu_item_infos()
                  : std::vector<WebApplicationShortcutsMenuItemInfo>();

chrome/browser/web_applications/web_app_registrar.h

@@ -59,7 +59,7 @@ class WebAppRegistrar : public AppRegistrar, public ProfileManagerObserver {
       const AppId& app_id) const override;
   std::vector<SquareSizePx> GetAppDownloadedIconSizes(
       const AppId& app_id) const override;
-  std::vector<WebApplicationShortcutsMenuItemInfo> GetAppShortcutInfos(
+  std::vector<WebApplicationShortcutsMenuItemInfo> GetAppShortcutsMenuItemInfos(
       const AppId& app_id) const override;
   std::vector<std::vector<SquareSizePx>>
   GetAppDownloadedShortcutsMenuIconsSizes(const AppId& app_id) const override;