diff --git a/url/gurl.cc b/url/gurl.cc index c2ce264fe157..166e0edc0081 100644 --- a/url/gurl.cc +++ b/url/gurl.cc @@ -4,6 +4,8 @@ #include "url/gurl.h" +#include + #include #include @@ -12,7 +14,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/trace_event/memory_usage_estimator.h" -#include "starboard/types.h" #include "url/url_canon_stdstring.h" #include "url/url_util.h" diff --git a/url/gurl.h b/url/gurl.h index 0f0fd8c5e052..58ab96dc68a5 100644 --- a/url/gurl.h +++ b/url/gurl.h @@ -5,6 +5,8 @@ #ifndef URL_GURL_H_ #define URL_GURL_H_ +#include + #include #include #include @@ -12,7 +14,6 @@ #include "base/debug/alias.h" #include "base/strings/string16.h" #include "base/strings/string_piece.h" -#include "starboard/types.h" #include "url/third_party/mozilla/url_parse.h" #include "url/url_canon.h" #include "url/url_canon_stdstring.h" diff --git a/url/gurl_unittest.cc b/url/gurl_unittest.cc index 68c432d12af3..eefa73650a7a 100644 --- a/url/gurl_unittest.cc +++ b/url/gurl_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include "base/macros.h" #include "base/strings/utf_string_conversions.h" -#include "starboard/common/string.h" -#include "starboard/types.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "url/url_canon.h" diff --git a/url/origin.cc b/url/origin.cc index 487be184232c..f8c664c932f5 100644 --- a/url/origin.cc +++ b/url/origin.cc @@ -4,11 +4,11 @@ #include "url/origin.h" +#include #include #include "base/logging.h" #include "base/strings/string_number_conversions.h" -#include "starboard/types.h" #include "url/gurl.h" #include "url/url_canon.h" #include "url/url_canon_stdstring.h" diff --git a/url/origin.h b/url/origin.h index 72fe2769afe8..75807359d778 100644 --- a/url/origin.h +++ b/url/origin.h @@ -5,6 +5,8 @@ #ifndef URL_ORIGIN_H_ #define URL_ORIGIN_H_ +#include + #include #include "base/debug/alias.h" @@ -13,7 +15,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/unguessable_token.h" -#include "starboard/types.h" #include "url/scheme_host_port.h" #include "url/third_party/mozilla/url_parse.h" #include "url/url_canon.h" diff --git a/url/origin_unittest.cc b/url/origin_unittest.cc index 99f723fa5a1f..1cfb5c3749eb 100644 --- a/url/origin_unittest.cc +++ b/url/origin_unittest.cc @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include +#include + #include "base/logging.h" #include "base/macros.h" -#include "starboard/types.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "url/origin.h" diff --git a/url/scheme_host_port.cc b/url/scheme_host_port.cc index 577083490d53..c4f0ba5d5cc6 100644 --- a/url/scheme_host_port.cc +++ b/url/scheme_host_port.cc @@ -4,6 +4,7 @@ #include "url/scheme_host_port.h" +#include #include #include @@ -11,7 +12,6 @@ #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" -#include "starboard/types.h" #include "url/gurl.h" #include "url/third_party/mozilla/url_parse.h" #include "url/url_canon.h" diff --git a/url/scheme_host_port.h b/url/scheme_host_port.h index 956dbcf24007..18562acf6f54 100644 --- a/url/scheme_host_port.h +++ b/url/scheme_host_port.h @@ -5,10 +5,11 @@ #ifndef URL_SCHEME_HOST_PORT_H_ #define URL_SCHEME_HOST_PORT_H_ +#include + #include #include "base/strings/string_piece.h" -#include "starboard/types.h" #include "url/url_export.h" class GURL; @@ -112,12 +113,6 @@ class URL_EXPORT SchemeHostPort { SchemeHostPort& operator=(const SchemeHostPort&) = default; SchemeHostPort(SchemeHostPort&&) = default; SchemeHostPort& operator=(SchemeHostPort&&) = default; -#if defined(STARBOARD) - // Cobalt's compiler can not generate operator== by default yet. - bool operator==(const SchemeHostPort& rhs) const { - return scheme_ == rhs.scheme_ && host_ == rhs.host_ && port_ == rhs.port_; - } -#endif ~SchemeHostPort(); diff --git a/url/scheme_host_port_unittest.cc b/url/scheme_host_port_unittest.cc index 24c4e0f26483..9a18d2f67619 100644 --- a/url/scheme_host_port_unittest.cc +++ b/url/scheme_host_port_unittest.cc @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include +#include + #include "base/macros.h" -#include "starboard/types.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "url/scheme_host_port.h" diff --git a/url/third_party/mozilla/url_parse.cc b/url/third_party/mozilla/url_parse.cc index 278ee05cb16c..f70f9fb24750 100644 --- a/url/third_party/mozilla/url_parse.cc +++ b/url/third_party/mozilla/url_parse.cc @@ -39,8 +39,6 @@ #include #include "base/logging.h" -#include "starboard/common/string.h" -#include "starboard/types.h" #include "url/url_parse_internal.h" #include "url/url_util.h" #include "url/url_util_internal.h" diff --git a/url/url_canon.h b/url/url_canon.h index 626196d34a96..f779961e3a26 100644 --- a/url/url_canon.h +++ b/url/url_canon.h @@ -10,8 +10,6 @@ #include "base/export_template.h" #include "base/strings/string16.h" -#include "starboard/memory.h" -#include "starboard/types.h" #include "url/third_party/mozilla/url_parse.h" #include "url/url_export.h" diff --git a/url/url_canon_etc.cc b/url/url_canon_etc.cc index 0eef867a4618..7e3d0208a4d2 100644 --- a/url/url_canon_etc.cc +++ b/url/url_canon_etc.cc @@ -6,7 +6,6 @@ #include -#include "starboard/types.h" #include "url/url_canon.h" #include "url/url_canon_internal.h" diff --git a/url/url_canon_icu.cc b/url/url_canon_icu.cc index a87235b80bbb..02cc2b4ff4fb 100644 --- a/url/url_canon_icu.cc +++ b/url/url_canon_icu.cc @@ -4,12 +4,11 @@ // ICU-based character set converter. +#include #include #include #include "base/logging.h" -#include "starboard/common/string.h" -#include "starboard/types.h" #include "third_party/icu/source/common/unicode/ucnv.h" #include "third_party/icu/source/common/unicode/ucnv_cb.h" #include "third_party/icu/source/common/unicode/utypes.h" diff --git a/url/url_canon_icu_unittest.cc b/url/url_canon_icu_unittest.cc index fa2e8bc7e72e..60c46039f59f 100644 --- a/url/url_canon_icu_unittest.cc +++ b/url/url_canon_icu_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include "base/macros.h" -#include "starboard/common/string.h" -#include "starboard/types.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/icu/source/common/unicode/ucnv.h" #include "url/url_canon.h" diff --git a/url/url_canon_internal.h b/url/url_canon_internal.h index 12498d87a24d..ca4e36af2eca 100644 --- a/url/url_canon_internal.h +++ b/url/url_canon_internal.h @@ -10,14 +10,10 @@ // template bloat because everything is inlined when anybody calls any of our // functions. -#if defined(STARBOARD) -#include "starboard/common/string.h" -#else +#include #include -#endif #include "base/logging.h" -#include "starboard/types.h" #include "url/url_canon.h" namespace url { diff --git a/url/url_canon_ip.cc b/url/url_canon_ip.cc index 5d96e824ed93..4656bca185d4 100644 --- a/url/url_canon_ip.cc +++ b/url/url_canon_ip.cc @@ -4,12 +4,11 @@ #include "url/url_canon_ip.h" +#include #include #include #include "base/logging.h" -#include "starboard/common/string.h" -#include "starboard/types.h" #include "url/url_canon_internal.h" namespace url { diff --git a/url/url_canon_path.cc b/url/url_canon_path.cc index 543d15a76c0b..2e088a03fc2e 100644 --- a/url/url_canon_path.cc +++ b/url/url_canon_path.cc @@ -5,7 +5,6 @@ #include #include "base/logging.h" -#include "starboard/types.h" #include "url/url_canon.h" #include "url/url_canon_internal.h" #include "url/url_parse_internal.h" diff --git a/url/url_canon_unittest.cc b/url/url_canon_unittest.cc index 0a0567e2c3bc..a29db7f9cff3 100644 --- a/url/url_canon_unittest.cc +++ b/url/url_canon_unittest.cc @@ -3,12 +3,10 @@ // found in the LICENSE file. #include +#include #include "base/macros.h" #include "base/strings/utf_string_conversions.h" -#include "starboard/common/string.h" -#include "starboard/memory.h" -#include "starboard/types.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/third_party/mozilla/url_parse.h" #include "url/url_canon.h" diff --git a/url/url_constants.h b/url/url_constants.h index 84a5ba0c57d3..e06af29979f2 100644 --- a/url/url_constants.h +++ b/url/url_constants.h @@ -5,7 +5,7 @@ #ifndef URL_URL_CONSTANTS_H_ #define URL_URL_CONSTANTS_H_ -#include "starboard/types.h" +#include #include "url/url_export.h" diff --git a/url/url_idna_icu.cc b/url/url_idna_icu.cc index f90b9a8db4a1..601736ee93cc 100644 --- a/url/url_idna_icu.cc +++ b/url/url_idna_icu.cc @@ -4,12 +4,12 @@ // ICU-based IDNA converter. +#include #include #include #include "base/lazy_instance.h" #include "base/logging.h" -#include "starboard/types.h" #include "third_party/icu/source/common/unicode/uidna.h" #include "third_party/icu/source/common/unicode/utypes.h" #include "url/url_canon_icu.h" diff --git a/url/url_idna_icu_alternatives_android.cc b/url/url_idna_icu_alternatives_android.cc index d844be178d8f..daa0582604fd 100644 --- a/url/url_idna_icu_alternatives_android.cc +++ b/url/url_idna_icu_alternatives_android.cc @@ -9,7 +9,6 @@ #include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "jni/IDNStringUtil_jni.h" -#include "starboard/types.h" #include "url/url_canon_internal.h" using base::android::ScopedJavaLocalRef; diff --git a/url/url_parse_unittest.cc b/url/url_parse_unittest.cc index a6a6ab76cda3..b80e865661a4 100644 --- a/url/url_parse_unittest.cc +++ b/url/url_parse_unittest.cc @@ -4,16 +4,12 @@ #include "url/third_party/mozilla/url_parse.h" +#include + #include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/third_party/mozilla/url_parse.h" -#if defined(STARBOARD) -#include "starboard/client_porting/poem/string_poem.h" -#include "starboard/common/string.h" -#include "starboard/types.h" -#endif - // Interesting IE file:isms... // // file:/foo/bar file:///foo/bar diff --git a/url/url_util.cc b/url/url_util.cc index 9b2f2fbd5185..7abba476ac44 100644 --- a/url/url_util.cc +++ b/url/url_util.cc @@ -4,15 +4,12 @@ #include "url/url_util.h" +#include #include #include "base/debug/leak_annotations.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "starboard/common/string.h" -#include "starboard/configuration.h" -#include "starboard/memory.h" -#include "starboard/types.h" #include "url/url_canon_internal.h" #include "url/url_constants.h" #include "url/url_file.h" diff --git a/url/url_util_unittest.cc b/url/url_util_unittest.cc index 35b86e7b0afa..65f3435e9d1b 100644 --- a/url/url_util_unittest.cc +++ b/url/url_util_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include "base/macros.h" -#include "starboard/common/string.h" -#include "starboard/types.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/third_party/mozilla/url_parse.h" #include "url/url_canon.h"