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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autocomplete/autocomplete_result_unittest.cc

Issue 343523003: Remove AutocompleteInput Type and PageClassification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 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
« chrome/browser/autocomplete/autocomplete_result.h ('K') | « chrome/browser/autocomplete/autocomplete_result.cc ('k') | chrome/browser/autocomplete/base_search_provider.h » ('j') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_result_unittest.cc
diff --git a/chrome/browser/autocomplete/autocomplete_result_unittest.cc b/chrome/browser/autocomplete/autocomplete_result_unittest.cc
index 238509b2e0998089fbde9a7f7afddb7cca26901b..15d0c40280b882d2b279e359345731475d6d3c2c 100644
--- a/chrome/browser/autocomplete/autocomplete_result_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_result_unittest.cc
@@ -20,10 +20,13 @@
#include "chrome/browser/search_engines/template_url_service_test_util.h"
#include "chrome/common/autocomplete_match_type.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "components/variations/entropy_provider.h"
#include "components/variations/variations_associated_data.h"
#include "testing/gtest/include/gtest/gtest.h"
+using metrics::OmniboxEventProto;
+
namespace {
struct AutocompleteMatchTestData {
@@ -176,7 +179,7 @@ void AutocompleteResultTest::RunCopyOldMatchesTest(
const TestData* expected, size_t expected_size) {
AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, false, false, false,
+ OmniboxEventProto::INVALID_SPEC, false, false, false,
true);
ACMatches last_matches;
@@ -212,7 +215,7 @@ TEST_F(AutocompleteResultTest, Swap) {
match.allowed_to_be_default_match = true;
AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, false, false, false,
+ OmniboxEventProto::INVALID_SPEC, false, false, false,
true);
matches.push_back(match);
r1.AppendMatches(matches);
@@ -295,7 +298,7 @@ TEST_F(AutocompleteResultTest, SortAndCullEmptyDestinationURLs) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, false, false, false,
+ OmniboxEventProto::INVALID_SPEC, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
@@ -341,7 +344,7 @@ TEST_F(AutocompleteResultTest, SortAndCullDuplicateSearchURLs) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, false, false, false,
+ OmniboxEventProto::INVALID_SPEC, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
@@ -393,7 +396,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDups) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, false, false, false,
+ OmniboxEventProto::INVALID_SPEC, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
@@ -447,7 +450,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDemotionsByType) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
@@ -492,7 +495,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDupsAndDemotionsByType) {
result.AppendMatches(matches);
AutocompleteInput input(
base::string16(), base::string16::npos, base::string16(), GURL(),
- AutocompleteInput::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS, false,
+ OmniboxEventProto::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS, false,
false, false, true);
result.SortAndCull(input, test_util_.profile());
@@ -530,7 +533,7 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
AssertResultMatches(result, data, 4);
@@ -546,7 +549,7 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
ASSERT_EQ(4U, result.size());
@@ -577,7 +580,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDisableInlining) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
AssertResultMatches(result, data, 4);
@@ -602,7 +605,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDisableInlining) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
ASSERT_EQ(4U, result.size());
@@ -623,7 +626,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDisableInlining) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
AssertResultMatches(result, data, 4);
@@ -639,7 +642,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDisableInlining) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
ASSERT_EQ(4U, result.size());
@@ -659,7 +662,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDisableInlining) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
ASSERT_EQ(4U, result.size());
@@ -684,7 +687,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDisableInlining) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
AssertResultMatches(result, data, 4);
@@ -705,7 +708,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDisableInlining) {
result.AppendMatches(matches);
AutocompleteInput input(base::string16(), base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::HOME_PAGE, false, false, false,
+ OmniboxEventProto::HOME_PAGE, false, false, false,
true);
result.SortAndCull(input, test_util_.profile());
ASSERT_EQ(4U, result.size());
« chrome/browser/autocomplete/autocomplete_result.h ('K') | « chrome/browser/autocomplete/autocomplete_result.cc ('k') | chrome/browser/autocomplete/base_search_provider.h » ('j') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698