Remove 'url::DeprecatedSerializedOrigin'.

We're not using it anywhere anymore, let's kill it. BUG=512712 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1256173002 Cr-Commit-Position: refs/heads/master@{#340446}
Denger-Network · Jul 27, 2015 · 1e0b0d2 · 1e0b0d2
1 parent fbe5373
commit 1e0b0d2
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 151 deletions.
diff --git a/content/public/common/common_param_traits.cc b/content/public/common/common_param_traits.cc
@@ -56,31 +56,6 @@ void ParamTraits<GURL>::Log(const GURL& p, std::string* l) {
   l->append(p.spec());
 }
 
-void ParamTraits<url::DeprecatedSerializedOrigin>::Write(
-    Message* m,
-    const url::DeprecatedSerializedOrigin& p) {
-  m->WriteString(p.string());
-}
-
-bool ParamTraits<url::DeprecatedSerializedOrigin>::Read(
-    const Message* m,
-    base::PickleIterator* iter,
-    url::DeprecatedSerializedOrigin* p) {
-  std::string s;
-  if (!iter->ReadString(&s)) {
-    *p = url::DeprecatedSerializedOrigin();
-    return false;
-  }
-  *p = url::DeprecatedSerializedOrigin(s);
-  return true;
-}
-
-void ParamTraits<url::DeprecatedSerializedOrigin>::Log(
-    const url::DeprecatedSerializedOrigin& p,
-    std::string* l) {
-  l->append(p.string());
-}
-
 void ParamTraits<url::Origin>::Write(Message* m, const url::Origin& p) {
   WriteParam(m, p.unique());
   WriteParam(m, p.scheme());

diff --git a/content/public/common/common_param_traits.h b/content/public/common/common_param_traits.h
@@ -22,7 +22,6 @@
 #include "ipc/ipc_message_utils.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/surface/transport_dib.h"
-#include "url/deprecated_serialized_origin.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
@@ -45,14 +44,6 @@ struct CONTENT_EXPORT ParamTraits<GURL> {
   static void Log(const param_type& p, std::string* l);
 };
 
-template <>
-struct CONTENT_EXPORT ParamTraits<url::DeprecatedSerializedOrigin> {
-  typedef url::DeprecatedSerializedOrigin param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, base::PickleIterator* iter, param_type* p);
-  static void Log(const param_type& p, std::string* l);
-};
-
 template <>
 struct CONTENT_EXPORT ParamTraits<url::Origin> {
   typedef url::Origin param_type;

diff --git a/tools/ipc_fuzzer/fuzzer/fuzzer.cc b/tools/ipc_fuzzer/fuzzer/fuzzer.cc
@@ -1811,17 +1811,6 @@ struct FuzzTraits<url::Origin> {
   }
 };
 
-template <>
-struct FuzzTraits<url::DeprecatedSerializedOrigin> {
-  static bool Fuzz(url::DeprecatedSerializedOrigin* p, Fuzzer* fuzzer) {
-    std::string origin = p->string();
-    if (!FuzzParam(&origin, fuzzer))
-        return false;
-    *p = url::DeprecatedSerializedOrigin(origin);
-    return true;
-  }
-};
-
 template <>
 struct FuzzTraits<URLPattern> {
   static bool Fuzz(URLPattern* p, Fuzzer* fuzzer) {

diff --git a/url/BUILD.gn b/url/BUILD.gn
@@ -20,8 +20,6 @@ component("url") {
   sources = [
     "android/url_jni_registrar.cc",
     "android/url_jni_registrar.h",
-    "deprecated_serialized_origin.cc",
-    "deprecated_serialized_origin.h",
     "gurl.cc",
     "gurl.h",
     "origin.cc",
@@ -106,7 +104,6 @@ if (!is_android) {
 
   test("url_unittests") {
     sources = [
-      "deprecated_serialized_origin_unittest.cc",
       "gurl_unittest.cc",
       "origin_unittest.cc",
       "scheme_host_port_unittest.cc",

diff --git a/url/deprecated_serialized_origin.cc b/url/deprecated_serialized_origin.cc
diff --git a/url/deprecated_serialized_origin.h b/url/deprecated_serialized_origin.h
diff --git a/url/deprecated_serialized_origin_unittest.cc b/url/deprecated_serialized_origin_unittest.cc
diff --git a/url/url.gyp b/url/url.gyp
@@ -46,7 +46,6 @@
         'url_lib',
       ],
       'sources': [
-        'deprecated_serialized_origin_unittest.cc',
         'gurl_unittest.cc',
         'origin_unittest.cc',
         'scheme_host_port_unittest.cc',

diff --git a/url/url_srcs.gypi b/url/url_srcs.gypi
@@ -7,8 +7,6 @@
     'gurl_sources': [
       'android/url_jni_registrar.cc',
       'android/url_jni_registrar.h',
-      'deprecated_serialized_origin.cc',
-      'deprecated_serialized_origin.h',
       'gurl.cc',
       'gurl.h',
       'origin.cc',