summaryrefslogtreecommitdiffstats
path: root/net/cookies
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 13:54:38 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 13:54:38 +0000
commit8da4b181bb0e611e1f6ce2880b5ebcfec7efa99f (patch)
tree2981a415045b6475c27fff558d1213459c7fbe7a /net/cookies
parent06b8914b3a620f1d7d16c52422fec03116fd9c7b (diff)
downloadchromium_src-8da4b181bb0e611e1f6ce2880b5ebcfec7efa99f.zip
chromium_src-8da4b181bb0e611e1f6ce2880b5ebcfec7efa99f.tar.gz
chromium_src-8da4b181bb0e611e1f6ce2880b5ebcfec7efa99f.tar.bz2
Do not inherit from std::vector.
vector does not have a virtual destructor, see Item 7 from of Effective STL from Scott Meyers for a detailed explanation. BUG=135335 R=markusheintz@chromium.org,willchan@chromium.org TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10796081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cookies')
-rw-r--r--net/cookies/canonical_cookie.h4
-rw-r--r--net/cookies/cookie_monster.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/net/cookies/canonical_cookie.h b/net/cookies/canonical_cookie.h
index 4a710b2..ff07ec6 100644
--- a/net/cookies/canonical_cookie.h
+++ b/net/cookies/canonical_cookie.h
@@ -20,7 +20,6 @@ class ParsedCookie;
class NET_EXPORT CanonicalCookie {
public:
-
// These constructors do no validation or canonicalization of their inputs;
// the resulting CanonicalCookies should not be relied on to be canonical
// unless the caller has done appropriate validation and canonicalization
@@ -148,8 +147,7 @@ class NET_EXPORT CanonicalCookie {
bool httponly_;
};
-class CookieList : public std::vector<CanonicalCookie> {
-};
+typedef std::vector<CanonicalCookie> CookieList;
} // namespace net
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
index ef5f9ab..4950e7a 100644
--- a/net/cookies/cookie_monster.h
+++ b/net/cookies/cookie_monster.h
@@ -22,6 +22,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "base/time.h"
+#include "net/cookies/canonical_cookie.h"
#include "net/cookies/cookie_store.h"
#include "net/base/net_export.h"
@@ -34,8 +35,6 @@ class TimeTicks;
namespace net {
-class CanonicalCookie;
-class CookieList;
class ParsedCookie;
// The cookie monster is the system for storing and retrieving cookies. It has