Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: content/renderer/webpublicsuffixlist_impl.cc

Issue 2446273004: Reduce buggy usage of the registry controlled domain service. (Closed)
Patch Set: Review comment Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/webpublicsuffixlist_impl.h ('k') | extensions/common/csp_validator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/webpublicsuffixlist_impl.h" 5 #include "content/renderer/webpublicsuffixlist_impl.h"
6 6
7 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 7 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 WebPublicSuffixListImpl::~WebPublicSuffixListImpl() { 11 WebPublicSuffixListImpl::~WebPublicSuffixListImpl() {
12 } 12 }
13 13
14 size_t WebPublicSuffixListImpl::getPublicSuffixLength( 14 size_t WebPublicSuffixListImpl::getPublicSuffixLength(
15 const blink::WebString& host) { 15 const blink::WebString& canonical_host) {
16 size_t result = net::registry_controlled_domains::GetRegistryLength( 16 size_t result =
17 host.utf8(), 17 net::registry_controlled_domains::GetCanonicalHostRegistryLength(
18 net::registry_controlled_domains::INCLUDE_UNKNOWN_REGISTRIES, 18 canonical_host.utf8(),
19 net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); 19 net::registry_controlled_domains::INCLUDE_UNKNOWN_REGISTRIES,
20 return result ? result : host.length(); 20 net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
21 return result ? result : canonical_host.length();
21 } 22 }
22 23
23 } // namespace content 24 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/webpublicsuffixlist_impl.h ('k') | extensions/common/csp_validator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698