Some platform cleanup to net/

src/net/http/http_transaction_unittest.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_HTTP_HTTP_TRANSACTION_UNITTEST_H_
 #define NET_HTTP_HTTP_TRANSACTION_UNITTEST_H_
 
 #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"
 #include "net/base/load_flags.h"
 #include "net/base/test_completion_callback.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_info.h"
 
-#pragma warning(disable: 4355)
-
 //-----------------------------------------------------------------------------
 // mock transaction data
 
 // these flags may be combined to form the test_mode field
 enum {
   TEST_MODE_NORMAL = 0,
   TEST_MODE_SYNC_NET_START = 1 << 0,
   TEST_MODE_SYNC_NET_READ  = 1 << 1,
   TEST_MODE_SYNC_CACHE_START = 1 << 2,
   TEST_MODE_SYNC_CACHE_READ  = 1 << 3,
@@ skipping 56 matching lines @@
     load_flags = t.load_flags;
   }
 };
 
 //-----------------------------------------------------------------------------
 // use this class to test completely consuming a transaction
 
 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_;
   }
 
   ~TestTransactionConsumer() {
     trans_->Destroy();
   }
 
   void Start(const net::HttpRequestInfo* request) {
     state_ = STARTING;
@@ skipping 74 matching lines @@
 
 //-----------------------------------------------------------------------------
 // mock network layer
 
 // This transaction class inspects the available set of mock transactions to
 // find data for the request URL.  It supports IO operations that complete
 // synchronously or asynchronously to help exercise different code paths in the
 // 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() {
     delete this;
   }
 
   virtual int Start(const net::HttpRequestInfo* request,
                     net::CompletionCallback* callback) {
     const MockTransaction* t = FindMockTransaction(request->url);
     if (!t)
@@ skipping 103 matching lines @@
 };
 
 
 //-----------------------------------------------------------------------------
 // helpers
 
 // read the transaction completely
 int ReadTransaction(net::HttpTransaction* trans, std::string* result);
 
 #endif  // NET_HTTP_HTTP_TRANSACTION_UNITTEST_H_