Make WebAPK naming consistent 1/2

chrome/browser/notifications/notification_platform_bridge_android.cc

Index: chrome/browser/notifications/notification_platform_bridge_android.cc
diff --git a/chrome/browser/notifications/notification_platform_bridge_android.cc b/chrome/browser/notifications/notification_platform_bridge_android.cc
index 3819e4a5ec51ab894a48e47b67e1f43a120a26e6..5c9bb94aa005ae2432355d4a3f18661483819a00 100644
--- a/chrome/browser/notifications/notification_platform_bridge_android.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_android.cc
@@ -89,17 +89,17 @@ void NotificationPlatformBridgeAndroid::OnNotificationClicked(
     const JavaParamRef<jstring>& java_origin,
     const JavaParamRef<jstring>& java_profile_id,
     jboolean incognito,
-    const JavaParamRef<jstring>& java_web_apk_package,
+    const JavaParamRef<jstring>& java_webapk_package,
     const JavaParamRef<jstring>& java_tag,
     jint action_index) {
   GURL origin(ConvertJavaStringToUTF8(env, java_origin));
   std::string tag = ConvertJavaStringToUTF8(env, java_tag);
   std::string profile_id = ConvertJavaStringToUTF8(env, java_profile_id);
-  std::string web_apk_package =
-      ConvertJavaStringToUTF8(env, java_web_apk_package);
+  std::string webapk_package =
+      ConvertJavaStringToUTF8(env, java_webapk_package);
 
   regenerated_notification_infos_[persistent_notification_id] =
-      RegeneratedNotificationInfo(origin.spec(), tag, web_apk_package);
+      RegeneratedNotificationInfo(origin.spec(), tag, webapk_package);
 
   PlatformNotificationServiceImpl::GetInstance()
       ->ProcessPersistentNotificationOperation(
@@ -151,7 +151,7 @@ void NotificationPlatformBridgeAndroid::Display(
 
   ScopedJavaLocalRef<jstring> origin =
       ConvertUTF8ToJavaString(env, origin_url.spec());
-  ScopedJavaLocalRef<jstring> web_apk_package =
+  ScopedJavaLocalRef<jstring> webapk_package =
       Java_NotificationPlatformBridge_queryWebApkPackage(env, java_object_.obj(),
                                                     origin.obj());
   ScopedJavaLocalRef<jstring> tag =
@@ -188,7 +188,7 @@ void NotificationPlatformBridgeAndroid::Display(
 
   Java_NotificationPlatformBridge_displayNotification(
       env, java_object_.obj(), persistent_notification_id, origin.obj(),
-      j_profile_id.obj(), incognito, tag.obj(), web_apk_package.obj(),
+      j_profile_id.obj(), incognito, tag.obj(), webapk_package.obj(),
       title.obj(), body.obj(), notification_icon.obj(), badge.obj(),
       vibration_pattern.obj(), notification.timestamp().ToJavaTime(),
       notification.renotify(), notification.silent(), action_titles.obj(),
@@ -197,7 +197,7 @@ void NotificationPlatformBridgeAndroid::Display(
   regenerated_notification_infos_[persistent_notification_id] =
       RegeneratedNotificationInfo(
           origin_url.spec(), notification.tag(),
-          ConvertJavaStringToUTF8(env, web_apk_package));
+          ConvertJavaStringToUTF8(env, webapk_package));
 
   notification.delegate()->Display();
 }
@@ -225,8 +225,8 @@ void NotificationPlatformBridgeAndroid::Close(
 
   ScopedJavaLocalRef<jstring> origin =
       ConvertUTF8ToJavaString(env, notification_info.origin);
-  ScopedJavaLocalRef<jstring> web_apk_package =
-      ConvertUTF8ToJavaString(env, notification_info.web_apk_package);
+  ScopedJavaLocalRef<jstring> webapk_package =
+      ConvertUTF8ToJavaString(env, notification_info.webapk_package);
   ScopedJavaLocalRef<jstring> tag =
       ConvertUTF8ToJavaString(env, notification_info.tag);
   ScopedJavaLocalRef<jstring> j_profile_id =
@@ -236,7 +236,7 @@ void NotificationPlatformBridgeAndroid::Close(
 
   Java_NotificationPlatformBridge_closeNotification(
       env, java_object_.obj(), j_profile_id.obj(), persistent_notification_id,
-      origin.obj(), tag.obj(), web_apk_package.obj());
+      origin.obj(), tag.obj(), webapk_package.obj());
 }
 
 bool NotificationPlatformBridgeAndroid::GetDisplayed(
@@ -262,8 +262,8 @@ NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     RegeneratedNotificationInfo(const std::string& origin,
                                 const std::string& tag,
-                                const std::string& web_apk_package)
-    : origin(origin), tag(tag), web_apk_package(web_apk_package) {}
+                                const std::string& webapk_package)
+    : origin(origin), tag(tag), webapk_package(webapk_package) {}
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     ~RegeneratedNotificationInfo() {}