| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index 20c7e772eb877683e101b91d49fc4259d9ef6379..6465852de6ad53ca9162bb1c7090b4c4dc395551 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -5,18 +5,21 @@
|
| #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
|
| #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/callback_forward.h"
|
| #include "base/files/file_path.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/prefs/pref_member.h"
|
| #include "base/synchronization/lock.h"
|
| +#include "build/build_config.h"
|
| #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
|
| #include "chrome/browser/devtools/devtools_network_controller_handle.h"
|
| #include "chrome/browser/io_thread.h"
|
| @@ -409,7 +412,7 @@ class ProfileIOData {
|
| net::URLRequestContext* GetRequestContext() override;
|
| scoped_ptr<net::ClientCertStore> CreateClientCertStore() override;
|
| void CreateKeygenHandler(
|
| - uint32 key_size_in_bits,
|
| + uint32_t key_size_in_bits,
|
| const std::string& challenge_string,
|
| const GURL& url,
|
| const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback)
|
|
|