chrome/browser/autocomplete/autocomplete_result_unittest.cc - Issue 105193002: Replace string16 with base::string16.

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

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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

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 ab152fbce338c65d32f2cd1f202428720a9b84f7..e3fa9bc5fd52c4c848db3f52cc0fffef7c4f4fd8 100644

--- a/chrome/browser/autocomplete/autocomplete_result_unittest.cc

+++ b/chrome/browser/autocomplete/autocomplete_result_unittest.cc

@@ -131,7 +131,8 @@ void AutocompleteResultTest::RunCopyOldMatchesTest(

const TestData* last, size_t last_size,

const TestData* current, size_t current_size,

const TestData* expected, size_t expected_size) {

- AutocompleteInput input(ASCIIToUTF16("a"), string16::npos, string16(), GURL(),

+ AutocompleteInput input(ASCIIToUTF16("a"), base::string16::npos,

+ base::string16(), GURL(),

AutocompleteInput::INVALID_SPEC, false, false, false,

AutocompleteInput::ALL_MATCHES);

@@ -166,7 +167,8 @@ TEST_F(AutocompleteResultTest, Swap) {

AutocompleteMatch match;

match.relevance = 1;

match.allowed_to_be_default_match = true;

- AutocompleteInput input(ASCIIToUTF16("a"), string16::npos, string16(), GURL(),

+ AutocompleteInput input(ASCIIToUTF16("a"), base::string16::npos,

+ base::string16(), GURL(),

AutocompleteInput::INVALID_SPEC, false, false, false,

AutocompleteInput::ALL_MATCHES);

matches.push_back(match);

@@ -248,7 +250,8 @@ TEST_F(AutocompleteResultTest, SortAndCullEmptyDestinationURLs) {

AutocompleteResult result;

result.AppendMatches(matches);

- AutocompleteInput input(string16(), string16::npos, string16(), GURL(),

+ AutocompleteInput input(base::string16(), base::string16::npos,

+ base::string16(), GURL(),

AutocompleteInput::INVALID_SPEC, false, false, false,

AutocompleteInput::ALL_MATCHES);

result.SortAndCull(input, test_util_.profile());

@@ -293,7 +296,8 @@ TEST_F(AutocompleteResultTest, SortAndCullDuplicateSearchURLs) {

AutocompleteResult result;

result.AppendMatches(matches);

- AutocompleteInput input(string16(), string16::npos, string16(), GURL(),

+ AutocompleteInput input(base::string16(), base::string16::npos,

+ base::string16(), GURL(),

AutocompleteInput::INVALID_SPEC, false, false, false,

AutocompleteInput::ALL_MATCHES);

result.SortAndCull(input, test_util_.profile());

@@ -360,7 +364,8 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDemotionsByType) {

AutocompleteResult result;

result.AppendMatches(matches);

- AutocompleteInput input(string16(), string16::npos, string16(), GURL(),

+ AutocompleteInput input(base::string16(), base::string16::npos,

+ base::string16(), GURL(),

AutocompleteInput::HOME_PAGE, false, false, false,

AutocompleteInput::ALL_MATCHES);

result.SortAndCull(input, test_util_.profile());

@@ -409,7 +414,8 @@ TEST_F(AutocompleteResultTest, SortAndCullWithUndemotableTypes) {

AutocompleteResult result;

result.AppendMatches(matches);

- AutocompleteInput input(string16(), string16::npos, string16(), GURL(),

+ AutocompleteInput input(base::string16(), base::string16::npos,

+ base::string16(), GURL(),

AutocompleteInput::HOME_PAGE, false, false, false,

AutocompleteInput::ALL_MATCHES);

result.SortAndCull(input, test_util_.profile());

@@ -452,7 +458,8 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {

PopulateAutocompleteMatches(data, arraysize(data), &matches);

AutocompleteResult result;

result.AppendMatches(matches);

- AutocompleteInput input(string16(), string16::npos, string16(), GURL(),

+ AutocompleteInput input(base::string16(), base::string16::npos,

+ base::string16(), GURL(),

AutocompleteInput::HOME_PAGE, false, false, false,

AutocompleteInput::ALL_MATCHES);

result.SortAndCull(input, test_util_.profile());

@@ -467,7 +474,8 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {

matches[1].allowed_to_be_default_match = false;

AutocompleteResult result;

result.AppendMatches(matches);

- AutocompleteInput input(string16(), string16::npos, string16(), GURL(),

+ AutocompleteInput input(base::string16(), base::string16::npos,

+ base::string16(), GURL(),

AutocompleteInput::HOME_PAGE, false, false, false,

AutocompleteInput::ALL_MATCHES);

result.SortAndCull(input, test_util_.profile());

« no previous file with comments | « chrome/browser/autocomplete/autocomplete_result.cc ('k') | chrome/browser/autocomplete/bookmark_provider.cc » ('j') | no next file with comments »