💸 Fix minor errors in Digital Goods.

Change-Id: I66384669d3ef45802ca3ae9468f805ba6fed874f
Bug: 1096428
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2320614
Auto-Submit: Peter Conn <peconn@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Reviewed-by: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792246}

chrome/android/java/src/org/chromium/chrome/browser/browserservices/digitalgoods/DigitalGoodsAdapter.java

@@ -47,7 +47,8 @@ public class DigitalGoodsAdapter {
                         convertGetDetailsParams(itemIds),
                         convertGetDetailsCallback(callback));
 
-                boolean success = result.getBoolean(KEY_SUCCESS, false);
+                boolean success = result != null &&
+                        result.getBoolean(KEY_SUCCESS, false);
                 if (!success) {
                     returnClientAppError(callback);
                 }
@@ -66,11 +67,12 @@ public class DigitalGoodsAdapter {
             @Override
             public void onConnected(Origin origin, TrustedWebActivityServiceConnection service)
                     throws RemoteException {
-                Bundle result = service.sendExtraCommand(COMMAND_GET_DETAILS,
+                Bundle result = service.sendExtraCommand(COMMAND_ACKNOWLEDGE,
                         convertAcknowledgeParams(purchaseToken, makeAvailableAgain),
                         convertAcknowledgeCallback(callback));
 
-                boolean success = result.getBoolean(KEY_SUCCESS, false);
+                boolean success = result != null &&
+                        result.getBoolean(KEY_SUCCESS, false);
                 if (!success) {
                     returnClientAppError(callback);
                 }

chrome/android/java/src/org/chromium/chrome/browser/browserservices/digitalgoods/DigitalGoodsConverter.java

@@ -191,21 +191,21 @@ public class DigitalGoodsConverter {
     }
 
     public static void returnClientAppUnavailable(GetDetailsResponse callback) {
-        callback.call(BillingResponseCode.CLIENT_APP_ERROR,
+        callback.call(BillingResponseCode.CLIENT_APP_UNAVAILABLE,
                 new ItemDetails[0]);
     }
 
     public static void returnClientAppError(GetDetailsResponse callback) {
-        callback.call(BillingResponseCode.CLIENT_APP_UNAVAILABLE,
+        callback.call(BillingResponseCode.CLIENT_APP_ERROR,
                 new ItemDetails[0]);
     }
 
     public static void returnClientAppUnavailable(AcknowledgeResponse callback) {
-        callback.call(BillingResponseCode.CLIENT_APP_ERROR);
+        callback.call(BillingResponseCode.CLIENT_APP_UNAVAILABLE);
     }
 
     public static void returnClientAppError(AcknowledgeResponse callback) {
-        callback.call(BillingResponseCode.CLIENT_APP_UNAVAILABLE);
+        callback.call(BillingResponseCode.CLIENT_APP_ERROR);
     }
 
     /**