Commit d3736f63 authored by Tommy Li's avatar Tommy Li Committed by Commit Bot

[omnibox] Fix LocalHistoryZeroSuggestProviderTest shutdown order

LocalHistoryZeroSuggestProviderTest uses a
FakeAutocompleteProviderClient, but that class requires a very
particular creation an destruction sequence.

This CL fixes this problem, which was causing issues on ASAN bots.

In the future we should fix the FakeAutocompleteProviderClient API to
make it more obvious that it has special creation destruction
requirements.

Bug: 1010691
Change-Id: Ia5b11b548720fade377e1f9c573105213e71f975
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1845991
Commit-Queue: Tommy Li <tommycli@chromium.org>
Reviewed-by: default avatarMoe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703427}
parent 8e44cb76
...@@ -56,25 +56,30 @@ class LocalHistoryZeroSuggestProviderTest ...@@ -56,25 +56,30 @@ class LocalHistoryZeroSuggestProviderTest
: public testing::Test, : public testing::Test,
public AutocompleteProviderListener { public AutocompleteProviderListener {
public: public:
LocalHistoryZeroSuggestProviderTest() LocalHistoryZeroSuggestProviderTest() = default;
: client_(std::make_unique<FakeAutocompleteProviderClient>()), ~LocalHistoryZeroSuggestProviderTest() override = default;
provider_(base::WrapRefCounted(
LocalHistoryZeroSuggestProvider::Create(client_.get(), this))) {
SetZeroSuggestVariant(
metrics::OmniboxEventProto::NTP_REALBOX,
LocalHistoryZeroSuggestProvider::kZeroSuggestLocalVariant);
}
~LocalHistoryZeroSuggestProviderTest() override {}
protected: protected:
// testing::Test // testing::Test
void SetUp() override { void SetUp() override {
client_ = std::make_unique<FakeAutocompleteProviderClient>();
provider_ = base::WrapRefCounted(
LocalHistoryZeroSuggestProvider::Create(client_.get(), this));
SetZeroSuggestVariant(
metrics::OmniboxEventProto::NTP_REALBOX,
LocalHistoryZeroSuggestProvider::kZeroSuggestLocalVariant);
// Verify that Google is the default search provider. // Verify that Google is the default search provider.
ASSERT_EQ(SEARCH_ENGINE_GOOGLE, ASSERT_EQ(SEARCH_ENGINE_GOOGLE,
default_search_provider()->GetEngineType( default_search_provider()->GetEngineType(
client_->GetTemplateURLService()->search_terms_data())); client_->GetTemplateURLService()->search_terms_data()));
} }
void TearDown() override { task_environment_.RunUntilIdle(); } void TearDown() override {
provider_ = nullptr;
client_.reset();
task_environment_.RunUntilIdle();
}
// AutocompleteProviderListener // AutocompleteProviderListener
void OnProviderUpdate(bool updated_matches) override; void OnProviderUpdate(bool updated_matches) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment