| Index: net/http/http_transaction_unittest.h
|
| diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h
|
| index 5f3d665a524464a3e93f57180c2c0cbe4fb476bb..659411c6510b76ae3e3298b7e65a20aced57a524 100644
|
| --- a/net/http/http_transaction_unittest.h
|
| +++ b/net/http/http_transaction_unittest.h
|
| @@ -37,12 +37,13 @@ class IOBuffer;
|
| enum {
|
| TEST_MODE_NORMAL = 0,
|
| TEST_MODE_SYNC_NET_START = 1 << 0,
|
| - TEST_MODE_SYNC_NET_READ = 1 << 1,
|
| + TEST_MODE_SYNC_NET_READ = 1 << 1,
|
| TEST_MODE_SYNC_CACHE_START = 1 << 2,
|
| - TEST_MODE_SYNC_CACHE_READ = 1 << 3,
|
| - TEST_MODE_SYNC_CACHE_WRITE = 1 << 4,
|
| + TEST_MODE_SYNC_CACHE_READ = 1 << 3,
|
| + TEST_MODE_SYNC_CACHE_WRITE = 1 << 4,
|
| TEST_MODE_SYNC_ALL = (TEST_MODE_SYNC_NET_START | TEST_MODE_SYNC_NET_READ |
|
| - TEST_MODE_SYNC_CACHE_START | TEST_MODE_SYNC_CACHE_READ |
|
| + TEST_MODE_SYNC_CACHE_START |
|
| + TEST_MODE_SYNC_CACHE_READ |
|
| TEST_MODE_SYNC_CACHE_WRITE),
|
| TEST_MODE_SLOW_READ = 1 << 5
|
| };
|
| @@ -87,16 +88,12 @@ void AddMockTransaction(const MockTransaction* trans);
|
| void RemoveMockTransaction(const MockTransaction* trans);
|
|
|
| struct ScopedMockTransaction : MockTransaction {
|
| - ScopedMockTransaction() {
|
| - AddMockTransaction(this);
|
| - }
|
| + ScopedMockTransaction() { AddMockTransaction(this); }
|
| explicit ScopedMockTransaction(const MockTransaction& t)
|
| : MockTransaction(t) {
|
| AddMockTransaction(this);
|
| }
|
| - ~ScopedMockTransaction() {
|
| - RemoveMockTransaction(this);
|
| - }
|
| + ~ScopedMockTransaction() { RemoveMockTransaction(this); }
|
| };
|
|
|
| //-----------------------------------------------------------------------------
|
| @@ -128,12 +125,7 @@ class TestTransactionConsumer {
|
| const std::string& content() const { return content_; }
|
|
|
| private:
|
| - enum State {
|
| - IDLE,
|
| - STARTING,
|
| - READING,
|
| - DONE
|
| - };
|
| + enum State { IDLE, STARTING, READING, DONE };
|
|
|
| void DidStart(int result);
|
| void DidRead(int result);
|
| @@ -164,6 +156,7 @@ class MockNetworkTransaction
|
| : public net::HttpTransaction,
|
| public base::SupportsWeakPtr<MockNetworkTransaction> {
|
| typedef net::WebSocketHandshakeStreamBase::CreateHelper CreateHelper;
|
| +
|
| public:
|
| MockNetworkTransaction(net::RequestPriority priority,
|
| MockNetworkLayer* factory);
|
| @@ -180,13 +173,13 @@ class MockNetworkTransaction
|
| net::X509Certificate* client_cert,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
|
|
| - virtual int RestartWithAuth(
|
| - const net::AuthCredentials& credentials,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| + virtual int RestartWithAuth(const net::AuthCredentials& credentials,
|
| + const net::CompletionCallback& callback) OVERRIDE;
|
|
|
| virtual bool IsReadyToRestartForAuth() OVERRIDE;
|
|
|
| - virtual int Read(net::IOBuffer* buf, int buf_len,
|
| + virtual int Read(net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
|
|
| virtual void StopCaching() OVERRIDE;
|
| @@ -278,9 +271,7 @@ class MockNetworkLayer : public net::HttpTransactionFactory,
|
|
|
| // Makes last_transaction() return NULL until the next transaction
|
| // is created.
|
| - void ClearLastTransaction() {
|
| - last_transaction_.reset();
|
| - }
|
| + void ClearLastTransaction() { last_transaction_.reset(); }
|
|
|
| // net::HttpTransactionFactory:
|
| virtual int CreateTransaction(
|
|
|