| Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| index 932b3c614e8c827535a8772d44a1d43c45c62a70..0ca81ae995c80078afd8fefcedfbd16c6c4b6513 100644
|
| --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
| @@ -39,6 +39,7 @@ import org.chromium.android_webview.AwResource;
|
| import org.chromium.android_webview.AwSettings;
|
| import org.chromium.android_webview.R;
|
| import org.chromium.base.CommandLine;
|
| +import org.chromium.base.ContextUtils;
|
| import org.chromium.base.MemoryPressureListener;
|
| import org.chromium.base.PathService;
|
| import org.chromium.base.PathUtils;
|
| @@ -48,7 +49,6 @@ import org.chromium.base.annotations.SuppressFBWarnings;
|
| import org.chromium.base.library_loader.LibraryLoader;
|
| import org.chromium.base.library_loader.LibraryProcessType;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| -import org.chromium.content.app.ContentMain;
|
| import org.chromium.content.browser.ContentViewStatics;
|
| import org.chromium.ui.base.ResourceBundle;
|
|
|
| @@ -423,7 +423,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
|
| // will bring up just the parts it needs to make this work on a temporary
|
| // basis until Chromium is started for real. The temporary cookie manager
|
| // needs the application context to have been set.
|
| - ContentMain.initApplicationContext(getWrappedCurrentApplicationContext());
|
| + ContextUtils.initApplicationContext(getWrappedCurrentApplicationContext());
|
| }
|
| mCookieManager = new CookieManagerAdapter(new AwCookieManager());
|
| }
|
|
|