Revert 99810 - Get the rest of the chrome target to build (but not link) with USE_AURA.

ipc/ipc_message_utils.h

 // Copyright (c) 2011 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_MESSAGE_UTILS_H_
 #define IPC_IPC_MESSAGE_UTILS_H_
 #pragma once
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/tuple.h"
 #include "ipc/ipc_param_traits.h"
 #include "ipc/ipc_sync_message.h"
 
-#if defined(USE_AURA)
-#include "ui/gfx/native_widget_types.h"
-#endif
-
 #if defined(COMPILER_GCC)
 // GCC "helpfully" tries to inline template methods in release mode. Except we
 // want the majority of the template junk being expanded once in the
 // implementation file (and only provide the definitions in
 // ipc_message_utils_impl.h in those files) and exported, instead of expanded
 // at every call site. Special note: GCC happily accepts the attribute before
 // the method declaration, but only acts on it if it is after.
 #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40500
 // Starting in gcc 4.5, the noinline no longer implies the concept covered by
 // the introduced noclone attribute, which will create specialized versions of
@@ skipping 619 matching lines @@
   }
   static bool Read(const Message* m, void** iter, param_type* r) {
     DCHECK_EQ(sizeof(param_type), sizeof(uint32));
     return m->ReadUInt32(iter, reinterpret_cast<uint32*>(r));
   }
   static void Log(const param_type& p, std::string* l) {
     l->append(StringPrintf("0x%X", p));
   }
 };
 
-#if defined(USE_AURA)
-// TODO(beng): Figure out why this is needed, fix that issue and remove
-//             this. Brett and I were unable to figure out why, but he
-//             thought this should be harmless.
 template <>
-struct ParamTraits<gfx::PluginWindowHandle> {
-  typedef gfx::PluginWindowHandle param_type;
+struct ParamTraits<HCURSOR> {
+  typedef HCURSOR param_type;
   static void Write(Message* m, const param_type& p) {
     m->WriteUInt32(reinterpret_cast<uint32>(p));
   }
   static bool Read(const Message* m, void** iter, param_type* r) {
     DCHECK_EQ(sizeof(param_type), sizeof(uint32));
     return m->ReadUInt32(iter, reinterpret_cast<uint32*>(r));
   }
   static void Log(const param_type& p, std::string* l) {
     l->append(StringPrintf("0x%X", p));
   }
 };
-#endif
 
 template <>
 struct ParamTraits<HACCEL> {
   typedef HACCEL param_type;
   static void Write(Message* m, const param_type& p) {
     m->WriteUInt32(reinterpret_cast<uint32>(p));
   }
   static bool Read(const Message* m, void** iter, param_type* r) {
     DCHECK_EQ(sizeof(param_type), sizeof(uint32));
     return m->ReadUInt32(iter, reinterpret_cast<uint32*>(r));
@@ skipping 417 matching lines @@
     ReplyParam p(a, b, c, d, e);
     WriteParam(reply, p);
   }
 };
 
 //-----------------------------------------------------------------------------
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_MESSAGE_UTILS_H_