Revert 51520 - Up the warnings in ipc...

ipc/ipc_fuzzing_tests.cc

 // 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.
 
 #include <stdio.h>
 #include <iostream>
 #include <string>
 #include <sstream>
 
 #include "base/message_loop.h"
@@ skipping 168 matching lines @@
     RoundtripAckReply(FUZZER_ROUTING_ID, MsgClassIS::ID, value);
     Cleanup();
   }
 
   void OnMsgClassSIMessage(const std::wstring& text, int value) {
     UseData(MsgClassSI::ID, value, text);
     RoundtripAckReply(FUZZER_ROUTING_ID, MsgClassSI::ID, value);
     Cleanup();
   }
 
-  bool RoundtripAckReply(int routing, uint32 type_id, int reply) {
+  bool RoundtripAckReply(int routing, int type_id, int reply) {
     IPC::Message* message = new IPC::Message(routing, type_id,
                                              IPC::Message::PRIORITY_NORMAL);
     message->WriteInt(reply + 1);
     message->WriteInt(reply);
     return other_->Send(message);
   }
 
   void Cleanup() {
     --message_count_;
     --pending_messages_;
     if (0 == message_count_)
       MessageLoop::current()->Quit();
   }
 
-  void ReplyMsgNotHandled(uint32 type_id) {
+  void ReplyMsgNotHandled(int type_id) {
     RoundtripAckReply(FUZZER_ROUTING_ID, CLIENT_UNHANDLED_IPC, type_id);
     Cleanup();
   }
 
   void UseData(int caller, int value, const std::wstring& text) {
     std::wostringstream wos;
     wos << L"IPC fuzzer:" << caller << " [" << value << L" " << text << L"]\n";
     std::wstring output = wos.str();
     LOG(WARNING) << output.c_str();
   };
 
   int message_count_;
   int pending_messages_;
 };
 
 class FuzzerClientListener : public SimpleListener {
  public:
   FuzzerClientListener() : last_msg_(NULL) {
   }
 
   virtual void OnMessageReceived(const IPC::Message& msg) {
     last_msg_ = new IPC::Message(msg);
     MessageLoop::current()->Quit();
   }
 
-  bool ExpectMessage(int value, uint32 type_id) {
+  bool ExpectMessage(int value, int type_id) {
     if (!MsgHandlerInternal(type_id))
       return false;
     int msg_value1 = 0;
     int msg_value2 = 0;
     void* iter = NULL;
     if (!last_msg_->ReadInt(&iter, &msg_value1))
       return false;
     if (!last_msg_->ReadInt(&iter, &msg_value2))
       return false;
     if ((msg_value2 + 1) != msg_value1)
       return false;
     if (msg_value2 != value)
       return false;
 
     delete last_msg_;
     last_msg_ = NULL;
     return true;
   }
 
-  bool ExpectMsgNotHandled(uint32 type_id) {
+  bool ExpectMsgNotHandled(int type_id) {
     return ExpectMessage(type_id, CLIENT_UNHANDLED_IPC);
   }
 
  private:
-  bool MsgHandlerInternal(uint32 type_id) {
+  bool MsgHandlerInternal(int type_id) {
     MessageLoop::current()->Run();
     if (NULL == last_msg_)
       return false;
     if (FUZZER_ROUTING_ID != last_msg_->routing_id())
       return false;
     return (type_id == last_msg_->type());
   };
 
   IPC::Message* last_msg_;
 };
@@ skipping 155 matching lines @@
   msg = new IPC::Message(MSG_ROUTING_CONTROL, MsgClassIS::ID,
                          IPC::Message::PRIORITY_NORMAL);
   msg->WriteInt(0x64);
   msg->WriteInt(0x32);
   EXPECT_FALSE(server.OnMessageReceived(*msg));
   delete msg;
 
   EXPECT_EQ(0, server.unhandled_msgs());
 #endif
 }