Switch to standard integer types in third_party/libaddressinput/chromium/.

third_party/libaddressinput/chromium/json.cc

 // Copyright 2013 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 "third_party/libaddressinput/src/cpp/src/util/json.h"
 
 #include <map>
 #include <utility>
 
-#include "base/basictypes.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 
 namespace i18n {
 namespace addressinput {
 
 namespace {
 
 // Returns |json| parsed into a JSON dictionary. Sets |parser_error| to true if
@@ skipping 78 matching lines @@
 
 bool Json::GetStringValueForKey(const std::string& key,
                                 std::string* value) const {
   return impl_->GetStringValueForKey(key, value);
 }
 
 Json::Json(JsonImpl* impl) : impl_(impl) {}
 
 }  // namespace addressinput
 }  // namespace i18n