#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
-#include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "chrome/browser/autocomplete/autocomplete_provider.h"
-#include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
-#include "chrome/browser/autocomplete/autocomplete_result.h"
+#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
#include "chrome/browser/autocomplete/history_quick_provider.h"
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/search_engines/template_url_service.h"
+#include "chrome/browser/search_engines/chrome_template_url_service_client.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/common/net/url_fixer_upper.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/history/core/browser/url_database.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
+#include "components/metrics/proto/omnibox_input_type.pb.h"
+#include "components/omnibox/autocomplete_match.h"
+#include "components/omnibox/autocomplete_provider.h"
+#include "components/omnibox/autocomplete_provider_listener.h"
+#include "components/omnibox/autocomplete_result.h"
+#include "components/search_engines/search_terms_data.h"
+#include "components/search_engines/template_url.h"
+#include "components/search_engines/template_url_service.h"
+#include "components/url_fixer/url_fixer.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
protected:
static KeyedService* CreateTemplateURLService(
- content::BrowserContext* profile) {
- return new TemplateURLService(static_cast<Profile*>(profile));
+ content::BrowserContext* context) {
+ Profile* profile = static_cast<Profile*>(context);
+ return new TemplateURLService(
+ profile->GetPrefs(), make_scoped_ptr(new SearchTermsData), NULL,
+ scoped_ptr<TemplateURLServiceClient>(
+ new ChromeTemplateURLServiceClient(profile)),
+ NULL, NULL, base::Closure());
}
// testing::Test
bool prevent_inline_autocomplete,
const UrlAndLegalDefault* expected_urls,
size_t num_results,
- AutocompleteInput::Type* identified_input_type);
+ metrics::OmniboxInputType::Type* identified_input_type);
// A version of the above without the final |type| output parameter.
void RunTest(const base::string16 text,
bool prevent_inline_autocomplete,
const UrlAndLegalDefault* expected_urls,
size_t num_results) {
- AutocompleteInput::Type type;
+ metrics::OmniboxInputType::Type type;
return RunTest(text, desired_tld, prevent_inline_autocomplete,
expected_urls, num_results, &type);
}
void HistoryURLProviderTest::FillData() {
// Most visits are a long time ago (some tests require this since we do some
// special logic for things visited very recently). Note that this time must
- // be more recent than the "archived history" threshold for the data to go
- // into the main database.
+ // be more recent than the "expire history" threshold for the data to be kept
+ // in the main database.
//
// TODO(brettw) It would be nice if we could test this behavior, in which
// case the time would be specifed in the test_db structure.
bool prevent_inline_autocomplete,
const UrlAndLegalDefault* expected_urls,
size_t num_results,
- AutocompleteInput::Type* identified_input_type) {
+ metrics::OmniboxInputType::Type* identified_input_type) {
AutocompleteInput input(text, base::string16::npos, desired_tld, GURL(),
- AutocompleteInput::INVALID_SPEC,
- prevent_inline_autocomplete, false, true, true);
+ metrics::OmniboxEventProto::INVALID_SPEC,
+ prevent_inline_autocomplete, false, true, true,
+ ChromeAutocompleteSchemeClassifier(profile_.get()));
*identified_input_type = input.type();
autocomplete_->Start(input, false);
if (!autocomplete_->done())
matches_ = autocomplete_->matches();
if (sort_matches_) {
+ TemplateURLService* service =
+ TemplateURLServiceFactory::GetForProfile(profile_.get());
for (ACMatches::iterator i = matches_.begin(); i != matches_.end(); ++i)
- i->ComputeStrippedDestinationURL(profile_.get());
+ i->ComputeStrippedDestinationURL(service);
AutocompleteResult::DedupMatchesByDestination(
input.current_page_classification(), false, &matches_);
std::sort(matches_.begin(), matches_.end(),
AutocompleteInput input(ASCIIToUTF16("p"), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, false, false, true,
- true);
+ metrics::OmniboxEventProto::INVALID_SPEC, false,
+ false, true, true,
+ ChromeAutocompleteSchemeClassifier(profile_.get()));
autocomplete_->Start(input, false);
// HistoryURLProvider shouldn't be done (waiting on async results).
EXPECT_FALSE(autocomplete_->done());
TEST_F(HistoryURLProviderTest, DontAutocompleteOnTrailingWhitespace) {
AutocompleteInput input(ASCIIToUTF16("slash "), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, false, false,
- true, true);
+ metrics::OmniboxEventProto::INVALID_SPEC, false,
+ false, true, true,
+ ChromeAutocompleteSchemeClassifier(profile_.get()));
autocomplete_->Start(input, false);
if (!autocomplete_->done())
base::MessageLoop::current()->Run();
NULL, 0);
} else {
const UrlAndLegalDefault output[] = {
- { URLFixerUpper::FixupURL(test_cases[i].input, std::string()).spec(),
- true }
- };
+ {url_fixer::FixupURL(test_cases[i].input, std::string()).spec(),
+ true}};
ASSERT_NO_FATAL_FAILURE(RunTest(ASCIIToUTF16(test_cases[i].input),
base::string16(), false,
output, arraysize(output)));
struct TestCase {
const char* input;
int relevance;
- AutocompleteInput::Type type;
+ metrics::OmniboxInputType::Type type;
} test_cases[] = {
- { "gooey", 1410, AutocompleteInput::UNKNOWN },
- { "gooey/", 1410, AutocompleteInput::URL },
- { "gooey#", 1200, AutocompleteInput::UNKNOWN },
- { "gooey/#", 1200, AutocompleteInput::URL },
- { "gooey#foo", 1200, AutocompleteInput::UNKNOWN },
- { "gooey/#foo", 1200, AutocompleteInput::URL },
- { "gooey# foo", 1200, AutocompleteInput::UNKNOWN },
- { "gooey/# foo", 1200, AutocompleteInput::URL },
+ { "gooey", 1410, metrics::OmniboxInputType::UNKNOWN },
+ { "gooey/", 1410, metrics::OmniboxInputType::URL },
+ { "gooey#", 1200, metrics::OmniboxInputType::UNKNOWN },
+ { "gooey/#", 1200, metrics::OmniboxInputType::URL },
+ { "gooey#foo", 1200, metrics::OmniboxInputType::UNKNOWN },
+ { "gooey/#foo", 1200, metrics::OmniboxInputType::URL },
+ { "gooey# foo", 1200, metrics::OmniboxInputType::UNKNOWN },
+ { "gooey/# foo", 1200, metrics::OmniboxInputType::URL },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
SCOPED_TRACE(test_cases[i].input);
const UrlAndLegalDefault output[] = {
- { URLFixerUpper::FixupURL(test_cases[i].input, std::string()).spec(),
- true }
- };
- AutocompleteInput::Type type;
+ {url_fixer::FixupURL(test_cases[i].input, std::string()).spec(), true}};
+ metrics::OmniboxInputType::Type type;
ASSERT_NO_FATAL_FAILURE(
RunTest(ASCIIToUTF16(test_cases[i].input),
base::string16(), false, output, arraysize(output), &type));
for (size_t i = 0; i < arraysize(test_cases); ++i) {
AutocompleteInput input(ASCIIToUTF16(test_cases[i]), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC,
- false, false, true, true);
+ metrics::OmniboxEventProto::INVALID_SPEC,
+ false, false, true, true,
+ ChromeAutocompleteSchemeClassifier(profile_.get()));
autocomplete_->Start(input, false);
if (!autocomplete_->done())
base::MessageLoop::current()->Run();
data.SetURL("http://testsearch.com/?q={searchTerms}");
TemplateURLService* template_url_service =
TemplateURLServiceFactory::GetForProfile(profile_.get());
- TemplateURL* template_url = new TemplateURL(profile_.get(), data);
+ TemplateURL* template_url = new TemplateURL(data);
template_url_service->Add(template_url);
template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
template_url_service->Load();
AutocompleteInput input(ASCIIToUTF16(test_cases[i].input),
base::string16::npos, base::string16(),
GURL("about:blank"),
- AutocompleteInput::INVALID_SPEC, false, false, true,
- true);
+ metrics::OmniboxEventProto::INVALID_SPEC, false,
+ false, true, true,
+ ChromeAutocompleteSchemeClassifier(profile_.get()));
AutocompleteMatch match(autocomplete_->SuggestExactInput(
input.text(), input.canonicalized_url(), test_cases[i].trim_http));
EXPECT_EQ(ASCIIToUTF16(test_cases[i].contents), match.contents);
for (max_matches = 0; max_matches < kMaxMatches; ++max_matches) {
if (test_cases[i].matches[max_matches].url == NULL)
break;
- output[max_matches].url = URLFixerUpper::FixupURL(
- test_cases[i].matches[max_matches].url, std::string()).spec();
+ output[max_matches].url =
+ url_fixer::FixupURL(test_cases[i].matches[max_matches].url,
+ std::string()).spec();
output[max_matches].allowed_to_be_default_match = true;
}
autocomplete_->scoring_params_ = test_cases[i].scoring_params;
projects / platform / framework / web / crosswalk.git / blobdiff