Check package manager to verify VrCore is not installed

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java
index dfb25f3132acb12610dd6da5e27f9f8e2966ad1d..6ab016963dfba4d83af9877639c5858200ea9aef 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java
@@ -12,6 +12,7 @@ import com.google.vr.vrcore.base.api.VrCoreUtils;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
+import org.chromium.base.PackageUtils;
 
 import org.chromium.chrome.browser.ChromeFeatureList;
 
@@ -45,6 +46,15 @@ public class VrCoreVersionCheckerImpl implements VrCoreVersionChecker {
             return VrCoreVersionChecker.VR_READY;
         } catch (VrCoreNotAvailableException e) {
             Log.i(TAG, "Unable to find VrCore.");
+            // Old versions of VrCore are not integrated with the sdk library version check and will
+            // trigger this exception even though VrCore is installed.
+            // Double check package manager to make sure we are not telling user to install
+            // when it should just be an update.
+            if (PackageUtils.getPackageVersion(
+                        ContextUtils.getApplicationContext(), VR_CORE_PACKAGE_ID)
+                    != -1) {
+                return VrCoreVersionChecker.VR_OUT_OF_DATE;
+            }
             return VrCoreVersionChecker.VR_NOT_AVAILABLE;
         }
     }