Catch Exception for Intent.parseUri instead of URISyntaxException

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java

Index: chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
index dc8a1fc8f172324fa59a983dc4ea307682e734c9..2ef867b3d7efe92fff52724ab59f63a42e6d1c77 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
@@ -10,10 +10,10 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.Browser;
-import android.util.Log;
 import android.webkit.WebView;
 
 import org.chromium.base.CommandLine;
+import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.UrlConstants;
@@ -22,7 +22,6 @@ import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.ui.base.PageTransition;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.List;
 
 /**
@@ -79,8 +78,8 @@ public class ExternalNavigationHandler {
         // Perform generic parsing of the URI to turn it into an Intent.
         try {
             intent = Intent.parseUri(params.getUrl(), Intent.URI_INTENT_SCHEME);
-        } catch (URISyntaxException ex) {
-            Log.w(TAG, "Bad URI " + params.getUrl() + ": " + ex.getMessage());
+        } catch (Exception ex) {
+            Log.w(TAG, "Bad URI " + params.getUrl(), ex);
             return OverrideUrlLoadingResult.NO_OVERRIDE;
         }
 
@@ -283,7 +282,7 @@ public class ExternalNavigationHandler {
                 try {
                     currentUri = new URI(params.getUrl());
                     previousUri = new URI(params.getReferrerUrl());
-                } catch (URISyntaxException e) {
+                } catch (Exception e) {
                     currentUri = null;
                     previousUri = null;
                 }
@@ -295,7 +294,7 @@ public class ExternalNavigationHandler {
                     try {
                         previousIntent = Intent.parseUri(
                                 params.getReferrerUrl(), Intent.URI_INTENT_SCHEME);
-                    } catch (URISyntaxException e) {
+                    } catch (Exception e) {
                         previousIntent = null;
                     }
 
@@ -386,8 +385,9 @@ public class ExternalNavigationHandler {
         try {
             Intent intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
             return intent.getPackage() != null || mDelegate.canResolveActivity(intent);
-        } catch (URISyntaxException ex) {
+        } catch (Exception ex) {
             // Ignore the error.
+            Log.w(TAG, "Bad URI " + url, ex);
         }
         return false;
     }