summaryrefslogtreecommitdiffstats
path: root/chrome/browser/fast_shutdown_uitest.cc
diff options
context:
space:
mode:
authorguohui@google.com <guohui@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 03:51:52 +0000
committerguohui@google.com <guohui@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 03:51:52 +0000
commitfe6e23dcb40fe2731e42a1daf55a2268c8d0b5e7 (patch)
treea44bea8ac8e5ff0e5fcfada0becdc85965220180 /chrome/browser/fast_shutdown_uitest.cc
parent2255827f95cb9eb7abbefbcf5d98dec82daf526c (diff)
downloadchromium_src-fe6e23dcb40fe2731e42a1daf55a2268c8d0b5e7.zip
chromium_src-fe6e23dcb40fe2731e42a1daf55a2268c8d0b5e7.tar.gz
chromium_src-fe6e23dcb40fe2731e42a1daf55a2268c8d0b5e7.tar.bz2
The change list splits loading of cookies from DB by the domain key(eTLD+1).
BUG=52909 TEST=NONE Review URL: http://codereview.chromium.org/7864008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/fast_shutdown_uitest.cc')
-rw-r--r--chrome/browser/fast_shutdown_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/fast_shutdown_uitest.cc b/chrome/browser/fast_shutdown_uitest.cc
index 3bb9298..a7f1c00 100644
--- a/chrome/browser/fast_shutdown_uitest.cc
+++ b/chrome/browser/fast_shutdown_uitest.cc
@@ -42,11 +42,11 @@ class FastShutdown : public UITest {
user_data_dir_.AppendASCII(chrome::kInitialProfile)
.Append(chrome::kCookieFilename)));
std::vector<net::CookieMonster::CanonicalCookie*> cookies;
- ASSERT_TRUE(cookie_store->Load(
+ cookie_store->Load(
base::Bind(&FastShutdown::LoadCookiesCallback,
base::Unretained(this),
MessageLoop::current(),
- base::Unretained(&cookies))));
+ base::Unretained(&cookies)));
// Will receive a QuitTask when LoadCookiesCallback is invoked.
MessageLoop::current()->Run();
*has_cookie = false;