Introduce a couple of abstract bases for WebDataService.

chrome/browser/autofill/autocomplete_history_manager.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/autofill/autocomplete_history_manager.h"
 
 #include <vector>
 
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/prefs/pref_service_base.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "webkit/forms/form_data.h"
 
 using base::StringPiece16;
 using content::WebContents;
 using webkit::forms::FormData;
 using webkit::forms::FormField;
@@ skipping 82 matching lines @@
 }  // namespace
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       pending_query_handle_(0),
       query_id_(0),
       external_delegate_(NULL) {
   profile_ = Profile::FromBrowserContext(web_contents->GetBrowserContext());
   // May be NULL in unit tests.
-  web_data_service_ = WebDataServiceFactory::GetForProfile(
-      profile_, Profile::EXPLICIT_ACCESS);
+  autofill_data_ = AutofillWebDataService::ForContext(profile_);
   autofill_enabled_.Init(
       prefs::kAutofillEnabled, PrefServiceBase::ForProfile(profile_), NULL);
 }
 
 AutocompleteHistoryManager::~AutocompleteHistoryManager() {
   CancelPendingQuery();
 }
 
 bool AutocompleteHistoryManager::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AutocompleteHistoryManager, message)
     IPC_MESSAGE_HANDLER(AutofillHostMsg_RemoveAutocompleteEntry,
                         OnRemoveAutocompleteEntry)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void AutocompleteHistoryManager::OnWebDataServiceRequestDone(
-    WebDataService::Handle h,
+    WebDataServiceBase::Handle h,
     const WDTypedResult* result) {
   DCHECK(pending_query_handle_);
   pending_query_handle_ = 0;
 
   if (!*autofill_enabled_) {
     SendSuggestions(NULL);
     return;
   }
 
   DCHECK(result);
@@ skipping 25 matching lines @@
   query_id_ = query_id;
   autofill_values_ = autofill_values;
   autofill_labels_ = autofill_labels;
   autofill_icons_ = autofill_icons;
   autofill_unique_ids_ = autofill_unique_ids;
   if (!*autofill_enabled_) {
     SendSuggestions(NULL);
     return;
   }
 
-  if (web_data_service_.get()) {
-    pending_query_handle_ = web_data_service_->GetFormValuesForElementName(
+  if (autofill_data_.get()) {
+    pending_query_handle_ = autofill_data_->GetFormValuesForElementName(
         name, prefix, kMaxAutocompleteMenuItems, this);
   }
 }
 
 void AutocompleteHistoryManager::OnFormSubmitted(const FormData& form) {
   if (!*autofill_enabled_)
     return;
 
   if (profile_->IsOffTheRecord())
     return;
@@ skipping 14 matching lines @@
        iter != form.fields.end(); ++iter) {
     if (!iter->value.empty() &&
         !iter->name.empty() &&
         IsTextField(*iter) &&
         !CreditCard::IsValidCreditCardNumber(iter->value) &&
         !IsSSN(iter->value)) {
       values.push_back(*iter);
     }
   }
 
-  if (!values.empty() && web_data_service_.get())
-    web_data_service_->AddFormFields(values);
+  if (!values.empty() && autofill_data_.get())
+    autofill_data_->AddFormFields(values);
 }
 
 void AutocompleteHistoryManager::OnRemoveAutocompleteEntry(
     const string16& name, const string16& value) {
-  if (web_data_service_.get())
-    web_data_service_->RemoveFormValueForElementName(name, value);
+  if (autofill_data_.get())
+    autofill_data_->RemoveFormValueForElementName(name, value);
 }
 
 void AutocompleteHistoryManager::SetExternalDelegate(
     AutofillExternalDelegate* delegate) {
   external_delegate_ = delegate;
 }
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     WebContents* web_contents,
     Profile* profile,
-    WebDataService* wds)
+    scoped_ptr<AutofillWebDataService> awd)
     : content::WebContentsObserver(web_contents),
       profile_(profile),
-      web_data_service_(wds),
+      autofill_data_(awd.Pass()),

[erikwright (departed), 2012/09/13 01:45:11]

I'm more familiar with release() in this scenario. I suppose Pass is OK too (it
seems that if you call Pass but don't actually move to a new scoped_ptr, it
would have no effect? If so, I guess it's safer than release()).

[Jói, 2012/09/13 12:34:50]

Pass() is the right thing to use in this scenario to get move semantics, whereas
release() just releases the raw pointer (and I don't think it would even compile
in this case); see base/memory/scoped_ptr.h

The new move semantics of scoped_ptr are very very cool.  By declaring the
parameter to the constructor as a scoped_ptr, there is no need for documentation
about ownership semantics - doing it this way definitively means that
AutocompleteHistoryManager takes ownership of the pointer that you pass in.

       pending_query_handle_(0),
       query_id_(0),
       external_delegate_(NULL) {
   autofill_enabled_.Init(
       prefs::kAutofillEnabled, PrefServiceBase::ForProfile(profile_), NULL);
 }
 
 void AutocompleteHistoryManager::CancelPendingQuery() {
   if (pending_query_handle_) {
     SendSuggestions(NULL);
-    if (web_data_service_.get())
-      web_data_service_->CancelRequest(pending_query_handle_);
+    if (autofill_data_.get())
+      autofill_data_->CancelRequest(pending_query_handle_);
     pending_query_handle_ = 0;
   }
 }
 
 void AutocompleteHistoryManager::SendSuggestions(
     const std::vector<string16>* suggestions) {
   if (suggestions) {
     // Combine Autofill and Autocomplete values into values and labels.
     for (size_t i = 0; i < suggestions->size(); ++i) {
       bool unique = true;
@@ skipping 29 matching lines @@
                                              autofill_icons_,
                                              autofill_unique_ids_));
   }
 
   query_id_ = 0;
   autofill_values_.clear();
   autofill_labels_.clear();
   autofill_icons_.clear();
   autofill_unique_ids_.clear();
 }