Make WebAPK naming consistent 1/2

chrome/browser/notifications/notification_platform_bridge_android.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/notifications/notification_platform_bridge_android.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/android/context_utils.h"
@@ skipping 71 matching lines @@
                                           java_object_.obj());
 }
 
 void NotificationPlatformBridgeAndroid::OnNotificationClicked(
     JNIEnv* env,
     const JavaParamRef<jobject>& java_object,
     jlong persistent_notification_id,
     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(
           PlatformNotificationServiceImpl::NOTIFICATION_CLICK, profile_id,
           incognito, origin, persistent_notification_id, action_index);
 }
 
 void NotificationPlatformBridgeAndroid::OnNotificationClosed(
     JNIEnv* env,
     const JavaParamRef<jobject>& java_object,
@@ skipping 31 matching lines @@
   // property on that object instead, making this cast unnecessary.
   PersistentNotificationDelegate* delegate =
       static_cast<PersistentNotificationDelegate*>(notification.delegate());
   DCHECK(delegate);
 
   int64_t persistent_notification_id = delegate->persistent_notification_id();
   GURL origin_url(notification.origin_url().GetOrigin());
 
   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 =
       ConvertUTF8ToJavaString(env, notification.tag());
   ScopedJavaLocalRef<jstring> title =
       ConvertUTF16ToJavaString(env, notification.title());
   ScopedJavaLocalRef<jstring> body =
       ConvertUTF16ToJavaString(env, notification.message());
 
   ScopedJavaLocalRef<jobject> notification_icon;
@@ skipping 16 matching lines @@
       ConvertToJavaBitmaps(notification.buttons());
 
   ScopedJavaLocalRef<jintArray> vibration_pattern =
       base::android::ToJavaIntArray(env, notification.vibration_pattern());
 
   ScopedJavaLocalRef<jstring> j_profile_id =
       ConvertUTF8ToJavaString(env, profile_id);
 
   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(),
       action_icons.obj());
 
   regenerated_notification_infos_[persistent_notification_id] =
       RegeneratedNotificationInfo(
           origin_url.spec(), notification.tag(),
-          ConvertJavaStringToUTF8(env, web_apk_package));
+          ConvertJavaStringToUTF8(env, webapk_package));
 
   notification.delegate()->Display();
 }
 
 void NotificationPlatformBridgeAndroid::Close(
     const std::string& profile_id,
     const std::string& notification_id) {
   int64_t persistent_notification_id = 0;
 
   // TODO(peter): Use the |delegate_id| directly when notification ids are being
   // generated by content/ instead of us.
   if (!base::StringToInt64(notification_id, &persistent_notification_id)) {
     LOG(WARNING) << "Unable to decode notification_id " << notification_id;
     return;
   }
 
   const auto iterator =
       regenerated_notification_infos_.find(persistent_notification_id);
   if (iterator == regenerated_notification_infos_.end())
     return;
 
   const RegeneratedNotificationInfo& notification_info = iterator->second;
 
   JNIEnv* env = AttachCurrentThread();
 
   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 =
       ConvertUTF8ToJavaString(env, profile_id);
 
   regenerated_notification_infos_.erase(iterator);
 
   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(
     const std::string& profile_id,
     bool incognito,
     std::set<std::string>* notifications) const {
   // TODO(miguelg): This can actually be implemented for M+
   return false;
 }
 
 bool NotificationPlatformBridgeAndroid::SupportsNotificationCenter() const {
   return true;
 }
 
 bool NotificationPlatformBridgeAndroid::RegisterNotificationPlatformBridge(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     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() {}