Revert "Fix a ton of compiler warnings."

ipc/ipc_sync_channel.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 IPC_IPC_SYNC_SENDER_H_
-#define IPC_IPC_SYNC_SENDER_H_
+#ifndef IPC_IPC_SYNC_SENDER_H__
+#define IPC_IPC_SYNC_SENDER_H__
 
 #include <string>
 #include <deque>
 
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/waitable_event_watcher.h"
 #include "ipc/ipc_channel_proxy.h"
 
@@ skipping 130 matching lines @@
   // Runs a nested message loop until a reply arrives, times out, or the process
   // shuts down.
   void WaitForReplyWithNestedMessageLoop();
 
   bool sync_messages_with_no_timeout_allowed_;
 
   // Used to signal events between the IPC and listener threads.
   base::WaitableEventWatcher send_done_watcher_;
   base::WaitableEventWatcher dispatch_watcher_;
 
-  DISALLOW_COPY_AND_ASSIGN(SyncChannel);
+  DISALLOW_EVIL_CONSTRUCTORS(SyncChannel);
 };
 
 }  // namespace IPC
 
-#endif  // IPC_IPC_SYNC_SENDER_H_
+#endif  // IPC_IPC_SYNC_SENDER_H__