diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 22:59:59 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 22:59:59 +0000 |
| commit | 0fcfb2a1252c8665c8078aa1ccd94b5153a92f18 (patch) | |
| tree | 4d82ce1ec82bc2663efa72038593e02c6aa1e31e | |
| parent | cacc3d66d1fe90511de178c1041f0897f9eb9833 (diff) | |
| download | chromium_src-0fcfb2a1252c8665c8078aa1ccd94b5153a92f18.zip chromium_src-0fcfb2a1252c8665c8078aa1ccd94b5153a92f18.tar.gz chromium_src-0fcfb2a1252c8665c8078aa1ccd94b5153a92f18.tar.bz2 | |
Don't create a WebDataService in AutoFillManagerTest tests, since that object is hard to clean up correctly in unit tests because of all the PostTasking it does. Just make AutoCompleteHistoryManager handle a null WebDataService.
Review URL: http://codereview.chromium.org/6211002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70955 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/autocomplete_history_manager.cc | 14 | ||||
| -rw-r--r-- | chrome/browser/autofill/autofill_manager_unittest.cc | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autocomplete_history_manager.cc index 84fd89d..40d8c72 100644 --- a/chrome/browser/autocomplete_history_manager.cc +++ b/chrome/browser/autocomplete_history_manager.cc @@ -127,13 +127,14 @@ void AutocompleteHistoryManager::OnFormSubmitted(const FormData& form) { values.push_back(*iter); } - if (!values.empty() && web_data_service_) + if (!values.empty() && web_data_service_.get()) web_data_service_->AddFormFields(values); } void AutocompleteHistoryManager::OnRemoveAutocompleteEntry( const string16& name, const string16& value) { - web_data_service_->RemoveFormValueForElementName(name, value); + if (web_data_service_.get()) + web_data_service_->RemoveFormValueForElementName(name, value); } void AutocompleteHistoryManager::OnGetAutocompleteSuggestions( @@ -156,8 +157,10 @@ void AutocompleteHistoryManager::OnGetAutocompleteSuggestions( return; } - pending_query_handle_ = web_data_service_->GetFormValuesForElementName( - name, prefix, kMaxAutocompleteMenuItems, this); + if (web_data_service_.get()) { + pending_query_handle_ = web_data_service_->GetFormValuesForElementName( + name, prefix, kMaxAutocompleteMenuItems, this); + } } void AutocompleteHistoryManager::OnWebDataServiceRequestDone( @@ -192,7 +195,8 @@ AutocompleteHistoryManager::AutocompleteHistoryManager( void AutocompleteHistoryManager::CancelPendingQuery() { if (pending_query_handle_) { SendSuggestions(NULL); - web_data_service_->CancelRequest(pending_query_handle_); + if (web_data_service_.get()) + web_data_service_->CancelRequest(pending_query_handle_); pending_query_handle_ = 0; } } diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc index b109441..6242e65 100644 --- a/chrome/browser/autofill/autofill_manager_unittest.cc +++ b/chrome/browser/autofill/autofill_manager_unittest.cc @@ -434,9 +434,6 @@ class AutoFillManagerTest : public RenderViewHostTestHarness { } virtual void SetUp() { - profile_.reset(new TestingProfile()); - profile_->CreateWebDataService(false); - RenderViewHostTestHarness::SetUp(); test_personal_data_ = new TestPersonalDataManager(); autofill_manager_.reset(new TestAutoFillManager(contents(), |