diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:17:29 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:17:29 +0000 |
| commit | fb1692aa4d8d8269cc5e30f92eec2820dcf0ec92 (patch) | |
| tree | 692d02df58f6ab7c9e432412631db61ae24c1e18 /chrome/browser/chromeos/contacts | |
| parent | b15a08ac0f726393605383e242e8d9b6c35acdeb (diff) | |
| download | chromium_src-fb1692aa4d8d8269cc5e30f92eec2820dcf0ec92.zip chromium_src-fb1692aa4d8d8269cc5e30f92eec2820dcf0ec92.tar.gz chromium_src-fb1692aa4d8d8269cc5e30f92eec2820dcf0ec92.tar.bz2 | |
GTTF: Make EmbeddedTestServer always use its own thread for IO
Otherwise we likely end up blocking the browser's IO thread,
especially with big responses that don't fit in the kernel
buffer. This blocks EmbeddedTestServer's IO thread,
and if it's also the browser's IO thread the browser can't
consume the response resulting in a hang.
BUG=310713
R=jam@chromium.org, rch@chromium.org
Review URL: https://codereview.chromium.org/37683004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/contacts')
| -rw-r--r-- | chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc index 3dbcae3..ea4546c 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc @@ -78,10 +78,7 @@ class GDataContactsServiceTest : public testing::Test { content::BrowserThread::GetMessageLoopProxyForThread( content::BrowserThread::IO)); - test_server_.reset( - new net::test_server::EmbeddedTestServer( - content::BrowserThread::GetMessageLoopProxyForThread( - content::BrowserThread::IO))); + test_server_.reset(new net::test_server::EmbeddedTestServer); ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady()); test_server_->RegisterRequestHandler( base::Bind(&GDataContactsServiceTest::HandleDownloadRequest, @@ -156,7 +153,6 @@ class GDataContactsServiceTest : public testing::Test { // returns the content. scoped_ptr<net::test_server::HttpResponse> HandleDownloadRequest( const net::test_server::HttpRequest& request) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); // Requested url must not contain a query string. scoped_ptr<net::test_server::BasicHttpResponse> result = google_apis::test_util::CreateHttpResponseFromFile( |