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

5 files changed, 5 insertions, 8 deletions

diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h
index 137c914..5ecd0f8 100644
--- a/net/base/network_delegate.h
+++ b/net/base/network_delegate.h
@@ -12,6 +12,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "net/base/auth.h"
 #include "net/base/completion_callback.h"
+#include "net/cookies/canonical_cookie.h"
 
 class FilePath;
 class GURL;
@@ -28,7 +29,6 @@ namespace net {
 // NOTE: It is not okay to add any compile-time dependencies on symbols outside
 // of net/base here, because we have a net_base library. Forward declarations
 // are ok.
-class CookieList;
 class CookieOptions;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
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
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index f405de2..a401c58 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -23,6 +23,7 @@
 #include "net/base/net_log.h"
 #include "net/base/network_delegate.h"
 #include "net/base/request_priority.h"
+#include "net/cookies/canonical_cookie.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/url_request/url_request_status.h"
@@ -84,7 +85,6 @@ class BlobURLRequestJobTest;
 
 namespace net {
 
-class CookieList;
 class CookieOptions;
 class HostPortPair;
 class IOBuffer;
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index e392c76..92ceb14 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -17,12 +17,12 @@
 #include "net/base/host_port_pair.h"
 #include "net/base/load_states.h"
 #include "net/base/net_export.h"
+#include "net/cookies/canonical_cookie.h"
 
 namespace net {
 
 class AuthChallengeInfo;
 class AuthCredentials;
-class CookieList;
 class CookieOptions;
 class HttpRequestHeaders;
 class HttpResponseInfo;