Add serialization capabilities to PwsResult

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java
index c5632d1fe2ef3bca71b68ced277f2f9bd7030ac4..2bd35ad4d8e3bba2dd24ddf461955c3a54641e7d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java
@@ -96,16 +96,7 @@ class PwsClientImpl implements PwsClient {
         // Loop through the metadata for each url.
         for (int i = 0; i < metadata.length(); i++) {
             try {
-                JSONObject obj = metadata.getJSONObject(i);
-                JSONObject pageInfo = obj.getJSONObject("pageInfo");
-                String scannedUrl = obj.getString("scannedUrl");
-                String resolvedUrl = obj.getString("resolvedUrl");
-                String iconUrl = pageInfo.optString("icon", null);
-                String title = pageInfo.optString("title", "");
-                String description = pageInfo.optString("description", null);
-                String groupId = pageInfo.optString("groupId", null);
-                pwsResults.add(new PwsResult(
-                        scannedUrl, resolvedUrl, iconUrl, title, description, groupId));
+                pwsResults.add(PwsResult.jsonDeserialize(metadata.getJSONObject(i)));
             } catch (JSONException e) {
                 Log.e(TAG, "PWS returned invalid data", e);
                 continue;