Index: net/url_request/url_request_unittest.cc |
=================================================================== |
--- net/url_request/url_request_unittest.cc (revision 19171) |
+++ net/url_request/url_request_unittest.cc (working copy) |
@@ -831,7 +831,8 @@ |
EXPECT_EQ("a, b", header); |
} |
-TEST_F(URLRequestTest, BZip2ContentTest) { |
+// TODO(jar): 14801 Remove BZIP code completely. |
+TEST_F(URLRequestTest, DISABLED_BZip2ContentTest) { |
scoped_refptr<HTTPTestServer> server = |
HTTPTestServer::CreateServer(L"net/data/filter_unittests", NULL); |
ASSERT_TRUE(NULL != server.get()); |
@@ -857,7 +858,8 @@ |
EXPECT_EQ(got_content, got_bz2_content); |
} |
-TEST_F(URLRequestTest, BZip2ContentTest_IncrementalHeader) { |
+// TODO(jar): 14801 Remove BZIP code completely. |
+TEST_F(URLRequestTest, DISABLED_BZip2ContentTest_IncrementalHeader) { |
scoped_refptr<HTTPTestServer> server = |
HTTPTestServer::CreateServer(L"net/data/filter_unittests", NULL); |
ASSERT_TRUE(NULL != server.get()); |
@@ -1237,8 +1239,7 @@ |
"Accept-Language: en-US,en\r\n" |
"Accept-Charset: ISO-8859-1,*,utf-8\r\n" |
"Content-Length: 10\r\n" |
- "Origin: http://localhost:1337/" |
- ); |
+ "Origin: http://localhost:1337/"); |
req.Start(); |
MessageLoop::current()->Run(); |
@@ -1275,7 +1276,8 @@ |
// Custom URLRequestJobs for use with interceptor tests |
class RestartTestJob : public URLRequestTestJob { |
public: |
- RestartTestJob(URLRequest* request) : URLRequestTestJob(request, true) {} |
+ explicit RestartTestJob(URLRequest* request) |
+ : URLRequestTestJob(request, true) {} |
protected: |
virtual void StartAsync() { |
this->NotifyRestartRequired(); |
@@ -1284,7 +1286,8 @@ |
class CancelTestJob : public URLRequestTestJob { |
public: |
- CancelTestJob(URLRequest* request) : URLRequestTestJob(request, true) {} |
+ explicit CancelTestJob(URLRequest* request) |
+ : URLRequestTestJob(request, true) {} |
protected: |
virtual void StartAsync() { |
request_->Cancel(); |
@@ -1293,7 +1296,7 @@ |
class CancelThenRestartTestJob : public URLRequestTestJob { |
public: |
- CancelThenRestartTestJob(URLRequest* request) |
+ explicit CancelThenRestartTestJob(URLRequest* request) |
: URLRequestTestJob(request, true) { |
} |
protected: |