From 1ea39b350c2a1c2595ab3b7c4ba3ab8a3b029315 Mon Sep 17 00:00:00 2001
From: Ignacio Solla <igsolla@google.com>
Date: Mon, 10 Nov 2014 14:08:37 +0000
Subject: [PATCH] [WebView] Remove fallback call to WebViewFactoryProvider
 no-arg constructor.

This change depends on 584201, in which the NullWebViewFactoryProvider constructor
is replaced with a version taking a WebViewDelegate as an arg.

BUG:18152150
Change-Id: I6c1e3f31a9de46dc12058328abead9c0ba2d376e
---
 core/java/android/webkit/WebViewFactory.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index ca9f378458ea2..f185a86670edd 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -109,12 +109,8 @@ public final class WebViewFactory {
                 StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
                 Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "providerClass.newInstance()");
                 try {
-                    try {
-                        sProviderInstance = providerClass.getConstructor(WebViewDelegate.class)
-                                .newInstance(new WebViewDelegate());
-                    } catch (Exception e) {
-                        sProviderInstance = providerClass.newInstance();
-                    }
+                    sProviderInstance = providerClass.getConstructor(WebViewDelegate.class)
+                            .newInstance(new WebViewDelegate());
                     if (DEBUG) Log.v(LOGTAG, "Loaded provider: " + sProviderInstance);
                     return sProviderInstance;
                 } catch (Exception e) {