libchromeos: Include base/macros.h instead of base/basictypes.h

libchromeos no longer uses the integer types from base/basictypes.h. It
should simply include base/macros.h for the DISALLOW_COPY_AND_ASSIGN
macro instead.

BUG=None
TEST=FEATURES=test emerge-link libchromeos

Change-Id: I6e036fb99ae6af18a72d52c784a4eba73a66bf2e
Reviewed-on: https://chromium-review.googlesource.com/216359
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

21 files changed, 25 insertions, 25 deletions

diff --git a/chromeos/asynchronous_signal_handler.h b/chromeos/asynchronous_signal_handler.h
index b803938..fdb0a0e 100644
--- a/chromeos/asynchronous_signal_handler.h
+++ b/chromeos/asynchronous_signal_handler.h
@@ -10,9 +10,9 @@
 
 #include <map>
 
-#include <base/basictypes.h>
 #include <base/callback.h>
 #include <base/compiler_specific.h>
+#include <base/macros.h>
 #include <base/memory/scoped_ptr.h>
 #include <base/message_loop/message_loop.h>
 #include <chromeos/chromeos_export.h>
diff --git a/chromeos/asynchronous_signal_handler_unittest.cc b/chromeos/asynchronous_signal_handler_unittest.cc
index 2928061..ca1c870 100644
--- a/chromeos/asynchronous_signal_handler_unittest.cc
+++ b/chromeos/asynchronous_signal_handler_unittest.cc
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include <base/at_exit.h>
-#include <base/basictypes.h>
 #include <base/bind.h>
+#include <base/macros.h>
 #include <base/message_loop/message_loop.h>
 #include <base/run_loop.h>
 #include <gtest/gtest.h>
diff --git a/chromeos/dbus/async_event_sequencer.h b/chromeos/dbus/async_event_sequencer.h
index 3936c30..ee10f28 100644
--- a/chromeos/dbus/async_event_sequencer.h
+++ b/chromeos/dbus/async_event_sequencer.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include <base/bind.h>
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <base/memory/ref_counted.h>
 #include <chromeos/chromeos_export.h>
 
diff --git a/chromeos/dbus/data_serialization.h b/chromeos/dbus/data_serialization.h
index 774a35e..5626ef4 100644
--- a/chromeos/dbus/data_serialization.h
+++ b/chromeos/dbus/data_serialization.h
@@ -50,8 +50,8 @@
 #include <utility>
 #include <vector>
 
-#include <chromeos/chromeos_export.h>
 #include <base/logging.h>
+#include <chromeos/chromeos_export.h>
 #include <dbus/message.h>
 
 namespace google {
diff --git a/chromeos/dbus/dbus_object.h b/chromeos/dbus/dbus_object.h
index 0c630b6..39df8f8 100644
--- a/chromeos/dbus/dbus_object.h
+++ b/chromeos/dbus/dbus_object.h
@@ -49,8 +49,8 @@ class MyDbusObject {
 #include <map>
 #include <string>
 
-#include <base/basictypes.h>
 #include <base/bind.h>
+#include <base/macros.h>
 #include <base/memory/weak_ptr.h>
 #include <chromeos/chromeos_export.h>
 #include <chromeos/dbus/async_event_sequencer.h>
diff --git a/chromeos/dbus/dbus_signal.h b/chromeos/dbus/dbus_signal.h
index e8d7398..17e7442 100644
--- a/chromeos/dbus/dbus_signal.h
+++ b/chromeos/dbus/dbus_signal.h
@@ -8,8 +8,8 @@
 #include <string>
 #include <typeinfo>
 
-#include <base/basictypes.h>
 #include <base/bind.h>
+#include <base/macros.h>
 #include <chromeos/chromeos_export.h>
 #include <chromeos/dbus/dbus_param_writer.h>
 #include <dbus/message.h>
diff --git a/chromeos/dbus/exported_property_set_unittest.cc b/chromeos/dbus/exported_property_set_unittest.cc
index db0d985..330cfce 100644
--- a/chromeos/dbus/exported_property_set_unittest.cc
+++ b/chromeos/dbus/exported_property_set_unittest.cc
@@ -7,8 +7,8 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
 #include <base/bind.h>
+#include <base/macros.h>
 #include <chromeos/dbus/dbus_object.h>
 #include <dbus/message.h>
 #include <dbus/property.h>
diff --git a/chromeos/errors/error.h b/chromeos/errors/error.h
index 1486836..612f37e 100644
--- a/chromeos/errors/error.h
+++ b/chromeos/errors/error.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/chromeos_export.h>
 
 namespace chromeos {
diff --git a/chromeos/glib/object.h b/chromeos/glib/object.h
index c27664e..eb8f9cb 100644
--- a/chromeos/glib/object.h
+++ b/chromeos/glib/object.h
@@ -8,8 +8,8 @@
 #include <glib-object.h>
 #include <stdint.h>
 
-#include <base/basictypes.h>
 #include <base/logging.h>
+#include <base/macros.h>
 #include <base/memory/scoped_ptr.h>
 
 #include <algorithm>
diff --git a/chromeos/http/http_connection.h b/chromeos/http/http_connection.h
index 286760a..1cbf62f 100644
--- a/chromeos/http/http_connection.h
+++ b/chromeos/http/http_connection.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/chromeos_export.h>
 #include <chromeos/errors/error.h>
 #include <chromeos/http/http_transport.h>
diff --git a/chromeos/http/http_connection_curl.h b/chromeos/http/http_connection_curl.h
index 5548cd3..021a779 100644
--- a/chromeos/http/http_connection_curl.h
+++ b/chromeos/http/http_connection_curl.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/chromeos_export.h>
 #include <chromeos/http/http_connection.h>
 #include <curl/curl.h>
diff --git a/chromeos/http/http_connection_fake.h b/chromeos/http/http_connection_fake.h
index d0a07a9..318bd3b 100644
--- a/chromeos/http/http_connection_fake.h
+++ b/chromeos/http/http_connection_fake.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/http/http_connection.h>
 #include <chromeos/http/http_transport_fake.h>
 
diff --git a/chromeos/http/http_request.h b/chromeos/http/http_request.h
index c18be79..83f0666 100644
--- a/chromeos/http/http_request.h
+++ b/chromeos/http/http_request.h
@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/chromeos_export.h>
 #include <chromeos/errors/error.h>
 #include <chromeos/http/http_connection.h>
diff --git a/chromeos/http/http_transport.h b/chromeos/http/http_transport.h
index 2e7aed5..4175296 100644
--- a/chromeos/http/http_transport.h
+++ b/chromeos/http/http_transport.h
@@ -10,7 +10,7 @@
 #include <utility>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/chromeos_export.h>
 #include <chromeos/errors/error.h>
 
diff --git a/chromeos/mime_utils.h b/chromeos/mime_utils.h
index dbc6d43..ce0c7fa 100644
--- a/chromeos/mime_utils.h
+++ b/chromeos/mime_utils.h
@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/chromeos_export.h>
 
 namespace chromeos {
diff --git a/chromeos/minijail/mock_minijail.h b/chromeos/minijail/mock_minijail.h
index 6bb9093..e0b2148 100644
--- a/chromeos/minijail/mock_minijail.h
+++ b/chromeos/minijail/mock_minijail.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <gmock/gmock.h>
 
 #include "libchromeos/chromeos/minijail/minijail.h"
diff --git a/chromeos/policy/device_policy.h b/chromeos/policy/device_policy.h
index abbc4f8..38bdbc3 100644
--- a/chromeos/policy/device_policy.h
+++ b/chromeos/policy/device_policy.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 
 #pragma GCC visibility push(default)
 
@@ -21,7 +21,7 @@ namespace policy {
 // It is also responsible for loading the policy blob from disk and verifying
 // the signature against the owner's key.
 //
-// This class defines the interface for queryng device policy on ChromeOS.
+// This class defines the interface for querying device policy on ChromeOS.
 // The implementation is hidden in DevicePolicyImpl to prevent protobuf
 // definition from leaking into the libraries using this interface.
 class DevicePolicy {
diff --git a/chromeos/policy/device_policy_impl.cc b/chromeos/policy/device_policy_impl.cc
index 1aab39a..483c45a 100644
--- a/chromeos/policy/device_policy_impl.cc
+++ b/chromeos/policy/device_policy_impl.cc
@@ -4,9 +4,9 @@
 
 #include "chromeos/policy/device_policy_impl.h"
 
-#include <base/basictypes.h>
 #include <base/file_util.h>
 #include <base/logging.h>
+#include <base/macros.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
diff --git a/chromeos/policy/device_policy_impl.h b/chromeos/policy/device_policy_impl.h
index 58819c0..484e78d 100644
--- a/chromeos/policy/device_policy_impl.h
+++ b/chromeos/policy/device_policy_impl.h
@@ -9,8 +9,8 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
 #include <base/files/file_path.h>
+#include <base/macros.h>
 
 #include "bindings/chrome_device_policy.pb.h"
 #include "bindings/device_management_backend.pb.h"
diff --git a/chromeos/policy/libpolicy.h b/chromeos/policy/libpolicy.h
index aac1a43..f05a37e 100644
--- a/chromeos/policy/libpolicy.h
+++ b/chromeos/policy/libpolicy.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <base/memory/scoped_ptr.h>
 
 #pragma GCC visibility push(default)
@@ -25,11 +25,11 @@ class PolicyProvider {
   PolicyProvider();
   virtual ~PolicyProvider();
 
-  // Contructor for tests only!
+  // Constructor for tests only!
   explicit PolicyProvider(DevicePolicy* device_policy);
 
-  // This function will ensure the freshnes of the contents that the getters
-  // are delivering. Normally contents are cached to prevent unneccessary load.
+  // This function will ensure the freshness of the contents that the getters
+  // are delivering. Normally contents are cached to prevent unnecessary load.
   virtual bool Reload();
 
   virtual bool device_policy_is_loaded() const;
diff --git a/chromeos/url_utils.h b/chromeos/url_utils.h
index 34b492e..d3bb1f4 100644
--- a/chromeos/url_utils.h
+++ b/chromeos/url_utils.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/chromeos_export.h>
 #include <chromeos/data_encoding.h>