Changes to ALLOW_UNUSED to match upcoming changes to the Chromium trunk:

src/base/flags.h

Index: src/base/flags.h
diff --git a/src/base/flags.h b/src/base/flags.h
index f3420ee536112f887b0cec648fb96a1e83170ca5..093b72aa65e29f291e0d1b61a6b928d85d3eeabf 100644
--- a/src/base/flags.h
+++ b/src/base/flags.h
@@ -65,41 +65,42 @@ class Flags FINAL {
 
 
 #define DEFINE_OPERATORS_FOR_FLAGS(Type)                                       \
-  inline Type operator&(Type::flag_type lhs,                                   \
-                        Type::flag_type rhs)ALLOW_UNUSED WARN_UNUSED_RESULT;   \
+  inline Type operator&(Type::flag_type lhs, Type::flag_type rhs)              \
+      ALLOW_UNUSED_TYPE WARN_UNUSED_RESULT;                                    \
   inline Type operator&(Type::flag_type lhs, Type::flag_type rhs) {            \
     return Type(lhs) & rhs;                                                    \
   }                                                                            \
   inline Type operator&(Type::flag_type lhs,                                   \
-                        const Type& rhs)ALLOW_UNUSED WARN_UNUSED_RESULT;       \
+                        const Type& rhs) ALLOW_UNUSED_TYPE WARN_UNUSED_RESULT; \
   inline Type operator&(Type::flag_type lhs, const Type& rhs) {                \
     return rhs & lhs;                                                          \
   }                                                                            \
-  inline void operator&(Type::flag_type lhs, Type::mask_type rhs)ALLOW_UNUSED; \
+  inline void operator&(Type::flag_type lhs,                                   \
+                        Type::mask_type rhs) ALLOW_UNUSED_TYPE;                \
   inline void operator&(Type::flag_type lhs, Type::mask_type rhs) {}           \
   inline Type operator|(Type::flag_type lhs, Type::flag_type rhs)              \
-      ALLOW_UNUSED WARN_UNUSED_RESULT;                                         \
+      ALLOW_UNUSED_TYPE WARN_UNUSED_RESULT;                                    \
   inline Type operator|(Type::flag_type lhs, Type::flag_type rhs) {            \
     return Type(lhs) | rhs;                                                    \
   }                                                                            \
   inline Type operator|(Type::flag_type lhs, const Type& rhs)                  \
-      ALLOW_UNUSED WARN_UNUSED_RESULT;                                         \
+      ALLOW_UNUSED_TYPE WARN_UNUSED_RESULT;                                    \
   inline Type operator|(Type::flag_type lhs, const Type& rhs) {                \
     return rhs | lhs;                                                          \
   }                                                                            \
-  inline void operator|(Type::flag_type lhs, Type::mask_type rhs)              \
-      ALLOW_UNUSED;                                                            \
+  inline void operator|(Type::flag_type lhs,                                   \
+                        Type::mask_type rhs) ALLOW_UNUSED_TYPE;                \
   inline void operator|(Type::flag_type lhs, Type::mask_type rhs) {}           \
   inline Type operator^(Type::flag_type lhs, Type::flag_type rhs)              \
-      ALLOW_UNUSED WARN_UNUSED_RESULT;                                         \
+      ALLOW_UNUSED_TYPE WARN_UNUSED_RESULT;                                    \
   inline Type operator^(Type::flag_type lhs, Type::flag_type rhs) {            \
     return Type(lhs) ^ rhs;                                                    \
   } inline Type operator^(Type::flag_type lhs, const Type& rhs)                \
-      ALLOW_UNUSED WARN_UNUSED_RESULT;                                         \
+      ALLOW_UNUSED_TYPE WARN_UNUSED_RESULT;                                    \
   inline Type operator^(Type::flag_type lhs, const Type& rhs) {                \
     return rhs ^ lhs;                                                          \
-  } inline void operator^(Type::flag_type lhs, Type::mask_type rhs)            \
-      ALLOW_UNUSED;                                                            \
+  } inline void operator^(Type::flag_type lhs,                                 \
+                          Type::mask_type rhs) ALLOW_UNUSED_TYPE;              \
   inline void operator^(Type::flag_type lhs, Type::mask_type rhs) {}
 
 }  // namespace base