Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(569)

Unified Diff: components/omnibox/base_search_provider_unittest.cc

Issue 1192373002: Prepare AutocompleteController for componentization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@componentize_zero_suggest_provider
Patch Set: Response to review Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/omnibox/autocomplete_provider_client.h ('k') | components/omnibox/history_quick_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/omnibox/base_search_provider_unittest.cc
diff --git a/components/omnibox/base_search_provider_unittest.cc b/components/omnibox/base_search_provider_unittest.cc
index ba178900c88f04bbd715ec1faeb7c5e9d0f4921b..ef8da84853f8805c91e9295fb07570fdcddf5a4b 100644
--- a/components/omnibox/base_search_provider_unittest.cc
+++ b/components/omnibox/base_search_provider_unittest.cc
@@ -8,8 +8,8 @@
#include "base/strings/utf_string_conversions.h"
#include "components/omnibox/autocomplete_match.h"
#include "components/omnibox/autocomplete_match_type.h"
-#include "components/omnibox/autocomplete_provider_client.h"
#include "components/omnibox/autocomplete_scheme_classifier.h"
+#include "components/omnibox/mock_autocomplete_provider_client.h"
#include "components/omnibox/search_suggestion_parser.h"
#include "components/omnibox/suggestion_answer.h"
#include "components/search_engines/search_terms_data.h"
@@ -22,67 +22,6 @@ using testing::NiceMock;
using testing::Return;
using testing::_;
-class MockAutocompleteProviderClient : public AutocompleteProviderClient {
- public:
- MockAutocompleteProviderClient() {
- template_url_service_.reset(new TemplateURLService(
- nullptr, scoped_ptr<SearchTermsData>(new SearchTermsData), nullptr,
- scoped_ptr<TemplateURLServiceClient>(), nullptr, nullptr,
- base::Closure()));
- }
- MOCK_METHOD0(GetRequestContext, net::URLRequestContextGetter*());
- MOCK_METHOD0(GetPrefs, PrefService*());
- MOCK_CONST_METHOD0(GetSchemeClassifier,
- const AutocompleteSchemeClassifier&());
- MOCK_METHOD0(GetAutocompleteClassifier, AutocompleteClassifier*());
- MOCK_METHOD0(GetHistoryService, history::HistoryService*());
-
- // Can't mock scoped_refptr :\.
- scoped_refptr<history::TopSites> GetTopSites() override { return nullptr; }
-
- MOCK_METHOD0(GetBookmarkModel, bookmarks::BookmarkModel*());
- MOCK_METHOD0(GetInMemoryDatabase, history::URLDatabase*());
-
- TemplateURLService* GetTemplateURLService() override {
- return template_url_service_.get();
- }
- const TemplateURLService* GetTemplateURLService() const override {
- return template_url_service_.get();
- }
-
- MOCK_CONST_METHOD0(GetSearchTermsData, const SearchTermsData&());
-
- // Can't mock scoped_refptr :\.
- scoped_refptr<ShortcutsBackend> GetShortcutsBackend() override {
- return nullptr;
- }
- scoped_refptr<ShortcutsBackend> GetShortcutsBackendIfExists() override {
- return nullptr;
- }
-
- MOCK_CONST_METHOD0(GetAcceptLanguages, std::string());
- MOCK_CONST_METHOD0(IsOffTheRecord, bool());
- MOCK_CONST_METHOD0(SearchSuggestEnabled, bool());
- MOCK_CONST_METHOD0(BookmarkBarIsVisible, bool());
- MOCK_CONST_METHOD0(TabSyncEnabledAndUnencrypted, bool());
- MOCK_METHOD6(
- Classify,
- void(const base::string16& text,
- bool prefer_keyword,
- bool allow_exact_keyword_match,
- metrics::OmniboxEventProto::PageClassification page_classification,
- AutocompleteMatch* match,
- GURL* alternate_nav_url));
- MOCK_METHOD2(DeleteMatchingURLsForKeywordFromHistory,
- void(history::KeywordID keyword_id, const base::string16& term));
- MOCK_METHOD1(PrefetchImage, void(const GURL& url));
-
- private:
- scoped_ptr<TemplateURLService> template_url_service_;
-
- DISALLOW_COPY_AND_ASSIGN(MockAutocompleteProviderClient);
-};
-
class TestBaseSearchProvider : public BaseSearchProvider {
public:
typedef BaseSearchProvider::MatchMap MatchMap;
@@ -127,7 +66,12 @@ class BaseSearchProviderTest : public testing::Test {
protected:
void SetUp() override {
+ scoped_ptr<TemplateURLService> template_url_service(new TemplateURLService(
+ nullptr, scoped_ptr<SearchTermsData>(new SearchTermsData), nullptr,
+ scoped_ptr<TemplateURLServiceClient>(), nullptr, nullptr,
+ base::Closure()));
client_.reset(new NiceMock<MockAutocompleteProviderClient>());
+ client_->set_template_url_service(template_url_service.Pass());
provider_ = new NiceMock<TestBaseSearchProvider>(
AutocompleteProvider::TYPE_SEARCH, client_.get());
}
« no previous file with comments | « components/omnibox/autocomplete_provider_client.h ('k') | components/omnibox/history_quick_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698