From 182fe2f459b174b9c1de6520776ceb23f7d0f0de Mon Sep 17 00:00:00 2001 From: "willchan@chromium.org" Date: Mon, 14 Feb 2011 20:35:15 +0000 Subject: Revert 74842 - It seems to have broken the ChromeOS "PFQ bot"? r74561 added a DCHECK to make sure users didn't try to access the ChromeURLRequestContextGetter from the Profile, since the Profile should only be read on the UI thread. ChromeOS apparently tried to access it from another thread, and therefore hit the new DCHECK. I'm relanding without the DCHECK. I'm also eagerly initializing the off the record context getter to prevent the ChromeOS race. ChromeOS should fix that code so the eager initialization isn't necessary. BUG=none TEST=none Review URL: http://codereview.chromium.org/6484041 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/6517021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74848 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/testing_profile.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/test') diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index c60ec8a..285338f 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -122,7 +122,7 @@ class TestExtensionURLRequestContext : public net::URLRequestContext { net::CookieMonster* cookie_monster = new net::CookieMonster(NULL, NULL); const char* schemes[] = {chrome::kExtensionScheme}; cookie_monster->SetCookieableSchemes(schemes, 1); - set_cookie_store(cookie_monster); + cookie_store_ = cookie_monster; } }; -- cgit v1.1