Switch to standard integer types in chrome/browser/chromeos/.
BUG=138542
[email protected]
Review URL: https://codereview.chromium.org/1547093002
Cr-Commit-Position: refs/heads/master@{#366838}
diff --git a/chrome/browser/chromeos/settings/cros_settings.cc b/chrome/browser/chromeos/settings/cros_settings.cc
index 76cc290..0e3c7ea0 100644
--- a/chrome/browser/chromeos/settings/cros_settings.cc
+++ b/chrome/browser/chromeos/settings/cros_settings.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/command_line.h"
#include "base/logging.h"
diff --git a/chrome/browser/chromeos/settings/cros_settings.h b/chrome/browser/chromeos/settings/cros_settings.h
index 366e15c..569eb3f 100644
--- a/chrome/browser/chromeos/settings/cros_settings.h
+++ b/chrome/browser/chromeos/settings/cros_settings.h
@@ -11,6 +11,7 @@
#include "base/callback_forward.h"
#include "base/callback_list.h"
#include "base/containers/hash_tables.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "chromeos/settings/cros_settings_names.h"
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service.h b/chrome/browser/chromeos/settings/device_oauth2_token_service.h
index b763daf..d3182eaf 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service.h
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/callback.h"
+#include "base/macros.h"
#include "chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h"
#include "google_apis/gaia/oauth2_token_service.h"
#include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h b/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h
index 7a8bd6b7..011c19f 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/stl_util.h"
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h b/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
index ccb370b..11bce88 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
@@ -8,7 +8,7 @@
#include <queue>
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
index 84607588..21e7019 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
+#include <stdint.h>
+
#include "base/message_loop/message_loop.h"
#include "base/prefs/testing_pref_service.h"
#include "base/run_loop.h"
@@ -76,7 +78,7 @@
}
void SetUpWithPendingSalt() {
- fake_cryptohome_client_->set_system_salt(std::vector<uint8>());
+ fake_cryptohome_client_->set_system_salt(std::vector<uint8_t>());
fake_cryptohome_client_->SetServiceIsAvailable(false);
SetUpDefaultValues();
}
@@ -334,7 +336,7 @@
}
TEST_F(DeviceOAuth2TokenServiceTest, RefreshTokenValidation_NoSalt) {
- fake_cryptohome_client_->set_system_salt(std::vector<uint8>());
+ fake_cryptohome_client_->set_system_salt(std::vector<uint8_t>());
fake_cryptohome_client_->SetServiceIsAvailable(true);
SetUpDefaultValues();
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index c78e9fe..5abbff3 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -4,10 +4,13 @@
#include "chrome/browser/chromeos/settings/device_settings_provider.h"
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/metrics/histogram.h"
#include "base/prefs/pref_service.h"
#include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.h b/chrome/browser/chromeos/settings/device_settings_provider.h
index c5eddfb..5f1e8b4 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.h
+++ b/chrome/browser/chromeos/settings/device_settings_provider.h
@@ -8,9 +8,9 @@
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/gtest_prod_util.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/prefs/pref_value_map.h"
#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
index 7315a5d4..052f80b 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/files/file_util.h"
+#include "base/macros.h"
#include "base/path_service.h"
#include "base/test/scoped_path_override.h"
#include "base/values.h"
diff --git a/chrome/browser/chromeos/settings/device_settings_service.h b/chrome/browser/chromeos/settings/device_settings_service.h
index d15956d..11eca816 100644
--- a/chrome/browser/chromeos/settings/device_settings_service.h
+++ b/chrome/browser/chromeos/settings/device_settings_service.h
@@ -9,9 +9,9 @@
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
index a2e7b56..b25dbf6 100644
--- a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
@@ -4,10 +4,12 @@
#include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
@@ -203,7 +205,7 @@
CheckPolicy();
// Check the new key has been loaded.
- std::vector<uint8> key;
+ std::vector<uint8_t> key;
ASSERT_TRUE(device_policy_.GetNewSigningKey()->ExportPublicKey(&key));
EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
}
@@ -236,7 +238,7 @@
EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
- std::vector<uint8> key;
+ std::vector<uint8_t> key;
ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
@@ -282,7 +284,7 @@
EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
- std::vector<uint8> key;
+ std::vector<uint8_t> key;
ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
@@ -323,7 +325,7 @@
EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
- std::vector<uint8> key;
+ std::vector<uint8_t> key;
ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
@@ -361,7 +363,7 @@
EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
- std::vector<uint8> key;
+ std::vector<uint8_t> key;
ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
@@ -402,7 +404,7 @@
EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());
ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
- std::vector<uint8> key;
+ std::vector<uint8_t> key;
ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index b191eb9..cb36b6a 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/chromeos/settings/session_manager_operation.h b/chrome/browser/chromeos/settings/session_manager_operation.h
index 6a9af8ed..01c9568 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation.h
+++ b/chrome/browser/chromeos/settings/session_manager_operation.h
@@ -5,8 +5,8 @@
#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_
#define CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_validator.h"
diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
index 5a63d61..75884a7 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
+++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
@@ -4,12 +4,14 @@
#include "chrome/browser/chromeos/settings/session_manager_operation.h"
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
@@ -77,7 +79,7 @@
void CheckPublicKeyLoaded(SessionManagerOperation* op) {
ASSERT_TRUE(op->public_key().get());
ASSERT_TRUE(op->public_key()->is_loaded());
- std::vector<uint8> public_key;
+ std::vector<uint8_t> public_key;
ASSERT_TRUE(policy_.GetSigningKey()->ExportPublicKey(&public_key));
EXPECT_EQ(public_key, op->public_key()->data());
}
diff --git a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h
index 4d54a3e..bff65d1 100644
--- a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h
+++ b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "base/prefs/pref_value_map.h"
#include "chromeos/settings/cros_settings_provider.h"
diff --git a/chrome/browser/chromeos/settings/system_settings_provider.h b/chrome/browser/chromeos/settings/system_settings_provider.h
index 91834c8..886f811 100644
--- a/chrome/browser/chromeos/settings/system_settings_provider.h
+++ b/chrome/browser/chromeos/settings/system_settings_provider.h
@@ -8,6 +8,7 @@
#include <string>
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "chromeos/settings/cros_settings_provider.h"
#include "chromeos/settings/timezone_settings.h"
diff --git a/chrome/browser/chromeos/settings/token_encryptor.cc b/chrome/browser/chromeos/settings/token_encryptor.cc
index dbe26c5..8ff42eeb 100644
--- a/chrome/browser/chromeos/settings/token_encryptor.cc
+++ b/chrome/browser/chromeos/settings/token_encryptor.cc
@@ -4,6 +4,9 @@
#include "chrome/browser/chromeos/settings/token_encryptor.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <vector>
#include "base/logging.h"
@@ -97,7 +100,7 @@
crypto::SymmetricKey* key,
const std::string& salt,
const std::string& encrypted_token_hex) {
- std::vector<uint8> encrypted_token_bytes;
+ std::vector<uint8_t> encrypted_token_bytes;
if (!base::HexStringToBytes(encrypted_token_hex, &encrypted_token_bytes)) {
LOG(WARNING) << "Corrupt encrypted token found.";
return std::string();
diff --git a/chrome/browser/chromeos/settings/token_encryptor.h b/chrome/browser/chromeos/settings/token_encryptor.h
index 057d344..00d8edc 100644
--- a/chrome/browser/chromeos/settings/token_encryptor.h
+++ b/chrome/browser/chromeos/settings/token_encryptor.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
namespace crypto {
