Switch to standard integer types in net/.

net/http/http_util.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.
 
 // The rules for parsing content-types were borrowed from Firefox:
 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834
 
 #include "net/http/http_util.h"
 
 #include <algorithm>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 
-
 namespace net {
 
 // Helpers --------------------------------------------------------------------
 
 // Returns the index of the closing quote of the string, if any.  |start| points
 // at the opening quote.
 static size_t FindStringEnd(const std::string& line, size_t start, char delim) {
   DCHECK_LT(start, line.length());
   DCHECK_EQ(line[start], delim);
   DCHECK((delim == '"') || (delim == '\''));
@@ skipping 171 matching lines @@
     std::string::const_iterator first_byte_pos_begin =
         byte_range_set_iterator.value_begin();
     std::string::const_iterator first_byte_pos_end =
         first_byte_pos_begin +  minus_char_offset;
     TrimLWS(&first_byte_pos_begin, &first_byte_pos_end);
     std::string first_byte_pos(first_byte_pos_begin, first_byte_pos_end);
 
     HttpByteRange range;
     // Try to obtain first-byte-pos.
     if (!first_byte_pos.empty()) {
-      int64 first_byte_position = -1;
+      int64_t first_byte_position = -1;
       if (!base::StringToInt64(first_byte_pos, &first_byte_position))
         return false;
       range.set_first_byte_position(first_byte_position);
     }
 
     std::string::const_iterator last_byte_pos_begin =
         byte_range_set_iterator.value_begin() + minus_char_offset + 1;
     std::string::const_iterator last_byte_pos_end =
         byte_range_set_iterator.value_end();
     TrimLWS(&last_byte_pos_begin, &last_byte_pos_end);
     std::string last_byte_pos(last_byte_pos_begin, last_byte_pos_end);
 
     // We have last-byte-pos or suffix-byte-range-spec in this case.
     if (!last_byte_pos.empty()) {
-      int64 last_byte_position;
+      int64_t last_byte_position;
       if (!base::StringToInt64(last_byte_pos, &last_byte_position))
         return false;
       if (range.HasFirstBytePosition())
         range.set_last_byte_position(last_byte_position);
       else
         range.set_suffix_length(last_byte_position);
     } else if (!range.HasFirstBytePosition()) {
       return false;
     }
 
@@ skipping 702 matching lines @@
       value_is_quoted_ = true;
       // Do not store iterators into this. See declaration of unquoted_value_.
       unquoted_value_ = HttpUtil::Unquote(value_begin_, value_end_);
     }
   }
 
   return true;
 }
 
 }  // namespace net