| Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
|
| index 37959015646a21e6a3af71b7a80ef2b15b8a8698..e383d94a4dbfed61a2859205333629343d7f1db6 100644
|
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
|
| @@ -4,12 +4,14 @@
|
|
|
| #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <algorithm>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/prefs/pref_registry_simple.h"
|
| #include "base/prefs/testing_pref_service.h"
|
| @@ -739,7 +741,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentBlankSystemSaltTest
|
| protected:
|
| DeviceCloudPolicyManagerChromeOSEnrollmentBlankSystemSaltTest() {
|
| // Set up a FakeCryptohomeClient with a blank system salt.
|
| - fake_cryptohome_client_->set_system_salt(std::vector<uint8>());
|
| + fake_cryptohome_client_->set_system_salt(std::vector<uint8_t>());
|
| }
|
| };
|
|
|
|
|