Some platform cleanup to net/

Patch from Pawel Hajdan Jr.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2485 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 39 deletions

diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index a503b74..648a889 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -4,8 +4,6 @@
 
 #include "net/http/http_cache.h"
 
-#include <windows.h>
-
 #include "base/hash_tables.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ -18,8 +16,6 @@
 #include "net/http/http_transaction_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#pragma warning(disable: 4355)
-
 namespace {
 
 //-----------------------------------------------------------------------------
@@ -73,7 +69,7 @@ class MockDiskEntry : public disk_cache::Entry,
 
     if (offset < 0 || offset > static_cast<int>(data_[index].size()))
       return net::ERR_FAILED;
-    if (offset == data_[index].size())
+    if (static_cast<size_t>(offset) == data_[index].size())
       return 0;
 
     int num = std::min(buf_len, static_cast<int>(data_[index].size()) - offset);
@@ -483,20 +479,20 @@ TEST(HttpCache, SimpleGET_LoadValidateCache_Implicit) {
   EXPECT_EQ(1, cache.disk_cache()->create_count());
 }
 
+struct Context {
+  int result;
+  TestCompletionCallback callback;
+  net::HttpTransaction* trans;
+
+  Context(net::HttpTransaction* t) : result(net::ERR_IO_PENDING), trans(t) {
+  }
+};
+
 TEST(HttpCache, SimpleGET_ManyReaders) {
   MockHttpCache cache;
 
   MockHttpRequest request(kSimpleGET_Transaction);
 
-  struct Context {
-    int result;
-    TestCompletionCallback callback;
-    net::HttpTransaction* trans;
-
-    Context(net::HttpTransaction* t) : result(net::ERR_IO_PENDING), trans(t) {
-    }
-  };
-
   std::vector<Context*> context_list;
   const int kNumTransactions = 5;
 
@@ -542,15 +538,6 @@ TEST(HttpCache, SimpleGET_ManyWriters_CancelFirst) {
 
   MockHttpRequest request(kSimpleGET_Transaction);
 
-  struct Context {
-    int result;
-    TestCompletionCallback callback;
-    net::HttpTransaction* trans;
-
-    Context(net::HttpTransaction* t) : result(net::ERR_IO_PENDING), trans(t) {
-    }
-  };
-
   std::vector<Context*> context_list;
   const int kNumTransactions = 2;
 
diff --git a/net/http/http_transaction_unittest.cc b/net/http/http_transaction_unittest.cc
index 64deb78..fdcceff 100644
--- a/net/http/http_transaction_unittest.cc
+++ b/net/http/http_transaction_unittest.cc
@@ -4,8 +4,6 @@
 
 #include "net/http/http_transaction_unittest.h"
 
-#include <windows.h>
-
 #include "base/hash_tables.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ -18,8 +16,6 @@
 #include "net/http/http_transaction.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#pragma warning(disable: 4355)
-
 //-----------------------------------------------------------------------------
 // mock transaction data
 
@@ -117,7 +113,7 @@ const MockTransaction* FindMockTransaction(const GURL& url) {
     return it->second;
 
   // look for builtins:
-  for (int i = 0; i < arraysize(kBuiltinMockTransactions); ++i) {
+  for (size_t i = 0; i < arraysize(kBuiltinMockTransactions); ++i) {
     if (url == GURL(kBuiltinMockTransactions[i]->url))
       return kBuiltinMockTransactions[i];
   }
diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h
index 6486fa6..91006a0 100644
--- a/net/http/http_transaction_unittest.h
+++ b/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() {
diff --git a/net/http/http_util_unittest.cc b/net/http/http_util_unittest.cc
index a531228..8cccf31 100644
--- a/net/http/http_util_unittest.cc
+++ b/net/http/http_util_unittest.cc
@@ -28,7 +28,7 @@ TEST(HttpUtilTest, HasHeader) {
     { "fOO: 1\r\nbar: 2", "foo", true },
     { "g: 0\r\nfoo: 1\r\nbar: 2", "foo", true },
   };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     bool result = HttpUtil::HasHeader(tests[i].headers, tests[i].name);
     EXPECT_EQ(tests[i].expected_result, result);
   }
@@ -107,7 +107,7 @@ TEST(HttpUtilTest, LocateEndOfHeaders) {
     { "foo\nbar\n\r\njunk", 10 },
     { "foo\nbar\r\n\njunk", 10 },
   };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     int input_len = static_cast<int>(strlen(tests[i].input));
     int eoh = HttpUtil::LocateEndOfHeaders(tests[i].input, input_len);
     EXPECT_EQ(tests[i].expected_result, eoh);
@@ -404,7 +404,7 @@ TEST(HttpUtilTest, AssembleRawHeaders) {
     },
 
   };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     int input_len = static_cast<int>(strlen(tests[i].input));
     std::string raw = HttpUtil::AssembleRawHeaders(tests[i].input, input_len);
     std::replace(raw.begin(), raw.end(), '\0', '|');
@@ -435,7 +435,7 @@ TEST(HttpUtilTest, RequestUrlSanitize) {
       "/"
     }
   };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     GURL url(GURL(tests[i].url));
     std::string expected_spec(tests[i].expected_spec);
     std::string expected_path(tests[i].expected_path);