Mojo: Change includes of "base/basictypes.h" to <stdint.h> and/or "base/macros.h" in mojo/system.

R=sky@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286001 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 23 insertions, 24 deletions

diff --git a/mojo/system/channel.cc b/mojo/system/channel.cc
index a311695..47d06f2 100644
--- a/mojo/system/channel.cc
+++ b/mojo/system/channel.cc
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/embedder/platform_handle_vector.h"
 #include "mojo/system/message_pipe_endpoint.h"
diff --git a/mojo/system/channel.h b/mojo/system/channel.h
index 859e242e..ac71b3e 100644
--- a/mojo/system/channel.h
+++ b/mojo/system/channel.h
@@ -7,9 +7,9 @@
 
 #include <stdint.h>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
diff --git a/mojo/system/core.h b/mojo/system/core.h
index 963081c..c71720c 100644
--- a/mojo/system/core.h
+++ b/mojo/system/core.h
@@ -5,8 +5,9 @@
 #ifndef MOJO_SYSTEM_CORE_H_
 #define MOJO_SYSTEM_CORE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "mojo/public/c/system/buffer.h"
diff --git a/mojo/system/core_test_base.h b/mojo/system/core_test_base.h
index 9f5bae7..03999b2 100644
--- a/mojo/system/core_test_base.h
+++ b/mojo/system/core_test_base.h
@@ -5,8 +5,8 @@
 #ifndef MOJO_SYSTEM_CORE_TEST_BASE_H_
 #define MOJO_SYSTEM_CORE_TEST_BASE_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "mojo/public/c/system/types.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/system/core_unittest.cc b/mojo/system/core_unittest.cc
index c16268e..d0f3385 100644
--- a/mojo/system/core_unittest.cc
+++ b/mojo/system/core_unittest.cc
@@ -4,9 +4,10 @@
 
 #include "mojo/system/core.h"
 
+#include <stdint.h>
+
 #include <limits>
 
-#include "base/basictypes.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "mojo/system/core_test_base.h"
diff --git a/mojo/system/data_pipe_consumer_dispatcher.h b/mojo/system/data_pipe_consumer_dispatcher.h
index f738761..e840030 100644
--- a/mojo/system/data_pipe_consumer_dispatcher.h
+++ b/mojo/system/data_pipe_consumer_dispatcher.h
@@ -5,8 +5,7 @@
 #ifndef MOJO_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
 #define MOJO_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "mojo/system/dispatcher.h"
 #include "mojo/system/system_impl_export.h"
diff --git a/mojo/system/data_pipe_producer_dispatcher.h b/mojo/system/data_pipe_producer_dispatcher.h
index 9b7b375..bb172e3 100644
--- a/mojo/system/data_pipe_producer_dispatcher.h
+++ b/mojo/system/data_pipe_producer_dispatcher.h
@@ -5,8 +5,7 @@
 #ifndef MOJO_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_
 #define MOJO_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "mojo/system/dispatcher.h"
 #include "mojo/system/system_impl_export.h"
diff --git a/mojo/system/data_pipe_unittest.cc b/mojo/system/data_pipe_unittest.cc
index 52c09a3..373bf76 100644
--- a/mojo/system/data_pipe_unittest.cc
+++ b/mojo/system/data_pipe_unittest.cc
@@ -5,10 +5,10 @@
 #include "mojo/system/data_pipe.h"
 
 #include <stddef.h>
+#include <stdint.h>
 
 #include <limits>
 
-#include "base/basictypes.h"
 #include "mojo/system/constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/system/dispatcher_unittest.cc b/mojo/system/dispatcher_unittest.cc
index 45ef9f6..10cf4f5 100644
--- a/mojo/system/dispatcher_unittest.cc
+++ b/mojo/system/dispatcher_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "mojo/system/dispatcher.h"
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/waitable_event.h"
diff --git a/mojo/system/handle_table.cc b/mojo/system/handle_table.cc
index 9ab2d24..cc5f2e3 100644
--- a/mojo/system/handle_table.cc
+++ b/mojo/system/handle_table.cc
@@ -4,8 +4,8 @@
 
 #include "mojo/system/handle_table.h"
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "mojo/system/constants.h"
 #include "mojo/system/dispatcher.h"
 
diff --git a/mojo/system/local_data_pipe.h b/mojo/system/local_data_pipe.h
index b63df20..189db098 100644
--- a/mojo/system/local_data_pipe.h
+++ b/mojo/system/local_data_pipe.h
@@ -5,7 +5,7 @@
 #ifndef MOJO_SYSTEM_LOCAL_DATA_PIPE_H_
 #define MOJO_SYSTEM_LOCAL_DATA_PIPE_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/aligned_memory.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/mojo/system/local_data_pipe_unittest.cc b/mojo/system/local_data_pipe_unittest.cc
index 1047935..c55ee76 100644
--- a/mojo/system/local_data_pipe_unittest.cc
+++ b/mojo/system/local_data_pipe_unittest.cc
@@ -6,7 +6,7 @@
 
 #include <string.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "mojo/system/data_pipe.h"
 #include "mojo/system/waiter.h"
diff --git a/mojo/system/message_pipe_dispatcher.h b/mojo/system/message_pipe_dispatcher.h
index b06001c..45639a3 100644
--- a/mojo/system/message_pipe_dispatcher.h
+++ b/mojo/system/message_pipe_dispatcher.h
@@ -7,8 +7,7 @@
 
 #include <utility>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "mojo/system/dispatcher.h"
 #include "mojo/system/memory.h"
diff --git a/mojo/system/raw_channel_posix.cc b/mojo/system/raw_channel_posix.cc
index ba23599..8fbcff0 100644
--- a/mojo/system/raw_channel_posix.cc
+++ b/mojo/system/raw_channel_posix.cc
@@ -11,11 +11,10 @@
 #include <algorithm>
 #include <deque>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
-#include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
diff --git a/mojo/system/remote_message_pipe_unittest.cc b/mojo/system/remote_message_pipe_unittest.cc
index c9bd63d..c0a78ff 100644
--- a/mojo/system/remote_message_pipe_unittest.cc
+++ b/mojo/system/remote_message_pipe_unittest.cc
@@ -8,7 +8,6 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ -16,6 +15,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "build/build_config.h"  // TODO(vtl): Remove this.
diff --git a/mojo/system/simple_dispatcher.h b/mojo/system/simple_dispatcher.h
index 65d52fe..7a06b2b 100644
--- a/mojo/system/simple_dispatcher.h
+++ b/mojo/system/simple_dispatcher.h
@@ -7,7 +7,7 @@
 
 #include <list>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "mojo/system/dispatcher.h"
 #include "mojo/system/handle_signals_state.h"
 #include "mojo/system/system_impl_export.h"
diff --git a/mojo/system/simple_dispatcher_unittest.cc b/mojo/system/simple_dispatcher_unittest.cc
index 648cab9..778e7e2 100644
--- a/mojo/system/simple_dispatcher_unittest.cc
+++ b/mojo/system/simple_dispatcher_unittest.cc
@@ -9,8 +9,8 @@
 
 #include "mojo/system/simple_dispatcher.h"
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/lock.h"
diff --git a/mojo/system/waiter_unittest.cc b/mojo/system/waiter_unittest.cc
index 3afef28..53f8ec4 100644
--- a/mojo/system/waiter_unittest.cc
+++ b/mojo/system/waiter_unittest.cc
@@ -9,8 +9,9 @@
 
 #include "mojo/system/waiter.h"
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "base/threading/simple_thread.h"