Merge 176009

content/public/common/common_param_traits.cc

Index: content/public/common/common_param_traits.cc
===================================================================
--- content/public/common/common_param_traits.cc	(revision 177486)
+++ content/public/common/common_param_traits.cc	(working copy)
@@ -58,13 +58,8 @@
   // type as GURL. See https://crbug.com/166486 for additional work in
   // this area.
   if (!p.is_valid()) {
-    GURL reconstructed_url(p.possibly_invalid_spec());
-    if (reconstructed_url.is_valid()) {
-      DLOG(WARNING) << "GURL string " << p.possibly_invalid_spec()
-                    << " (marked invalid) but parsed as valid.";
-      m->WriteString(std::string());
-      return;
-    }
+    m->WriteString(std::string());
+    return;
   }
 
   m->WriteString(p.possibly_invalid_spec());
@@ -78,6 +73,10 @@
     return false;
   }
   *p = GURL(s);
+  if (!s.empty() && !p->is_valid()) {
+    *p = GURL();
+    return false;
+  }
   return true;
 }