Assorted fixes for 64-bit.

chrome/browser/history/snippet.cc

 // Copyright (c) 2006-2008 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/history/snippet.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 132 matching lines @@
   // that it's within a window in terms of graphemes as well.
   if (next_match_start < previous_match_end + kSnippetContext)
     return true;
   bi->isBoundary(previous_match_end);
   // An alternative to this is to call |bi->next()| at most
   // kSnippetContext times, compare |bi->current()| with |next_match_start|
   // after each call and return early if possible. There are other
   // heuristics to speed things up if necessary, but it's not likely that
   // we need to bother.
   bi->next(kSnippetContext);
-  int64_t current = bi->current();
-  return (next_match_start < current || current == BreakIterator::DONE);
+  int64 current = bi->current();
+  return (next_match_start < static_cast<uint64>(current) ||

[Evan Martin, 2009/07/28 21:15:29]

this looks suspicious for 32-bit.  but all of this code is suspicious to me (wtf
does breakiterator use int64?)

+          current == BreakIterator::DONE);
 }
 
 }  // namespace
 
 // static
 void Snippet::ExtractMatchPositions(const std::string& offsets_str,
                                     const std::string& column_num,
                                     MatchPositions* match_positions) {
   DCHECK(match_positions);
   if (offsets_str.empty())
@@ skipping 95 matching lines @@
     start = end;
 
     // Stop here if we have enough snippet computed.
     if (snippet.size() >= kSnippetMaxLength)
       break;
   }
 
   utext_close(document_utext);
   swap(text_, snippet);
 }