| Index: chrome/common/extensions/extension_messages.h
|
| diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h
|
| index e45d67723d909bd5d8be3ddde0ba8239f6376145..276020ec8ab9679c15117da9ebf6ee3f651a8eb7 100644
|
| --- a/chrome/common/extensions/extension_messages.h
|
| +++ b/chrome/common/extensions/extension_messages.h
|
| @@ -128,7 +128,7 @@ template <>
|
| struct ParamTraits<URLPattern> {
|
| typedef URLPattern param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* p);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* p);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -136,7 +136,7 @@ template <>
|
| struct ParamTraits<URLPatternSet> {
|
| typedef URLPatternSet param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* p);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* p);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -144,7 +144,7 @@ template <>
|
| struct ParamTraits<ExtensionAPIPermission::ID> {
|
| typedef ExtensionAPIPermission::ID param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* p);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* p);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -152,7 +152,7 @@ template <>
|
| struct ParamTraits<ExtensionMsg_Loaded_Params> {
|
| typedef ExtensionMsg_Loaded_Params param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* p);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* p);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
|
|