Fix threading issues in aw form database

android_webview/browser/aw_browser_context.cc

 // Copyright (c) 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/browser/aw_browser_context.h"
 
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_pref_store.h"
 #include "android_webview/browser/aw_quota_manager_bridge.h"
 #include "android_webview/browser/jni_dependency_factory.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 #include "android_webview/browser/net/init_native_callback.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_builder.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/user_prefs/user_prefs.h"
 #include "components/visitedlink/browser/visitedlink_master.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "net/url_request/url_request_context.h"
 
+using content::BrowserThread;
+
 namespace android_webview {
 
 namespace {
 
 // Shows notifications which correspond to PersistentPrefStore's reading errors.
 void HandleReadError(PersistentPrefStore::PrefReadError error) {
 }
 
 class AwResourceContext : public content::ResourceContext {
  public:
   explicit AwResourceContext(net::URLRequestContextGetter* getter)
       : getter_(getter) {
     DCHECK(getter_);
   }
   virtual ~AwResourceContext() {}
 
   // content::ResourceContext implementation.
   virtual net::HostResolver* GetHostResolver() OVERRIDE {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     return getter_->GetURLRequestContext()->host_resolver();
   }
   virtual net::URLRequestContext* GetRequestContext() OVERRIDE {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     return getter_->GetURLRequestContext();
   }
   virtual bool AllowMicAccess(const GURL& origin) OVERRIDE {
     return false;
   }
   virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE {
     return false;
   }
 
  private:
   net::URLRequestContextGetter* getter_;
 
   DISALLOW_COPY_AND_ASSIGN(AwResourceContext);
 };
 
 AwBrowserContext* g_browser_context = NULL;
 
 }  // namespace
 
 AwBrowserContext::AwBrowserContext(
     const base::FilePath path,
     JniDependencyFactory* native_factory)
     : context_storage_path_(path),
       native_factory_(native_factory),
-      user_pref_service_ready_(false) {
+      user_pref_service_ready_(false),
+      form_database_service_creation_(false, false) {
   DCHECK(g_browser_context == NULL);
   g_browser_context = this;
 }
 
 AwBrowserContext::~AwBrowserContext() {
   DCHECK(g_browser_context == this);
   g_browser_context = NULL;
 }
 
 // static
@@ skipping 54 matching lines @@
 }
 
 AwQuotaManagerBridge* AwBrowserContext::GetQuotaManagerBridge() {
   if (!quota_manager_bridge_) {
     quota_manager_bridge_.reset(
         native_factory_->CreateAwQuotaManagerBridge(this));
   }
   return quota_manager_bridge_.get();
 }
 
+void AwBrowserContext::CreateFormDatabaseServiceOnUiThread() {
+  form_database_service_.reset(
+      new AwFormDatabaseService(context_storage_path_));

[joth, 2013/09/05 00:59:10]

just call this "new AwFormDatabaseService" from AwBrowserContext c'tor

[sgurun-gerrit only, 2013/09/05 02:58:45]

Done.

+  form_database_service_creation_.Signal();
+}
+
+// Protect it since there are two initialization paths, one through
+// WebViewDatabase and the the other through AwContents.
 AwFormDatabaseService* AwBrowserContext::GetFormDatabaseService() {
+  base::AutoLock lock(form_database_lock_);
+
   if (!form_database_service_) {
-    form_database_service_.reset(
-        new AwFormDatabaseService(context_storage_path_));
+    // AwFormDatabaseService has to be created on UI thread.
+    if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
+      CreateFormDatabaseServiceOnUiThread();
+    } else {
+      BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+         base::Bind(&AwBrowserContext::CreateFormDatabaseServiceOnUiThread,
+                    base::Unretained(this)));
+      form_database_service_creation_.Wait();
+    }
   }
   return form_database_service_.get();
 }
 
 // Create user pref service for autofill functionality.
 void AwBrowserContext::CreateUserPrefServiceIfNecessary() {
   if (user_pref_service_ready_)
     return;
 
   user_pref_service_ready_ = true;
@@ skipping 92 matching lines @@
 
 void AwBrowserContext::RebuildTable(
     const scoped_refptr<URLEnumerator>& enumerator) {
   // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client
   // can change in the lifetime of this WebView and may not yet be set here.
   // Therefore this initialization path is not used.
   enumerator->OnComplete(true);
 }
 
 }  // namespace android_webview