Add utility function for checking package version

The change also refactors some pieces of code to use new utility
function

BUG=469115

Review URL: https://codereview.chromium.org/1040433002

Cr-Commit-Position: refs/heads/master@{#322760}

1 files changed, 2 insertions, 9 deletions

diff --git a/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java b/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java
index 89b3e25..974191e 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java
@@ -8,7 +8,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
@@ -19,6 +18,7 @@ import android.speech.SpeechRecognizer;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
+import org.chromium.base.PackageUtils;
 import org.chromium.content_public.common.SpeechRecognitionErrorCode;
 
 import java.util.ArrayList;
@@ -185,14 +185,7 @@ public class SpeechRecognition {
 
             if (!service.packageName.equals(PROVIDER_PACKAGE_NAME)) continue;
 
-            int versionCode;
-            try {
-                versionCode = pm.getPackageInfo(service.packageName, 0).versionCode;
-            } catch (NameNotFoundException e) {
-                continue;
-            }
-
-            if (versionCode < PROVIDER_MIN_VERSION)
+            if (PackageUtils.getPackageVersion(context, service.packageName) < PROVIDER_MIN_VERSION)
                 continue;
 
             sRecognitionProvider = new ComponentName(service.packageName, service.name);