| Index: chrome/browser/spellchecker/feedback_sender.cc | 
| diff --git a/chrome/browser/spellchecker/feedback_sender.cc b/chrome/browser/spellchecker/feedback_sender.cc | 
| index 99b1baf8c9f459f5e2afae988f520a55d085903a..4bfb8244462af3a4acc84f9c73cee25741e68eff 100644 | 
| --- a/chrome/browser/spellchecker/feedback_sender.cc | 
| +++ b/chrome/browser/spellchecker/feedback_sender.cc | 
| @@ -69,7 +69,7 @@ const int kMinIntervalSeconds = 5; | 
|  | 
| // Returns a hash of |session_start|, the current timestamp, and | 
| // |suggestion_index|. | 
| -uint32 BuildHash(const base::Time& session_start, size_t suggestion_index) { | 
| +uint32_t BuildHash(const base::Time& session_start, size_t suggestion_index) { | 
| return base::Hash( | 
| base::StringPrintf("%" PRId64 "%" PRId64 "%" PRIuS, | 
| session_start.ToInternalValue(), | 
| @@ -185,7 +185,7 @@ FeedbackSender::FeedbackSender(net::URLRequestContextGetter* request_context, | 
| FeedbackSender::~FeedbackSender() { | 
| } | 
|  | 
| -void FeedbackSender::SelectedSuggestion(uint32 hash, int suggestion_index) { | 
| +void FeedbackSender::SelectedSuggestion(uint32_t hash, int suggestion_index) { | 
| Misspelling* misspelling = feedback_.GetMisspelling(hash); | 
| // GetMisspelling() returns null for flushed feedback. Feedback is flushed | 
| // when the session expires every |kSessionHours| hours. | 
| @@ -196,7 +196,7 @@ void FeedbackSender::SelectedSuggestion(uint32 hash, int suggestion_index) { | 
| misspelling->timestamp = base::Time::Now(); | 
| } | 
|  | 
| -void FeedbackSender::AddedToDictionary(uint32 hash) { | 
| +void FeedbackSender::AddedToDictionary(uint32_t hash) { | 
| Misspelling* misspelling = feedback_.GetMisspelling(hash); | 
| // GetMisspelling() returns null for flushed feedback. Feedback is flushed | 
| // when the session expires every |kSessionHours| hours. | 
| @@ -204,11 +204,10 @@ void FeedbackSender::AddedToDictionary(uint32 hash) { | 
| return; | 
| misspelling->action.set_type(SpellcheckAction::TYPE_ADD_TO_DICT); | 
| misspelling->timestamp = base::Time::Now(); | 
| -  const std::set<uint32>& hashes = | 
| +  const std::set<uint32_t>& hashes = | 
| feedback_.FindMisspellings(GetMisspelledString(*misspelling)); | 
| -  for (std::set<uint32>::const_iterator hash_it = hashes.begin(); | 
| -       hash_it != hashes.end(); | 
| -       ++hash_it) { | 
| +  for (std::set<uint32_t>::const_iterator hash_it = hashes.begin(); | 
| +       hash_it != hashes.end(); ++hash_it) { | 
| Misspelling* duplicate_misspelling = feedback_.GetMisspelling(*hash_it); | 
| if (!duplicate_misspelling || duplicate_misspelling->action.IsFinal()) | 
| continue; | 
| @@ -217,7 +216,7 @@ void FeedbackSender::AddedToDictionary(uint32 hash) { | 
| } | 
| } | 
|  | 
| -void FeedbackSender::RecordInDictionary(uint32 hash) { | 
| +void FeedbackSender::RecordInDictionary(uint32_t hash) { | 
| Misspelling* misspelling = feedback_.GetMisspelling(hash); | 
| // GetMisspelling() returns null for flushed feedback. Feedback is flushed | 
| // when the session expires every |kSessionHours| hours. | 
| @@ -226,7 +225,7 @@ void FeedbackSender::RecordInDictionary(uint32 hash) { | 
| misspelling->action.set_type(SpellcheckAction::TYPE_IN_DICTIONARY); | 
| } | 
|  | 
| -void FeedbackSender::IgnoredSuggestions(uint32 hash) { | 
| +void FeedbackSender::IgnoredSuggestions(uint32_t hash) { | 
| Misspelling* misspelling = feedback_.GetMisspelling(hash); | 
| // GetMisspelling() returns null for flushed feedback. Feedback is flushed | 
| // when the session expires every |kSessionHours| hours. | 
| @@ -236,7 +235,7 @@ void FeedbackSender::IgnoredSuggestions(uint32 hash) { | 
| misspelling->timestamp = base::Time::Now(); | 
| } | 
|  | 
| -void FeedbackSender::ManuallyCorrected(uint32 hash, | 
| +void FeedbackSender::ManuallyCorrected(uint32_t hash, | 
| const base::string16& correction) { | 
| Misspelling* misspelling = feedback_.GetMisspelling(hash); | 
| // GetMisspelling() returns null for flushed feedback. Feedback is flushed | 
| @@ -250,7 +249,7 @@ void FeedbackSender::ManuallyCorrected(uint32 hash, | 
|  | 
| void FeedbackSender::OnReceiveDocumentMarkers( | 
| int renderer_process_id, | 
| -    const std::vector<uint32>& markers) { | 
| +    const std::vector<uint32_t>& markers) { | 
| if ((base::Time::Now() - session_start_).InHours() >= | 
| chrome::spellcheck_common::kSessionHours) { | 
| FlushFeedback(); | 
| @@ -279,7 +278,7 @@ void FeedbackSender::OnSpellcheckResults( | 
| // Generate a map of marker offsets to marker hashes. This map helps to | 
| // efficiently lookup feedback data based on the position of the misspelling | 
| // in text. | 
| -  typedef std::map<size_t, uint32> MarkerMap; | 
| +  typedef std::map<size_t, uint32_t> MarkerMap; | 
| MarkerMap marker_map; | 
| for (size_t i = 0; i < markers.size(); ++i) | 
| marker_map[markers[i].offset] = markers[i].hash; | 
| @@ -383,7 +382,7 @@ void FeedbackSender::RequestDocumentMarkers() { | 
| ++it) { | 
| base::ThreadTaskRunnerHandle::Get()->PostTask( | 
| FROM_HERE, base::Bind(&FeedbackSender::OnReceiveDocumentMarkers, | 
| -                              AsWeakPtr(), *it, std::vector<uint32>())); | 
| +                              AsWeakPtr(), *it, std::vector<uint32_t>())); | 
| } | 
| } | 
|  | 
|  |