| Index: chrome/browser/history/in_memory_url_index_types.h
|
| diff --git a/chrome/browser/history/in_memory_url_index_types.h b/chrome/browser/history/in_memory_url_index_types.h
|
| index 976e062ecc623ff47219ff7d1f06d84f81bbb624..91ef29f6809f506ffba8d7ab1a8259e87bd43585 100644
|
| --- a/chrome/browser/history/in_memory_url_index_types.h
|
| +++ b/chrome/browser/history/in_memory_url_index_types.h
|
| @@ -81,8 +81,8 @@ TermMatches ReplaceOffsetsInTermMatches(const TermMatches& matches,
|
|
|
| typedef std::vector<base::string16> String16Vector;
|
| typedef std::set<base::string16> String16Set;
|
| -typedef std::set<char16> Char16Set;
|
| -typedef std::vector<char16> Char16Vector;
|
| +typedef std::set<base::char16> Char16Set;
|
| +typedef std::vector<base::char16> Char16Vector;
|
|
|
| // A vector that contains the offsets at which each word starts within a string.
|
| typedef std::vector<size_t> WordStarts;
|
| @@ -143,7 +143,7 @@ typedef std::map<base::string16, WordID> WordMap;
|
|
|
| // A map from character to the word_ids of words containing that character.
|
| typedef std::set<WordID> WordIDSet; // An index into the WordList.
|
| -typedef std::map<char16, WordIDSet> CharWordIDMap;
|
| +typedef std::map<base::char16, WordIDSet> CharWordIDMap;
|
|
|
| // A map from word (by word_id) to history items containing that word.
|
| typedef history::URLID HistoryID;
|
|
|