| Index: ppapi/proxy/serialized_var.cc
|
| diff --git a/ppapi/proxy/serialized_var.cc b/ppapi/proxy/serialized_var.cc
|
| index 4d3ecff0c4e9f43b39b1332d21f39f2f2876cd01..bbdba09532b2943a14de5bedd5946472b4cd8980 100644
|
| --- a/ppapi/proxy/serialized_var.cc
|
| +++ b/ppapi/proxy/serialized_var.cc
|
| @@ -19,7 +19,7 @@ namespace ppapi {
|
| namespace proxy {
|
|
|
| namespace {
|
| -void DefaultHandleWriter(IPC::Message* m, const SerializedHandle& handle) {
|
| +void DefaultHandleWriter(base::Pickle* m, const SerializedHandle& handle) {
|
| IPC::ParamTraits<SerializedHandle>::Write(m, handle);
|
| }
|
| } // namespace
|
| @@ -95,7 +95,7 @@ void SerializedVar::Inner::ForceSetVarValueForTest(PP_Var value) {
|
| raw_var_data_.reset(NULL);
|
| }
|
|
|
| -void SerializedVar::Inner::WriteToMessage(IPC::Message* m) const {
|
| +void SerializedVar::Inner::WriteToMessage(base::Pickle* m) const {
|
| // When writing to the IPC messages, a serialization rules handler should
|
| // always have been set.
|
| //
|
| @@ -124,7 +124,7 @@ void SerializedVar::Inner::WriteToMessage(IPC::Message* m) const {
|
| }
|
|
|
| void SerializedVar::Inner::WriteDataToMessage(
|
| - IPC::Message* m,
|
| + base::Pickle* m,
|
| const HandleWriter& handle_writer) const {
|
| if (raw_var_data_) {
|
| m->WriteBool(true); // Success.
|
| @@ -134,7 +134,7 @@ void SerializedVar::Inner::WriteDataToMessage(
|
| }
|
| }
|
|
|
| -bool SerializedVar::Inner::ReadFromMessage(const IPC::Message* m,
|
| +bool SerializedVar::Inner::ReadFromMessage(const base::Pickle* m,
|
| base::PickleIterator* iter) {
|
| #ifndef NDEBUG
|
| // We should only deserialize something once or will end up with leaked
|
|
|