Refactor WebApkServiceConnectionManager.

chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java

Index: chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
index 68b57bc35c019396e9b6dc498e7635f00f9104c9..ec83baccd01b568abb697a1025d1761d7f9497ea 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences;
 import org.chromium.chrome.browser.preferences.website.SingleWebsitePreferences;
 import org.chromium.chrome.browser.preferences.website.SiteSettingsCategory;
+import org.chromium.chrome.browser.webapps.WebApkServiceClient;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.webapk.lib.client.WebApkValidator;
 
@@ -584,7 +585,7 @@ public class NotificationPlatformBridge {
 
         String platformTag = makePlatformTag(notificationId, origin, tag);
         if (forWebApk) {
-            WebApkNotificationClient.notifyNotification(
+            WebApkServiceClient.getInstance().notifyNotification(
                     webApkPackage, notificationBuilder, platformTag, PLATFORM_ID);
         } else {
             // Set up a pending intent for going to the settings screen for |origin|.
@@ -719,7 +720,8 @@ public class NotificationPlatformBridge {
         if (webApkPackage.isEmpty()) {
             mNotificationManager.cancel(platformTag, PLATFORM_ID);
         } else {
-            WebApkNotificationClient.cancelNotification(webApkPackage, platformTag, PLATFORM_ID);
+            WebApkServiceClient.getInstance().cancelNotification(
+                    webApkPackage, platformTag, PLATFORM_ID);
         }
     }