Rename some apps utility functions' namespace

BUG=826982

Change-Id: If73d4090989a436c4f8ebd1857d1d8727a2dca50
Reviewed-on: https://chromium-review.googlesource.com/c/1457558Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629876}

chrome/browser/apps/app_service/app_icon_factory.cc

@@ -148,7 +148,7 @@ void LoadIconFromExtension(apps::mojom::IconCompression icon_compression,
                            content::BrowserContext* context,
                            const std::string& extension_id,
                            apps::mojom::Publisher::LoadIconCallback callback) {
-  int size_hint_in_px = ConvertDipToPx(size_hint_in_dip);
+  int size_hint_in_px = apps_util::ConvertDipToPx(size_hint_in_dip);
 
   const extensions::Extension* extension =
       extensions::ExtensionSystem::Get(context)

chrome/browser/apps/app_service/app_icon_source.cc

@@ -26,7 +26,7 @@ namespace {
 void LoadDefaultImage(const content::URLDataSource::GotDataCallback& callback) {
   base::StringPiece contents =
       ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
-          IDR_APP_DEFAULT_ICON, GetPrimaryDisplayUIScaleFactor());
+          IDR_APP_DEFAULT_ICON, apps_util::GetPrimaryDisplayUIScaleFactor());
 
   base::RefCountedBytes* image_bytes = new base::RefCountedBytes();
   image_bytes->data().assign(contents.data(),
@@ -88,7 +88,7 @@ void AppIconSource::StartDataRequest(
     LoadDefaultImage(callback);
     return;
   }
-  int size_in_dip = ConvertPxToDip(size);
+  int size_in_dip = apps_util::ConvertPxToDip(size);
 
   apps::AppServiceProxy* app_service_proxy =
       apps::AppServiceProxy::Get(profile_);

chrome/browser/apps/app_service/arc_apps.cc

@@ -333,7 +333,8 @@ const base::FilePath ArcApps::GetCachedIconFilePath(const std::string& app_id,
   // in arc_app_icon.cc?
   return prefs_->GetIconPath(
       app_id,
-      ArcAppIconDescriptor(size_hint_in_dip, GetPrimaryDisplayUIScaleFactor()));
+      ArcAppIconDescriptor(size_hint_in_dip,
+                           apps_util::GetPrimaryDisplayUIScaleFactor()));
 }
 
 void ArcApps::LoadIconFromVM(const std::string icon_key_s_key,
@@ -345,9 +346,9 @@ void ArcApps::LoadIconFromVM(const std::string icon_key_s_key,
   if (app_info) {
     base::OnceCallback<void(apps::ArcApps::AppConnectionHolder*)> pending =
         base::BindOnce(&LoadIcon0, icon_compression,
-                       ConvertDipToPx(size_hint_in_dip), app_info->package_name,
-                       app_info->activity, app_info->icon_resource_id,
-                       std::move(callback));
+                       apps_util::ConvertDipToPx(size_hint_in_dip),
+                       app_info->package_name, app_info->activity,
+                       app_info->icon_resource_id, std::move(callback));
 
     AppConnectionHolder* app_connection_holder =
         prefs_->app_connection_holder();
@@ -367,7 +368,7 @@ void ArcApps::LoadPlayStoreIcon(apps::mojom::IconCompression icon_compression,
                                 int32_t size_hint_in_dip,
                                 LoadIconCallback callback) {
   // Use overloaded Chrome icon for Play Store that is adapted to Chrome style.
-  int size_hint_in_px = ConvertDipToPx(size_hint_in_dip);
+  int size_hint_in_px = apps_util::ConvertDipToPx(size_hint_in_dip);
   int resource_id = (size_hint_in_px <= 32) ? IDR_ARC_SUPPORT_ICON_32
                                             : IDR_ARC_SUPPORT_ICON_192;
   LoadIconFromResource(icon_compression, size_hint_in_dip, resource_id,

chrome/browser/apps/app_service/crostini_apps.cc

@@ -77,7 +77,7 @@ void CrostiniApps::LoadIcon(const std::string& app_id,
     }
 
     if (icon_key->icon_type == apps::mojom::IconType::kCrostini) {
-      auto scale_factor = GetPrimaryDisplayUIScaleFactor();
+      auto scale_factor = apps_util::GetPrimaryDisplayUIScaleFactor();
 
       // Try loading the icon from an on-disk cache. If that fails, fall back
       // to LoadIconFromVM.

chrome/browser/apps/app_service/dip_px_util.cc

@@ -28,7 +28,7 @@ float GetPrimaryDisplayScaleFactor() {
 
 }  // namespace
 
-namespace apps {
+namespace apps_util {
 
 int ConvertDipToPx(int dip) {
   return base::saturated_cast<int>(
@@ -44,4 +44,4 @@ ui::ScaleFactor GetPrimaryDisplayUIScaleFactor() {
   return ui::GetSupportedScaleFactor(GetPrimaryDisplayScaleFactor());
 }
 
-}  // namespace apps
+}  // namespace apps_util

chrome/browser/apps/app_service/dip_px_util.h

@@ -10,12 +10,12 @@
 
 #include "ui/base/resource/scale_factor.h"
 
-namespace apps {
+namespace apps_util {
 
 int ConvertDipToPx(int dip);
 int ConvertPxToDip(int px);
 ui::ScaleFactor GetPrimaryDisplayUIScaleFactor();
 
-}  // namespace apps
+}  // namespace apps_util
 
 #endif  // CHROME_BROWSER_APPS_APP_SERVICE_DIP_PX_UTIL_H_