Enable -Werror on the Mac. Fix two more warnings just added to our build. Note that the targets for libskia and libicuuc still exclude themselves from -Werror.

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

2 files changed, 8 insertions, 7 deletions

diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index e29cb50..fcf99ba 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -570,8 +570,8 @@ TEST(NetUtilTest, IDNToUnicode) {
 #endif
   };
 
-  for (int i = 0; i < ARRAYSIZE_UNSAFE(idn_cases); i++) {
-    for (int j = 0; j < arraysize(kLanguages); j++) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(idn_cases); i++) {
+    for (size_t j = 0; j < arraysize(kLanguages); j++) {
       std::wstring output;
       net::IDNToUnicode(idn_cases[i].input,
                         static_cast<int>(strlen(idn_cases[i].input)),
@@ -682,7 +682,7 @@ TEST(NetUtilTest, GetSuggestedFilename) {
      L"",
      L"test.html"},
   };
-  for (int i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     std::wstring filename = net::GetSuggestedFilename(
         GURL(test_cases[i].url), test_cases[i].content_disp_header,
         test_cases[i].default_filename);
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index dbcfa05..d446a57 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -29,6 +29,7 @@
 
 #include "net/url_request/url_request_http_job.h"
 
+#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/cookie_monster.h"
@@ -42,8 +43,6 @@
 
 // TODO(darin): make sure the port blocking code is not lost
 
-#pragma warning(disable: 4355)
-
 // static
 URLRequestJob* URLRequestHttpJob::Factory(URLRequest* request,
                                           const std::string& scheme) {
@@ -67,8 +66,10 @@ URLRequestHttpJob::URLRequestHttpJob(URLRequest* request)
       response_info_(NULL),
       proxy_auth_state_(net::AUTH_STATE_DONT_NEED_AUTH),
       server_auth_state_(net::AUTH_STATE_DONT_NEED_AUTH),
-      start_callback_(this, &URLRequestHttpJob::OnStartCompleted),
-      read_callback_(this, &URLRequestHttpJob::OnReadCompleted),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          start_callback_(this, &URLRequestHttpJob::OnStartCompleted)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          read_callback_(this, &URLRequestHttpJob::OnReadCompleted)),
       read_in_progress_(false),
       context_(request->context()) {
 }