| Index: chrome/common/safe_browsing/protobuf_message_read_macros.h | 
| diff --git a/chrome/common/safe_browsing/protobuf_message_read_macros.h b/chrome/common/safe_browsing/protobuf_message_read_macros.h | 
| index aba946fb99b48c11281cedb7417551bb4877d598..9c7720dbef483509bf240d5afb9ca9d110e24009 100644 | 
| --- a/chrome/common/safe_browsing/protobuf_message_read_macros.h | 
| +++ b/chrome/common/safe_browsing/protobuf_message_read_macros.h | 
| @@ -15,21 +15,19 @@ | 
| #undef IPC_PROTOBUF_MESSAGE_TRAITS_REPEATED_COMPLEX_MEMBER | 
| #undef IPC_PROTOBUF_MESSAGE_TRAITS_END | 
|  | 
| -#define IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN(message_name)             \ | 
| -  template <class P>                                                \ | 
| -  bool ParamTraits<message_name>::ReadParamF(                       \ | 
| -      const Message* m, base::PickleIterator* iter, param_type* p,  \ | 
| -      void (param_type::*setter_function)(P)) {                     \ | 
| -    P value;                                                        \ | 
| -    if (!ReadParam(m, iter, &value))                                \ | 
| -      return false;                                                 \ | 
| -    (p->*setter_function)(value);                                   \ | 
| -    return true;                                                    \ | 
| -  }                                                                 \ | 
| -  bool ParamTraits<message_name>::Read(const Message* m,            \ | 
| -                                       base::PickleIterator* iter,  \ | 
| -                                       param_type* p) { | 
| - | 
| +#define IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN(message_name)                 \ | 
| +  template <class P>                                                    \ | 
| +  bool ParamTraits<message_name>::ReadParamF(                           \ | 
| +      const base::Pickle* m, base::PickleIterator* iter, param_type* p, \ | 
| +      void (param_type::*setter_function)(P)) {                         \ | 
| +    P value;                                                            \ | 
| +    if (!ReadParam(m, iter, &value))                                    \ | 
| +      return false;                                                     \ | 
| +    (p->*setter_function)(value);                                       \ | 
| +    return true;                                                        \ | 
| +  }                                                                     \ | 
| +  bool ParamTraits<message_name>::Read(                                 \ | 
| +      const base::Pickle* m, base::PickleIterator* iter, param_type* p) { | 
| #define IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_FUNDAMENTAL_MEMBER(name) \ | 
| {                                                                 \ | 
| bool is_present;                                                \ | 
|  |