Hardening the 'url::Origin' implementation.

content/public/common/common_param_traits.cc

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..76c9866cab357184a195f43b82cd8128f8fa0394 100644
--- a/content/public/common/common_param_traits.cc
+++ b/content/public/common/common_param_traits.cc
@@ -54,25 +54,29 @@ void ParamTraits<GURL>::Log(const GURL& p, std::string* l) {
   l->append(p.spec());
 }
 
-void ParamTraits<url::Origin>::Write(Message* m,
-                                          const url::Origin& p) {
-  m->WriteString(p.string());
+void ParamTraits<url::Origin>::Write(Message* m, const url::Origin& p) {
+  WriteParam(m, p.scheme());
+  WriteParam(m, p.host());
+  WriteParam(m, p.port());
 }
 
 bool ParamTraits<url::Origin>::Read(const Message* m,
                                     PickleIterator* iter,
                                     url::Origin* p) {
-  std::string s;
-  if (!iter->ReadString(&s)) {
+  std::string scheme;
+  std::string host;
+  uint16 port;
+  if (!ReadParam(m, iter, &scheme) || !ReadParam(m, iter, &host) ||
+      !ReadParam(m, iter, &port)) {
     *p = url::Origin();
     return false;
   }
-  *p = url::Origin(s);
+  *p = url::Origin(scheme, host, port);
   return true;
 }
 
 void ParamTraits<url::Origin>::Log(const url::Origin& p, std::string* l) {
-  l->append(p.string());
+  l->append(p.serialize());
 }
 
 void ParamTraits<net::HostPortPair>::Write(Message* m, const param_type& p) {