| Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
|
| index df16843623c507cab69528cabec4555905a3e901..46f8ff1806eea65fbb54f23e4f88e17701bb99d8 100644
|
| --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
|
| @@ -2,15 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| #include "base/json/json_writer.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/ref_counted_memory.h"
|
| @@ -655,7 +657,7 @@ class UserImageManagerPolicyTest : public UserImageManagerTest,
|
| const base::FilePath user_key_file =
|
| user_keys_dir.AppendASCII(sanitized_username)
|
| .AppendASCII("policy.pub");
|
| - std::vector<uint8> user_key_bits;
|
| + std::vector<uint8_t> user_key_bits;
|
| ASSERT_TRUE(user_policy_.GetSigningKey()->ExportPublicKey(&user_key_bits));
|
| ASSERT_TRUE(base::CreateDirectory(user_key_file.DirName()));
|
| ASSERT_EQ(base::WriteFile(
|
|
|