| Index: net/url_request/url_request_http_job_unittest.cc
|
| diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc
|
| index e7f0bf7eb7c39199f5a7d7827364001d77410e4c..96e3bfe429f9fc1b11d2f2ee7e72baafce12cff7 100644
|
| --- a/net/url_request/url_request_http_job_unittest.cc
|
| +++ b/net/url_request/url_request_http_job_unittest.cc
|
| @@ -32,7 +32,8 @@ using ::testing::Return;
|
| class TestURLRequestHttpJob : public URLRequestHttpJob {
|
| public:
|
| explicit TestURLRequestHttpJob(URLRequest* request)
|
| - : URLRequestHttpJob(request, request->context()->network_delegate(),
|
| + : URLRequestHttpJob(request,
|
| + request->context()->network_delegate(),
|
| request->context()->http_user_agent_settings()) {}
|
|
|
| using URLRequestHttpJob::SetPriority;
|
| @@ -129,8 +130,8 @@ TEST_F(URLRequestHttpJobTest, SetSubsequentTransactionPriority) {
|
| // constructor is called.
|
| class URLRequestHttpJobWebSocketTestBase : public ::testing::Test {
|
| protected:
|
| - URLRequestHttpJobWebSocketTestBase() : socket_data_(NULL, 0, NULL, 0),
|
| - context_(true) {
|
| + URLRequestHttpJobWebSocketTestBase()
|
| + : socket_data_(NULL, 0, NULL, 0), context_(true) {
|
| // A Network Delegate is required for the WebSocketHandshakeStreamBase
|
| // object to be passed on to the HttpNetworkTransaction.
|
| context_.set_network_delegate(&network_delegate_);
|
| @@ -178,8 +179,7 @@ class MockCreateHelper : public WebSocketHandshakeStreamBase::CreateHelper {
|
| return CreateBasicStreamMock();
|
| }
|
|
|
| - MOCK_METHOD0(CreateBasicStreamMock,
|
| - WebSocketHandshakeStreamBase*());
|
| + MOCK_METHOD0(CreateBasicStreamMock, WebSocketHandshakeStreamBase*());
|
|
|
| MOCK_METHOD2(CreateSpdyStream,
|
| WebSocketHandshakeStreamBase*(const base::WeakPtr<SpdySession>&,
|
| @@ -236,15 +236,15 @@ class FakeWebSocketHandshakeStream : public WebSocketHandshakeStreamBase {
|
|
|
| virtual int64 GetTotalReceivedBytes() const OVERRIDE { return 0; }
|
|
|
| - virtual bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const
|
| - OVERRIDE {
|
| + virtual bool GetLoadTimingInfo(
|
| + LoadTimingInfo* load_timing_info) const OVERRIDE {
|
| return false;
|
| }
|
|
|
| virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE {}
|
|
|
| - virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info)
|
| - OVERRIDE {}
|
| + virtual void GetSSLCertRequestInfo(
|
| + SSLCertRequestInfo* cert_request_info) OVERRIDE {}
|
|
|
| virtual bool IsSpdyHttpStream() const OVERRIDE { return false; }
|
|
|
|
|