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}

9 files changed, 0 insertions, 151 deletions

diff --git a/content/public/common/common_param_traits.cc b/content/public/common/common_param_traits.cc
index fd103b9..dfe7a7f 100644
--- 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
index 804c4f2c..69fb84a 100644
--- 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"
 
@@ -46,14 +45,6 @@ struct CONTENT_EXPORT ParamTraits<GURL> {
 };
 
 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;
   static void Write(Message* m, const param_type& p);
diff --git a/tools/ipc_fuzzer/fuzzer/fuzzer.cc b/tools/ipc_fuzzer/fuzzer/fuzzer.cc
index f0676ae..9e57c51 100644
--- a/tools/ipc_fuzzer/fuzzer/fuzzer.cc
+++ b/tools/ipc_fuzzer/fuzzer/fuzzer.cc
@@ -1812,17 +1812,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) {
     int valid_schemes = p->valid_schemes();
diff --git a/url/BUILD.gn b/url/BUILD.gn
index d5ea067..34dff8a 100644
--- 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
deleted file mode 100644
index 336e848..0000000
--- a/url/deprecated_serialized_origin.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 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.
-
-#include "url/deprecated_serialized_origin.h"
-
-#include "base/strings/pattern.h"
-#include "base/strings/string_util.h"
-
-namespace url {
-
-DeprecatedSerializedOrigin::DeprecatedSerializedOrigin() : string_("null") {
-}
-
-DeprecatedSerializedOrigin::DeprecatedSerializedOrigin(
-    const std::string& origin)
-    : string_(origin) {
-  DCHECK(origin == "null" || base::MatchPattern(origin, "?*://?*"));
-  DCHECK_GT(origin.size(), 0u);
-  DCHECK(origin == "file://" || origin[origin.size() - 1] != '/');
-}
-
-}  // namespace url
diff --git a/url/deprecated_serialized_origin.h b/url/deprecated_serialized_origin.h
deleted file mode 100644
index 2756e81..0000000
--- a/url/deprecated_serialized_origin.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef URL_DEPRECATED_SERIALIZED_ORIGIN_H_
-#define URL_DEPRECATED_SERIALIZED_ORIGIN_H_
-
-#include <string>
-
-#include "url/url_export.h"
-
-namespace url {
-
-// DeprecatedSerializedOrigin represents a Web Origin serialized to a string.
-// See RFC6454 for details.
-//
-// TODO(mkwst): Replace callsites with 'url::SchemeHostPort' or 'Origin', once
-// those classes exist.
-class URL_EXPORT DeprecatedSerializedOrigin {
- public:
-  DeprecatedSerializedOrigin();
-  explicit DeprecatedSerializedOrigin(const std::string& origin);
-
-  const std::string& string() const { return string_; }
-
-  bool IsSameAs(const DeprecatedSerializedOrigin& that) const {
-    return string_ == that.string_;
-  }
-
- private:
-  std::string string_;
-};
-
-}  // namespace url
-
-#endif  // URL_DEPRECATED_SERIALIZED_ORIGIN_H_
diff --git a/url/deprecated_serialized_origin_unittest.cc b/url/deprecated_serialized_origin_unittest.cc
deleted file mode 100644
index 140d366..0000000
--- a/url/deprecated_serialized_origin_unittest.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2014 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.
-
-#include "testing/gtest/include/gtest/gtest.h"
-#include "url/deprecated_serialized_origin.h"
-
-namespace url {
-
-namespace {
-
-// Each test examines the DeprecatedSerializedOrigin is constructed correctly
-// without violating DCHECKs.
-TEST(DeprecatedSerializedOriginTest, constructEmpty) {
-  DeprecatedSerializedOrigin origin;
-  EXPECT_EQ("null", origin.string());
-}
-
-TEST(DeprecatedSerializedOriginTest, constructNull) {
-  DeprecatedSerializedOrigin origin("null");
-  EXPECT_EQ("null", origin.string());
-}
-
-TEST(DeprecatedSerializedOriginTest, constructValid) {
-  DeprecatedSerializedOrigin origin("http://example.com:8080");
-  EXPECT_EQ("http://example.com:8080", origin.string());
-}
-
-TEST(DeprecatedSerializedOriginTest, constructValidFile) {
-  DeprecatedSerializedOrigin origin("file://");
-  EXPECT_EQ("file://", origin.string());
-}
-
-TEST(DeprecatedSerializedOriginTest, constructValidWithoutPort) {
-  DeprecatedSerializedOrigin origin("wss://example2.com");
-  EXPECT_EQ("wss://example2.com", origin.string());
-}
-
-}  // namespace
-
-}  // namespace url
diff --git a/url/url.gyp b/url/url.gyp
index b8355a8..a9990a6 100644
--- 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
index 21d2fe1..dfa1e3f 100644
--- 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',