diff options
Diffstat (limited to 'chrome/browser/autocomplete/search_provider_unittest.cc')
| -rw-r--r-- | chrome/browser/autocomplete/search_provider_unittest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 595b688..43ae43b 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -6,6 +6,7 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" +#include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/search_provider.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history.h" @@ -132,6 +133,11 @@ void SearchProviderTest::SetUp() { history->SetKeywordSearchTermsForURL(keyword_url_, keyword_t_url_->id(), keyword_term_); + // Keywords are updated by the InMemoryHistoryBackend only after the message + // has been processed on the history thread. Block until history processes all + // requests to ensure the InMemoryDatabase is the state we expect it. + profile_.BlockUntilHistoryProcessesPendingRequests(); + provider_ = new SearchProvider(this, &profile_); URLFetcher::set_factory(&test_factory_); |