Stop using UIThreadSearchTermsData in tests when unnecessary

Implement fake methods in TestSearchTermsData to test TemplateURL's code without relying on UIThreadSearchTermsData's behavior.

BUG=371535
TEST=unit_tests

Review URL: https://codereview.chromium.org/344083003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278625 0039d316-1c4b-4281-b951-d872f2087c98
parent 050f3311
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "chrome/browser/search_engines/search_host_to_urls_map.h" #include "chrome/browser/search_engines/search_host_to_urls_map.h"
#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/ui_thread_search_terms_data.h" #include "components/search_engines/search_terms_data.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet; typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet;
...@@ -39,8 +39,7 @@ void SearchHostToURLsMapTest::SetUp() { ...@@ -39,8 +39,7 @@ void SearchHostToURLsMapTest::SetUp() {
template_urls.push_back(t_urls_[1].get()); template_urls.push_back(t_urls_[1].get());
provider_map_.reset(new SearchHostToURLsMap); provider_map_.reset(new SearchHostToURLsMap);
UIThreadSearchTermsData search_terms_data(NULL); provider_map_->Init(template_urls, SearchTermsData());
provider_map_->Init(template_urls, search_terms_data);
} }
TEST_F(SearchHostToURLsMapTest, Add) { TEST_F(SearchHostToURLsMapTest, Add) {
...@@ -48,15 +47,13 @@ TEST_F(SearchHostToURLsMapTest, Add) { ...@@ -48,15 +47,13 @@ TEST_F(SearchHostToURLsMapTest, Add) {
TemplateURLData data; TemplateURLData data;
data.SetURL("http://" + new_host + "/"); data.SetURL("http://" + new_host + "/");
TemplateURL new_t_url(data); TemplateURL new_t_url(data);
UIThreadSearchTermsData search_terms_data(NULL); provider_map_->Add(&new_t_url, SearchTermsData());
provider_map_->Add(&new_t_url, search_terms_data);
ASSERT_EQ(&new_t_url, provider_map_->GetTemplateURLForHost(new_host)); ASSERT_EQ(&new_t_url, provider_map_->GetTemplateURLForHost(new_host));
} }
TEST_F(SearchHostToURLsMapTest, Remove) { TEST_F(SearchHostToURLsMapTest, Remove) {
UIThreadSearchTermsData search_terms_data(NULL); provider_map_->Remove(t_urls_[0].get(), SearchTermsData());
provider_map_->Remove(t_urls_[0].get(), search_terms_data);
const TemplateURL* found_url = provider_map_->GetTemplateURLForHost(host_); const TemplateURL* found_url = provider_map_->GetTemplateURLForHost(host_);
ASSERT_EQ(t_urls_[1].get(), found_url); ASSERT_EQ(t_urls_[1].get(), found_url);
......
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