Commit e361b676 authored by Anna Malova's avatar Anna Malova Committed by Commit Bot

Clean up PacProcessorImpl.

Following the comments from crrev.com/c/2310800.

Bug: 1085115
Change-Id: I2985b8a8f912009524edbcbb4286687ec6a5c0aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339668Reviewed-by: default avatarRichard Coles <torne@chromium.org>
Commit-Queue: Anna Malova <amalova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795548}
parent e502c542
...@@ -9,39 +9,29 @@ import android.webkit.PacProcessor; ...@@ -9,39 +9,29 @@ import android.webkit.PacProcessor;
import org.chromium.android_webview.AwPacProcessor; import org.chromium.android_webview.AwPacProcessor;
import org.chromium.base.JNIUtils; import org.chromium.base.JNIUtils;
import org.chromium.base.library_loader.LibraryLoader; import org.chromium.base.library_loader.LibraryLoader;
import org.chromium.base.library_loader.ProcessInitException;
final class PacProcessorImpl implements PacProcessor { final class PacProcessorImpl implements PacProcessor {
AwPacProcessor mProcessor;
private PacProcessorImpl() { private PacProcessorImpl() {
JNIUtils.setClassLoader(WebViewChromiumFactoryProvider.class.getClassLoader()); JNIUtils.setClassLoader(WebViewChromiumFactoryProvider.class.getClassLoader());
try { LibraryLoader.getInstance().ensureInitialized();
LibraryLoader.getInstance().ensureInitialized();
} catch (ProcessInitException e) {
throw new RuntimeException("Error initializing WebView library", e);
}
// This will set up Chromium environment to run proxy resolver. // This will set up Chromium environment to run proxy resolver.
AwPacProcessor.initializeEnvironment(); AwPacProcessor.initializeEnvironment();
mProcessor = AwPacProcessor.getInstance();
} }
private static class LazyHolder { private static final PacProcessorImpl sInstance = new PacProcessorImpl();
static final PacProcessorImpl sInstance = new PacProcessorImpl();
}
public static PacProcessorImpl getInstance() { public static PacProcessorImpl getInstance() {
return LazyHolder.sInstance; return sInstance;
} }
@Override @Override
public boolean setProxyScript(String script) { public boolean setProxyScript(String script) {
return mProcessor.setProxyScript(script); return AwPacProcessor.getInstance().setProxyScript(script);
} }
@Override @Override
public String findProxyForUrl(String url) { public String findProxyForUrl(String url) {
return mProcessor.makeProxyRequest(url); return AwPacProcessor.getInstance().makeProxyRequest(url);
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment