diff options
Diffstat (limited to 'net/base/cookie_monster.h')
| -rw-r--r-- | net/base/cookie_monster.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h index 9c1a6f5..80f8b34 100644 --- a/net/base/cookie_monster.h +++ b/net/base/cookie_monster.h @@ -29,13 +29,13 @@ // Brought to you by the letter D and the number 2. -#ifndef NET_BASE_COOKIE_MONSTER_H__ -#define NET_BASE_COOKIE_MONSTER_H__ +#ifndef NET_BASE_COOKIE_MONSTER_H_ +#define NET_BASE_COOKIE_MONSTER_H_ +#include <map> #include <string> -#include <vector> #include <utility> -#include <map> +#include <vector> #include "base/basictypes.h" #include "base/lock.h" @@ -199,7 +199,7 @@ class CookieMonster { // Lock for thread-safety Lock lock_; - DISALLOW_EVIL_CONSTRUCTORS(CookieMonster); + DISALLOW_COPY_AND_ASSIGN(CookieMonster); }; class CookieMonster::ParsedCookie { @@ -208,7 +208,7 @@ class CookieMonster::ParsedCookie { typedef std::vector<TokenValuePair> PairList; // The maximum length of a cookie string we will try to parse - static const int kMaxCookieSize = 4096; + static const size_t kMaxCookieSize = 4096; // The maximum number of Token/Value pairs. Shouldn't have more than 8. static const int kMaxPairs = 16; @@ -267,11 +267,11 @@ class CookieMonster::CanonicalCookie { : name_(name), value_(value), path_(path), - secure_(secure), - httponly_(httponly), creation_date_(creation), + expiry_date_(expires), has_expires_(has_expires), - expiry_date_(expires) { + secure_(secure), + httponly_(httponly) { } // Supports the default copy constructor. @@ -306,8 +306,8 @@ class CookieMonster::CanonicalCookie { std::string value_; std::string path_; Time creation_date_; - bool has_expires_; Time expiry_date_; + bool has_expires_; bool secure_; bool httponly_; }; @@ -332,4 +332,4 @@ class CookieMonster::PersistentCookieStore { } // namespace net -#endif // NET_BASE_COOKIE_MONSTER_H__ +#endif // NET_BASE_COOKIE_MONSTER_H_ |