Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(871)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/url_request/url_request_unittest.cc

Issue 9572001: Do cookie checks in NetworkDelegate instead of the URLRequest::Delegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clang fix Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/url_request/url_request.cc ('K') | « net/url_request/url_request_test_util.cc ('k') | webkit/appcache/appcache_service.h » ('j') | webkit/appcache/appcache_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index caeaf71cbc6df57b4297df21e05f15b971668819..29f2d257aaef30723177bd8604dd9fc1f32ad7e6 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -2561,7 +2561,9 @@ TEST_F(URLRequestTest, DelayedCookieCallback) {
LocalHttpTestServer test_server;
ASSERT_TRUE(test_server.Start());
+ TestNetworkDelegate network_delegate; // must outlive URLRequests
scoped_refptr<URLRequestContext> context(new TestURLRequestContext());
+ context->set_network_delegate(&network_delegate);
scoped_refptr<DelayedCookieMonster> delayed_cm =
new DelayedCookieMonster();
scoped_refptr<CookieStore> cookie_store = delayed_cm;
@@ -2574,13 +2576,14 @@ TEST_F(URLRequestTest, DelayedCookieCallback) {
req.set_context(context);
req.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
- EXPECT_EQ(1, d.set_cookie_count());
+ EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
+ EXPECT_EQ(0, network_delegate.blocked_set_cookie_count());
+ EXPECT_EQ(1, network_delegate.set_cookie_count());
}
// Verify that the cookie is set.
{
+ network_delegate.ResetCookieCounters();
willchan no longer on Chromium 2012/03/01 20:30:10 I don't know that I like this as much. Can we just
TestDelegate d;
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_context(context);
@@ -2589,8 +2592,8 @@ TEST_F(URLRequestTest, DelayedCookieCallback) {
EXPECT_TRUE(d.data_received().find("CookieToNotSend=1")
!= std::string::npos);
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
+ EXPECT_EQ(0, network_delegate.blocked_set_cookie_count());
}
}
@@ -2605,12 +2608,13 @@ TEST_F(URLRequestTest, DoNotSendCookies) {
req.set_context(default_context_);
req.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
// Verify that the cookie is set.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_context(default_context_);
@@ -2619,12 +2623,13 @@ TEST_F(URLRequestTest, DoNotSendCookies) {
EXPECT_TRUE(d.data_received().find("CookieToNotSend=1")
!= std::string::npos);
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
// Verify that the cookie isn't sent when LOAD_DO_NOT_SEND_COOKIES is set.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_load_flags(LOAD_DO_NOT_SEND_COOKIES);
@@ -2636,8 +2641,8 @@ TEST_F(URLRequestTest, DoNotSendCookies) {
== std::string::npos);
// LOAD_DO_NOT_SEND_COOKIES does not trigger OnGetCookies.
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
}
@@ -2653,13 +2658,14 @@ TEST_F(URLRequestTest, DoNotSaveCookies) {
req.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
- EXPECT_EQ(1, d.set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
+ EXPECT_EQ(1, default_network_delegate_.set_cookie_count());
}
// Try to set-up another cookie and update the previous cookie.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
URLRequest req(test_server.GetURL(
"set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
@@ -2670,13 +2676,14 @@ TEST_F(URLRequestTest, DoNotSaveCookies) {
MessageLoop::current()->Run();
// LOAD_DO_NOT_SAVE_COOKIES does not trigger OnSetCookie.
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
- EXPECT_EQ(0, d.set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.set_cookie_count());
}
// Verify the cookies weren't saved or updated.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_context(default_context_);
@@ -2688,9 +2695,9 @@ TEST_F(URLRequestTest, DoNotSaveCookies) {
EXPECT_TRUE(d.data_received().find("CookieToNotUpdate=2")
!= std::string::npos);
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
- EXPECT_EQ(0, d.set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.set_cookie_count());
}
}
@@ -2706,12 +2713,13 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) {
req.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
// Verify that the cookie is set.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_context(default_context_);
@@ -2721,14 +2729,16 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) {
EXPECT_TRUE(d.data_received().find("CookieToNotSend=1")
!= std::string::npos);
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
// Verify that the cookie isn't sent.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
- d.set_cookie_options(TestDelegate::NO_GET_COOKIES);
+ default_network_delegate_.set_cookie_options(
+ TestNetworkDelegate::NO_GET_COOKIES);
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_context(default_context_);
req.Start();
@@ -2737,8 +2747,8 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) {
EXPECT_TRUE(d.data_received().find("Cookie: CookieToNotSend=1")
== std::string::npos);
- EXPECT_EQ(1, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(1, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
}
@@ -2754,14 +2764,16 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) {
req.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
// Try to set-up another cookie and update the previous cookie.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
- d.set_cookie_options(TestDelegate::NO_SET_COOKIE);
+ default_network_delegate_.set_cookie_options(
+ TestNetworkDelegate::NO_SET_COOKIE);
URLRequest req(test_server.GetURL(
"set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
req.set_context(default_context_);
@@ -2769,13 +2781,14 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) {
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(2, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(2, default_network_delegate_.blocked_set_cookie_count());
}
// Verify the cookies weren't saved or updated.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_context(default_context_);
@@ -2787,8 +2800,8 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) {
EXPECT_TRUE(d.data_received().find("CookieToNotUpdate=2")
!= std::string::npos);
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
}
@@ -2804,9 +2817,9 @@ TEST_F(URLRequestTest, DoNotSaveEmptyCookies) {
req.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
- EXPECT_EQ(0, d.set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.set_cookie_count());
}
}
@@ -2822,12 +2835,13 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) {
req.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
// Verify that the cookie is set.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_context(default_context_);
@@ -2837,14 +2851,16 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) {
EXPECT_TRUE(d.data_received().find("CookieToNotSend=1")
!= std::string::npos);
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
// Verify that the cookie isn't sent.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
- d.set_cookie_options(TestDelegate::NO_GET_COOKIES);
+ default_network_delegate_.set_cookie_options(
+ TestNetworkDelegate::NO_GET_COOKIES);
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_context(default_context_);
req.Start();
@@ -2853,8 +2869,8 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) {
EXPECT_TRUE(d.data_received().find("Cookie: CookieToNotSend=1")
== std::string::npos);
- EXPECT_EQ(1, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(1, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
}
@@ -2870,14 +2886,16 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) {
req.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
// Try to set-up another cookie and update the previous cookie.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
- d.set_cookie_options(TestDelegate::NO_SET_COOKIE);
+ default_network_delegate_.set_cookie_options(
+ TestNetworkDelegate::NO_SET_COOKIE);
URLRequest req(test_server.GetURL(
"set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
req.set_context(default_context_);
@@ -2885,12 +2903,13 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) {
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(2, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(2, default_network_delegate_.blocked_set_cookie_count());
}
// Verify the cookies weren't saved or updated.
{
+ default_network_delegate_.ResetCookieCounters();
TestDelegate d;
TestURLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
req.set_context(default_context_);
@@ -2902,8 +2921,8 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) {
EXPECT_TRUE(d.data_received().find("CookieToNotUpdate=2")
!= std::string::npos);
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
}
@@ -2921,7 +2940,8 @@ TEST_F(URLRequestTest, CookiePolicy_ForceSession) {
// Set up a cookie.
{
TestDelegate d;
- d.set_cookie_options(TestDelegate::FORCE_SESSION);
+ default_network_delegate_.set_cookie_options(
+ TestNetworkDelegate::FORCE_SESSION);
URLRequest req(test_server.GetURL(
"set-cookie?A=1;expires=\"Fri, 05 Feb 2010 23:42:01 GMT\""), &d);
req.set_context(default_context_);
@@ -2929,8 +2949,8 @@ TEST_F(URLRequestTest, CookiePolicy_ForceSession) {
MessageLoop::current()->Run();
- EXPECT_EQ(0, d.blocked_get_cookies_count());
- EXPECT_EQ(0, d.blocked_set_cookie_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_get_cookies_count());
+ EXPECT_EQ(0, default_network_delegate_.blocked_set_cookie_count());
}
// Now, check the cookie store.
« net/url_request/url_request.cc ('K') | « net/url_request/url_request_test_util.cc ('k') | webkit/appcache/appcache_service.h » ('j') | webkit/appcache/appcache_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698