Move minor WebViewChromium implementation to chromium layer

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package com.android.webview.chromium;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ skipping 13 matching lines @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeProvider;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.webkit.DownloadListener;
 import android.webkit.FindActionModeCallback;
-import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
 import android.webkit.WebBackForwardList;
 import android.webkit.WebChromeClient;
 import android.webkit.WebChromeClient.CustomViewCallback;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.webkit.WebViewProvider;
 import android.widget.TextView;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsStatics;
 import org.chromium.android_webview.AwPrintDocumentAdapter;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.browser.SmartClipProvider;
 
 import java.io.BufferedWriter;
 import java.io.File;
-import java.lang.annotation.Annotation;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 
 /**
  * This class is the delegate to which WebViewProxy forwards all API calls.
  *
@@ skipping 807 matching lines @@
         mFactory.startYourEngines(true);
         if (checkNeedsPost()) {
             String ret = runOnUiThreadBlocking(new Callable<String>() {
                 @Override
                 public String call() {
                     return getUrl();
                 }
             });
             return ret;
         }
-        String url = mAwContents.getUrl();
-        if (url == null || url.trim().isEmpty()) return null;
-        return url;
+        return mAwContents.getUrl();
     }
 
     @Override
     public String getOriginalUrl() {
         mFactory.startYourEngines(true);
         if (checkNeedsPost()) {
             String ret = runOnUiThreadBlocking(new Callable<String>() {
                 @Override
                 public String call() {
                     return getOriginalUrl();
                 }
             });
             return ret;
         }
-        String url = mAwContents.getOriginalUrl();
-        if (url == null || url.trim().isEmpty()) return null;
-        return url;
+        return mAwContents.getOriginalUrl();
     }
 
     @Override
     public String getTitle() {
         mFactory.startYourEngines(true);
         if (checkNeedsPost()) {
             String ret = runOnUiThreadBlocking(new Callable<String>() {
                 @Override
                 public String call() {
                     return getTitle();
@@ skipping 380 matching lines @@
     public void addJavascriptInterface(final Object obj, final String interfaceName) {
         if (checkNeedsPost()) {
             mRunQueue.addTask(new Runnable() {
                 @Override
                 public void run() {
                     addJavascriptInterface(obj, interfaceName);
                 }
             });
             return;
         }
-        Class<? extends Annotation> requiredAnnotation = null;
-        if (mAppTargetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            requiredAnnotation = JavascriptInterface.class;
-        }
-        mAwContents.addPossiblyUnsafeJavascriptInterface(obj, interfaceName, requiredAnnotation);
+        mAwContents.addJavascriptInterface(obj, interfaceName);
     }
 
     @Override
     public void removeJavascriptInterface(final String interfaceName) {
         if (checkNeedsPost()) {
             mRunQueue.addTask(new Runnable() {
                 @Override
                 public void run() {
                     removeJavascriptInterface(interfaceName);
                 }
@@ skipping 844 matching lines @@
         mAwContents.extractSmartClipData(x, y, width, height);
     }
 
     // Implements SmartClipProvider
     @Override
     public void setSmartClipResultHandler(final Handler resultHandler) {
         checkThread();
         mAwContents.setSmartClipResultHandler(resultHandler);
     }
 }