Catch Exception for Intent.parseUri instead of URISyntaxException

Intent.parseUri can throw other excpetions like NumberFormatException.
So we need to catch Exception to avoid crash.

BUG=484336

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

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

android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java

@@ -9,21 +9,19 @@ import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.provider.Browser;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.URLUtil;
 import android.webkit.WebChromeClient;
 import android.widget.FrameLayout;
 
+import org.chromium.base.Log;
 import org.chromium.content.browser.ContentVideoViewClient;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.SelectActionMode;
 import org.chromium.content.browser.SelectActionModeCallback.ActionHandler;
 
-import java.net.URISyntaxException;
-
 /**
  * ContentViewClient implementation for WebView
  */
@@ -62,8 +60,8 @@ public class AwContentViewClient extends ContentViewClient implements ContentVid
         // Perform generic parsing of the URI to turn it into an Intent.
         try {
             intent = Intent.parseUri(contentUrl, Intent.URI_INTENT_SCHEME);
-        } catch (URISyntaxException ex) {
-            Log.w(TAG, "Bad URI " + contentUrl + ": " + ex.getMessage());
+        } catch (Exception ex) {
+            Log.w(TAG, "Bad URI " + contentUrl, ex);
             return;
         }
         // Sanitize the Intent, ensuring web pages can not bypass browser

chrome/android/java/src/org/chromium/chrome/browser/ConnectionInfoPopup.java

@@ -23,16 +23,17 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 
 import org.chromium.base.CalledByNative;
+import org.chromium.base.Log;
 import org.chromium.chrome.R;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
 
-import java.net.URISyntaxException;
-
 /**
  * Java side of Android implementation of the website settings UI.
  */
 public class ConnectionInfoPopup implements OnClickListener {
+    private static final String TAG = "ConnectionInfoPopup";
+
     private static final String HELP_URL =
             "http://www.google.com/support/chrome/bin/answer.py?answer=95617";
     private static final int DESCRIPTION_TEXT_SIZE_SP = 12;
@@ -212,8 +213,9 @@ public class ConnectionInfoPopup implements OnClickListener {
                 i.putExtra(Browser.EXTRA_CREATE_NEW_TAB, true);
                 i.putExtra(Browser.EXTRA_APPLICATION_ID, mContext.getPackageName());
                 mContext.startActivity(i);
-            } catch (URISyntaxException ex) {
+            } catch (Exception ex) {
                 // Do nothing intentionally.
+                Log.w(TAG, "Bad URI " + mLinkUrl, ex);
             }
         }
     }

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;
     }

content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java

@@ -7,15 +7,13 @@ package org.chromium.content.browser;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 import android.view.ActionMode;
 import android.view.KeyEvent;
 import android.view.View;
 
+import org.chromium.base.Log;
 import org.chromium.content.browser.SelectActionModeCallback.ActionHandler;
 
-import java.net.URISyntaxException;
-
 /**
  *  Main callback class used by ContentView.
  *
@@ -145,8 +143,8 @@ public class ContentViewClient {
         // Perform generic parsing of the URI to turn it into an Intent.
         try {
             intent = Intent.parseUri(intentUrl, Intent.URI_INTENT_SCHEME);
-        } catch (URISyntaxException ex) {
-            Log.w(TAG, "Bad URI " + intentUrl + ": " + ex.getMessage());
+        } catch (Exception ex) {
+            Log.w(TAG, "Bad URI " + intentUrl, ex);
             return;
         }