Replace string16 with base::string16.

chrome/browser/autocomplete/bookmark_provider_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/bookmark_provider.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 97 matching lines @@
       position_string += ", ";
     position_string += "{" + base::IntToString(i->begin) + ", " +
         base::IntToString(i->end) + "}";
   }
   position_string += "}\n";
   return position_string;
 }
 
 // Return the positions in |matches| as a formatted string for unit test
 // diagnostic output.
-string16 MatchesAsString16(const ACMatches& matches) {
-  string16 matches_string;
+base::string16 MatchesAsString16(const ACMatches& matches) {
+  base::string16 matches_string;
   for (ACMatches::const_iterator i = matches.begin(); i != matches.end(); ++i) {
     matches_string.append(ASCIIToUTF16("    '"));
     matches_string.append(i->description);
     matches_string.append(ASCIIToUTF16("'\n"));
   }
   return matches_string;
 }
 
 // Comparison function for sorting search terms by descending length.
 bool TestBookmarkPositionsEqual(const TestBookmarkPosition& pos_a,
@@ skipping 106 matching lines @@
     // This set uses duplicated and/or overlaps search terms in the title.
     {"frank",                 1, {{{0, 5}, {8, 13}, {16, 21}, {0, 0}}}},
     {"frankly",               1, {{{0, 7}, {8, 15}, {0, 0}}}},
     {"frankly frankly",       1, {{{0, 7}, {8, 15}, {0, 0}}}},
     {"foobar foo",            1, {{{0, 6}, {7, 13}, {0, 0}}}},
     {"foo foobar",            1, {{{0, 6}, {7, 13}, {0, 0}}}},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(query_data); ++i) {
     AutocompleteInput input(ASCIIToUTF16(query_data[i].query),
-                            string16::npos, string16(), GURL(),
+                            base::string16::npos, base::string16(), GURL(),
                             AutocompleteInput::INVALID_SPEC, false, false,
                             false, AutocompleteInput::ALL_MATCHES);
     provider_->Start(input, false);
     const ACMatches& matches(provider_->matches());
     // Validate number of results is as expected.
     EXPECT_LE(matches.size(), query_data[i].match_count)
         << "One or more of the following matches were unexpected:\n"
         << MatchesAsString16(matches)
         << "For query '" << query_data[i].query << "'.";
     EXPECT_GE(matches.size(), query_data[i].match_count)
@@ skipping 53 matching lines @@
                       "burning worms #1"}},  // not boosted
     // Ranking of prefix matches with URL boost. Note that a query of
     // "worm burn" will have the same results.
     {"burn worm", 3, {"burning worms #2",    // boosted
                       "worming burns #20",   // boosted
                       "burning worms #1"}},  // not boosted but shorter
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(query_data); ++i) {
     AutocompleteInput input(ASCIIToUTF16(query_data[i].query),
-                            string16::npos, string16(), GURL(),
+                            base::string16::npos, base::string16(), GURL(),
                             AutocompleteInput::INVALID_SPEC, false, false,
                             false, AutocompleteInput::ALL_MATCHES);
     provider_->Start(input, false);
     const ACMatches& matches(provider_->matches());
     // Validate number and content of results is as expected.
     for (size_t j = 0; j < std::max(query_data[i].match_count, matches.size());
          ++j) {
       EXPECT_LT(j, query_data[i].match_count) << "    Unexpected match '"
           << UTF16ToUTF8(matches[j].description) << "' for query: '"
           <<  query_data[i].query << "'.";
       if (j >= query_data[i].match_count)
         continue;
       EXPECT_LT(j, matches.size()) << "    Missing match '"
           << query_data[i].matches[j] << "' for query: '"
           << query_data[i].query << "'.";
       if (j >= matches.size())
         continue;
       EXPECT_EQ(query_data[i].matches[j], UTF16ToUTF8(matches[j].description))
           << "    Mismatch at [" << base::IntToString(j) << "] for query '"
           << query_data[i].query << "'.";
       EXPECT_FALSE(matches[j].allowed_to_be_default_match);
     }
   }
 }