Enable Autocomplete feature for chromium webview

android_webview/native/aw_contents.cc

 // Copyright 2012 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.
 
 #include "android_webview/native/aw_contents.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/gpu_memory_buffer_impl.h"
 #include "android_webview/browser/in_process_view_renderer.h"
@@ skipping 121 matching lines @@
                                     web_contents_.get())) {
   base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
   icon_helper_.reset(new IconHelper(web_contents_.get()));
   icon_helper_->SetListener(this);
   web_contents_->SetUserData(kAwContentsUserDataKey,
                              new AwContentsUserData(this));
   render_view_host_ext_.reset(
       new AwRenderViewHostExt(this, web_contents_.get()));
 
   AwAutofillManagerDelegate* autofill_manager_delegate =
-      AwBrowserContext::FromWebContents(web_contents_.get())->
-          AutofillManagerDelegate();
+      AwAutofillManagerDelegate::FromWebContents(web_contents_.get());
   if (autofill_manager_delegate)
     InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData());
 }
 
 void AwContents::SetJavaPeers(JNIEnv* env,
                               jobject obj,
                               jobject aw_contents,
                               jobject web_contents_delegate,
                               jobject contents_client_bridge,
                               jobject io_thread_client,
@@ skipping 23 matching lines @@
       web_contents_.get(),
       make_scoped_ptr(new InterceptNavigationDelegate(
           env, intercept_navigation_delegate)));
 }
 
 void AwContents::SetSaveFormData(bool enabled) {
   InitAutofillIfNecessary(enabled);
   // We need to check for the existence, since autofill_manager_delegate
   // may not be created when the setting is false.
   if (AutofillDriverImpl::FromWebContents(web_contents_.get())) {
-    AwAutofillManagerDelegate* autofill_manager_delegate =
-        AwBrowserContext::FromWebContents(web_contents_.get())->
-            AutofillManagerDelegate();
-    autofill_manager_delegate->SetSaveFormData(enabled);
+    AwAutofillManagerDelegate::FromWebContents(web_contents_.get())->
+        SetSaveFormData(enabled);
   }
 }
 
 void AwContents::InitAutofillIfNecessary(bool enabled) {
   // Do not initialize if the feature is not enabled.
   if (!enabled)
     return;
   // Check if the autofill manager already exists.
   content::WebContents* web_contents = web_contents_.get();
   if (AutofillDriverImpl::FromWebContents(web_contents))
     return;
 
+  AwBrowserContext::FromWebContents(web_contents)->
+      CreateUserPrefServiceIfNecessary();
+  AwAutofillManagerDelegate::CreateForWebContents(web_contents);
   AutofillDriverImpl::CreateForWebContentsAndDelegate(
       web_contents,
-      AwBrowserContext::FromWebContents(web_contents)->
-          CreateAutofillManagerDelegate(enabled),
+      AwAutofillManagerDelegate::FromWebContents(web_contents),
       l10n_util::GetDefaultLocale(),
       AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER);
 }
 
 AwContents::~AwContents() {
   DCHECK(AwContents::FromWebContents(web_contents_.get()) == this);
   web_contents_->RemoveUserData(kAwContentsUserDataKey);
   if (find_helper_.get())
     find_helper_->SetListener(NULL);
   if (icon_helper_.get())
@@ skipping 497 matching lines @@
   return browser_view_renderer_->CapturePicture();
 }
 
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
                                     jboolean enabled) {
   browser_view_renderer_->EnableOnNewPicture(enabled);
 }
 
 }  // namespace android_webview