Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Unified Diff: content/public/common/common_param_traits.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/common/common_param_traits.cc
diff --git a/content/public/common/common_param_traits.cc b/content/public/common/common_param_traits.cc
index 7ed8236b13450a1d31cd39e84dcc6f44e79bcf08..73471606706418e3ddc03a9fb9b7341484158334 100644
--- a/content/public/common/common_param_traits.cc
+++ b/content/public/common/common_param_traits.cc
@@ -36,7 +36,9 @@ void ParamTraits<GURL>::Write(Message* m, const GURL& p) {
// TODO(brettw) bug 684583: Add encoding for query params.
}
-bool ParamTraits<GURL>::Read(const Message* m, PickleIterator* iter, GURL* p) {
+bool ParamTraits<GURL>::Read(const Message* m,
+ base::PickleIterator* iter,
+ GURL* p) {
std::string s;
if (!iter->ReadString(&s) || s.length() > content::GetMaxURLChars()) {
*p = GURL();
@@ -60,7 +62,7 @@ void ParamTraits<url::Origin>::Write(Message* m,
}
bool ParamTraits<url::Origin>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
url::Origin* p) {
std::string s;
if (!iter->ReadString(&s)) {
@@ -81,7 +83,7 @@ void ParamTraits<net::HostPortPair>::Write(Message* m, const param_type& p) {
}
bool ParamTraits<net::HostPortPair>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
std::string host;
uint16 port;
@@ -102,7 +104,8 @@ void ParamTraits<net::IPEndPoint>::Write(Message* m, const param_type& p) {
WriteParam(m, p.port());
}
-bool ParamTraits<net::IPEndPoint>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<net::IPEndPoint>::Read(const Message* m,
+ base::PickleIterator* iter,
param_type* p) {
net::IPAddressNumber address;
uint16 port;
@@ -126,8 +129,9 @@ void ParamTraits<content::PageState>::Write(
WriteParam(m, p.ToEncodedData());
}
-bool ParamTraits<content::PageState>::Read(
- const Message* m, PickleIterator* iter, param_type* r) {
+bool ParamTraits<content::PageState>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
std::string data;
if (!ReadParam(m, iter, &data))
return false;
« no previous file with comments | « content/common/ssl_status_serialization.cc ('k') | content/renderer/browser_plugin/browser_plugin_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698