Remove base/basictypes.h.

BUG=138542
TBR=mark@chromium.org

Review URL: https://codereview.chromium.org/1550063002

Cr-Commit-Position: refs/heads/master@{#366958}

8 files changed, 3 insertions, 37 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index b9463e0..7a95a2f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -211,7 +211,6 @@ target(base_target_type, "base") {
     "base64url.h",
     "base_export.h",
     "base_switches.h",
-    "basictypes.h",
     "big_endian.cc",
     "big_endian.h",
     "bind.h",
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn
index 04ca97c..018aa46 100644
--- a/base/allocator/BUILD.gn
+++ b/base/allocator/BUILD.gn
@@ -126,7 +126,6 @@ if (use_allocator == "tcmalloc") {
       "$tcmalloc_dir/src/base/atomicops-internals-windows.h",
       "$tcmalloc_dir/src/base/atomicops.h",
       "$tcmalloc_dir/src/base/atomicops_internals_portable.h",
-      "$tcmalloc_dir/src/base/basictypes.h",
       "$tcmalloc_dir/src/base/commandlineflags.h",
       "$tcmalloc_dir/src/base/cycleclock.h",
 
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 414e510..fa3b541 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -108,7 +108,6 @@
             '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h',
             '<(tcmalloc_dir)/src/base/atomicops_internals_portable.h',
             '<(tcmalloc_dir)/src/base/atomicops.h',
-            '<(tcmalloc_dir)/src/base/basictypes.h',
             '<(tcmalloc_dir)/src/base/commandlineflags.h',
             '<(tcmalloc_dir)/src/base/cycleclock.h',
             # We don't list dynamic_annotations.c since its copy is already
@@ -232,7 +231,6 @@
             '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h',
             '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h',
             '<(tcmalloc_dir)/src/base/atomicops.h',
-            '<(tcmalloc_dir)/src/base/basictypes.h',
             '<(tcmalloc_dir)/src/base/commandlineflags.h',
             '<(tcmalloc_dir)/src/base/cycleclock.h',
             '<(tcmalloc_dir)/src/base/elf_mem_image.h',
diff --git a/base/base.gypi b/base/base.gypi
index 80771c3..2148f74 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -111,7 +111,6 @@
           'base_paths_win.cc',
           'base_paths_win.h',
           'base_switches.h',
-          'basictypes.h',
           'big_endian.cc',
           'big_endian.h',
           'bind.h',
diff --git a/base/basictypes.h b/base/basictypes.h
deleted file mode 100644
index eba9753..0000000
--- a/base/basictypes.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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.
-
-#ifndef BASE_BASICTYPES_H_
-#define BASE_BASICTYPES_H_
-
-#include <limits.h>  // So we can set the bounds of our types.
-#include <stddef.h>  // For size_t.
-#include <stdint.h>  // For intptr_t.
-
-#include "base/macros.h"
-#include "build/build_config.h"
-
-// DEPRECATED: Use (u)int{8,16,32,64}_t instead (and include <stdint.h>).
-// http://crbug.com/138542
-typedef int8_t int8;
-typedef uint8_t uint8;
-typedef int16_t int16;
-typedef uint16_t uint16;
-typedef int32_t int32;
-typedef uint32_t uint32;
-typedef int64_t int64;
-typedef uint64_t uint64;
-
-#endif  // BASE_BASICTYPES_H_
diff --git a/base/callback_list_unittest.nc b/base/callback_list_unittest.nc
index fd83d02..45ac994 100644
--- a/base/callback_list_unittest.nc
+++ b/base/callback_list_unittest.nc
@@ -7,7 +7,6 @@
 
 #include "base/callback_list.h"
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
diff --git a/base/memory/scoped_ptr_unittest.nc b/base/memory/scoped_ptr_unittest.nc
index 24e2c43..ebbfdb6 100644
--- a/base/memory/scoped_ptr_unittest.nc
+++ b/base/memory/scoped_ptr_unittest.nc
@@ -5,7 +5,7 @@
 // This is a "No Compile Test" suite.
 // http://dev.chromium.org/developers/testing/no-compile-tests
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
 
diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py
index 8039538..634d61f 100755
--- a/components/policy/tools/generate_policy_source.py
+++ b/components/policy/tools/generate_policy_source.py
@@ -298,7 +298,6 @@ def _WritePolicyConstantHeader(policies, os, f, riskTags):
           '\n'
           '#include <string>\n'
           '\n'
-          '#include "base/basictypes.h"\n'
           '#include "base/values.h"\n'
           '#include "components/policy/core/common/policy_details.h"\n'
           '#include "components/policy/core/common/policy_map.h"\n'
@@ -858,7 +857,7 @@ def _WritePolicyRiskTagHeader(policies, os, f, riskTags):
   f.write('#ifndef CHROME_COMMON_POLICY_RISK_TAG_H_\n'
           '#define CHROME_COMMON_POLICY_RISK_TAG_H_\n'
           '\n'
-          '#include "base/basictypes.h"\n'
+          '#include <stddef.h>\n'
           '\n'
           'namespace policy {\n'
           '\n' + \
@@ -1000,7 +999,6 @@ CPP_HEAD = '''
 #include <limits>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
@@ -1025,7 +1023,7 @@ base::Value* DecodeIntegerValue(google::protobuf::int64 value) {
       value > std::numeric_limits<int>::max()) {
     LOG(WARNING) << "Integer value " << value
                  << " out of numeric limits, ignoring.";
-    return NULL;
+    return nullptr;
   }
 
   return new base::FundamentalValue(static_cast<int>(value));