| Index: chrome/common/render_messages.cc
|
| diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
|
| index 726f082680cff075aed2ab735233e7dfac937382..ce17fa34c05387d5160474e058a9d074f7b299bc 100644
|
| --- a/chrome/common/render_messages.cc
|
| +++ b/chrome/common/render_messages.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 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.
|
|
|
| @@ -12,7 +12,7 @@ void ParamTraits<ContentSettingsPattern>::Write(
|
| }
|
|
|
| bool ParamTraits<ContentSettingsPattern>::Read(
|
| - const Message* m, void** iter, ContentSettingsPattern* pattern) {
|
| + const Message* m, PickleIterator* iter, ContentSettingsPattern* pattern) {
|
| return pattern->ReadFromMessage(m, iter);
|
| }
|
|
|
|
|