| Index: net/http/http_server_properties_manager.h
 | 
| diff --git a/net/http/http_server_properties_manager.h b/net/http/http_server_properties_manager.h
 | 
| index b4f06f4db7bc8f258e5a65ba24f26cf6d0fa7f06..ef881572c5a450828da79c7a82f1a2682415168f 100644
 | 
| --- a/net/http/http_server_properties_manager.h
 | 
| +++ b/net/http/http_server_properties_manager.h
 | 
| @@ -5,12 +5,14 @@
 | 
|  #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_
 | 
|  #define NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_
 | 
|  
 | 
| +#include <stdint.h>
 | 
| +
 | 
|  #include <string>
 | 
|  #include <vector>
 | 
|  
 | 
| -#include "base/basictypes.h"
 | 
|  #include "base/compiler_specific.h"
 | 
|  #include "base/gtest_prod_util.h"
 | 
| +#include "base/macros.h"
 | 
|  #include "base/memory/scoped_ptr.h"
 | 
|  #include "base/memory/weak_ptr.h"
 | 
|  #include "base/prefs/pref_change_registrar.h"
 | 
| @@ -116,7 +118,7 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
 | 
|    bool SetSpdySetting(const HostPortPair& host_port_pair,
 | 
|                        SpdySettingsIds id,
 | 
|                        SpdySettingsFlags flags,
 | 
| -                      uint32 value) override;
 | 
| +                      uint32_t value) override;
 | 
|    void ClearSpdySettings(const HostPortPair& host_port_pair) override;
 | 
|    void ClearAllSpdySettings() override;
 | 
|    const SpdySettingsMap& spdy_settings_map() const override;
 | 
| 
 |