Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: src/net/http/http_transaction_unittest.h

Issue 4037: Some platform cleanup to net/ (Closed)
Patch Set: Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/net/http/http_cache_unittest.cc ('k') | src/net/http/http_transaction_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/net/http/http_transaction_unittest.h
diff --git a/src/net/http/http_transaction_unittest.h b/src/net/http/http_transaction_unittest.h
index 6486fa63ed3f6ece2eaaf1d95e8947e57a9079df..91006a01d9cbbc31c6ccc8970cae8068438f0bbc 100644
--- a/src/net/http/http_transaction_unittest.h
+++ b/src/net/http/http_transaction_unittest.h
@@ -7,10 +7,9 @@
#include "net/http/http_transaction.h"
-#include <windows.h>
-
#include <string>
+#include "base/compiler_specific.h"
#include "base/message_loop.h"
#include "base/string_util.h"
#include "net/base/net_errors.h"
@@ -21,8 +20,6 @@
#include "net/http/http_request_info.h"
#include "net/http/http_response_info.h"
-#pragma warning(disable: 4355)
-
//-----------------------------------------------------------------------------
// mock transaction data
@@ -99,8 +96,8 @@ class MockHttpRequest : public net::HttpRequestInfo {
class TestTransactionConsumer : public CallbackRunner< Tuple1<int> > {
public:
explicit TestTransactionConsumer(net::HttpTransactionFactory* factory)
- : trans_(factory->CreateTransaction()),
- state_(IDLE),
+ : state_(IDLE),
+ trans_(factory->CreateTransaction()),
error_(net::OK) {
++quit_counter_;
}
@@ -195,7 +192,8 @@ class TestTransactionConsumer : public CallbackRunner< Tuple1<int> > {
// HttpCache implementation.
class MockNetworkTransaction : public net::HttpTransaction {
public:
- MockNetworkTransaction() : task_factory_(this), data_cursor_(0) {
+ MockNetworkTransaction() :
+ ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), data_cursor_(0) {
}
virtual void Destroy() {
« no previous file with comments | « src/net/http/http_cache_unittest.cc ('k') | src/net/http/http_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698