Moved WebDataService to ProfileKeyedService

chrome/browser/webdata/web_data_service.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 "chrome/browser/webdata/web_data_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
+#ifdef DEBUG
+#include "content/public/browser/browser_thread.h"
+#endif
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/forms/form_field.h"
 #include "webkit/forms/password_form.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 32 matching lines @@
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
     builtin_keyword_version(0),
     backup_valid(false),
     did_default_search_provider_change(false) {
 }
 
 WDKeywordsResult::~WDKeywordsResult() {}
 
 WebDataService::WebDataService()
-  : is_running_(false),
-    db_(NULL),
-    autocomplete_syncable_service_(NULL),
-    autofill_profile_syncable_service_(NULL),
-    failed_init_(false),
-    should_commit_(false),
-    next_request_handle_(1),
-    main_loop_(MessageLoop::current()) {
+    : RefcountedProfileKeyedService(BrowserThread::UI),
+      is_running_(false),
+      db_(NULL),
+      autocomplete_syncable_service_(NULL),
+      autofill_profile_syncable_service_(NULL),
+      failed_init_(false),
+      should_commit_(false),
+      next_request_handle_(1),
+      main_loop_(MessageLoop::current()) {
+  DCHECK(BrowserThread::IsWellKnownThread(BrowserThread::DB));
 }
 
 // static
 void WebDataService::NotifyOfMultipleAutofillChanges(
     WebDataService* web_data_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   if (!web_data_service)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       Bind(&NotifyOfMultipleAutofillChangesTask,
            make_scoped_refptr(web_data_service)));
 }
 
+void WebDataService::ShutdownOnUIThread() {
+  ScheduleTask(FROM_HERE,
+               Bind(&WebDataService::ShutdownSyncableServices, this));
+  UnloadDatabase();
+}
+
 bool WebDataService::Init(const FilePath& profile_path) {
   FilePath path = profile_path;
   path = path.Append(chrome::kWebDataFilename);
   return InitWithPath(path);
 }
 
-void WebDataService::Shutdown() {
-  ScheduleTask(FROM_HERE,
-               Bind(&WebDataService::ShutdownSyncableServices, this));
-  UnloadDatabase();
-}
-
 bool WebDataService::IsRunning() const {
   return is_running_;
 }
 
 void WebDataService::UnloadDatabase() {
   ScheduleTask(FROM_HERE, Bind(&WebDataService::ShutdownDatabase, this));
 }
 
 void WebDataService::CancelRequest(Handle h) {
   base::AutoLock l(pending_lock_);
@@ skipping 515 matching lines @@
 }
 
 bool WebDataService::InitWithPath(const FilePath& path) {
   path_ = path;
   is_running_ = true;
 
   // TODO(isherman): For now, to avoid a data race on shutdown
   // [ http://crbug.com/100745 ], call |AutofillCountry::ApplicationLocale()| to
   // cache the application locale before we try to access it on the DB thread.
   // This should be safe to remove once [ http://crbug.com/100845 ] is fixed.
-  AutofillCountry::ApplicationLocale();
+  // Do not do it if the thread is not UI (can happen only in some tests).
+  if (BrowserThread::CurrentlyOn(BrowserThread::UI))
+    AutofillCountry::ApplicationLocale();
 
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::InitializeDatabaseIfNecessary, this));
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::InitializeSyncableServices, this));
   return true;
 }
 
 void WebDataService::RequestCompleted(Handle h) {
   pending_lock_.Acquire();
@@ skipping 987 matching lines @@
 }
 
 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const {
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
                                           service_.get(), handle_));
 }