Update AndroidURLRequestContextGetter to take a pointer to the getter function

This allows users of AndroidURLRequestContextGetter to instantiate a
URLRequestContext lazilly.

When used in AutoFill++, this means that when the URLRequestContext is
first initialized, the WebCore thread is set-up and the necessary
settings are available.

Also re-enables AutoFill++

The corresponding external/chromium change is
https://android-git.corp.google.com/g/71275

Bug: 3044989
Change-Id: I4b577f08717775bce5268f3f4b4f5fcf23e54536

diff --git a/Android.mk b/Android.mk
index a7db48d..7ad3614 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -100,7 +100,7 @@ endif
 # The default is on. Chrome HTTP stack must be used when Autofill
 # is turned on.
 ifneq ($(ENABLE_AUTOFILL),false)
-  ENABLE_AUTOFILL = false
+  ENABLE_AUTOFILL = true
 endif
 ifneq ($(HTTP_STACK),chrome)
   ENABLE_AUTOFILL = false

diff --git a/CleanSpec.mk b/CleanSpec.mk
index bdc598d..587af0f 100644 (file)
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -65,6 +65,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_int
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates)
 
 
 # ************************************************

diff --git a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
index f9fc954..aff1e2f 100644 (file)
--- a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
+++ b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
@@ -55,7 +55,7 @@ WebAutoFill::WebAutoFill()
     mFormManager = new FormManager();
     mQueryId = 1;
 
-    AndroidURLRequestContextGetter::Get()->SetURLRequestContext(WebRequestContext::GetAndroidContext());
+    AndroidURLRequestContextGetter::Get()->SetURLRequestContextGetterFunction(&WebRequestContext::GetAndroidContext);
     AndroidURLRequestContextGetter::Get()->SetIOThread(WebUrlLoaderClient::ioThread());
     TabContents* tabContents = new TabContents();
     mAutoFillManager = new AutoFillManager(tabContents);