summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorycxiao@chromium.org <ycxiao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 19:06:26 +0000
committerycxiao@chromium.org <ycxiao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 19:06:26 +0000
commit03d845f833e7f85ff8cdb4d6bb7c56aab2bc65e8 (patch)
tree24b6f95ffb2e3c90e53fb52d7e95210221e85c0b /net/base
parent3529138ef50534cf1d4ee99e5de32158a2bda83a (diff)
downloadchromium_src-03d845f833e7f85ff8cdb4d6bb7c56aab2bc65e8.zip
chromium_src-03d845f833e7f85ff8cdb4d6bb7c56aab2bc65e8.tar.gz
chromium_src-03d845f833e7f85ff8cdb4d6bb7c56aab2bc65e8.tar.bz2
Change CanGetCookies signature, add CookieList as parameters in order to remove the getting cookies call inside ResourceDispatcherHost::CanGetCookies.
BUG=68657 TEST=XXXX Review URL: http://codereview.chromium.org/7461121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/cookie_store_test_helpers.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/base/cookie_store_test_helpers.cc b/net/base/cookie_store_test_helpers.cc
index 8ab3e1a..c74133e 100644
--- a/net/base/cookie_store_test_helpers.cc
+++ b/net/base/cookie_store_test_helpers.cc
@@ -141,8 +141,7 @@ void DelayedCookieMonster::DeleteCookieAsync(const GURL& url,
}
CookieMonster* DelayedCookieMonster::GetCookieMonster() {
- ADD_FAILURE();
- return NULL;
+ return cookie_monster_;
}
} // namespace net