[remoting android] Fix WebView deprecation warnings

remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java

Index: remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java
diff --git a/remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java b/remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java
index 45d4a87a2f9f59db6f138ceb2fb00bed888f4c8b..79bc70062577817ebded0bd164a3827c42c189f5 100644
--- a/remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java
+++ b/remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java
@@ -4,12 +4,14 @@
 
 package org.chromium.chromoting.help;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -17,6 +19,7 @@ import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
@@ -86,10 +89,8 @@ public class HelpActivity extends AppCompatActivity {
 
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            private boolean shouldOverrideUrlLoading(final Uri uri) {
                 // Make sure any links to other websites open up in an external browser.
-                Uri uri = Uri.parse(url);
                 String host = uri.getHost();
 
                 // Note that |host| might be null, so allow for this in the test for equality.
@@ -99,6 +100,18 @@ public class HelpActivity extends AppCompatActivity {
                 ChromotingUtil.openUrl(HelpActivity.this, uri);
                 return true;
             }
+
+            @TargetApi(Build.VERSION_CODES.N)
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return shouldOverrideUrlLoading(request.getUrl());
+            }
+
+            @SuppressWarnings("deprecation")
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                return shouldOverrideUrlLoading(Uri.parse(url));
+            }
         });
         mWebView.loadUrl(initialUrl);
     }