diff options
Diffstat (limited to 'net')
19 files changed, 37 insertions, 31 deletions
diff --git a/net/base/registry_controlled_domains/OWNERS b/net/base/registry_controlled_domains/OWNERS new file mode 100644 index 0000000..9f8b179 --- /dev/null +++ b/net/base/registry_controlled_domains/OWNERS @@ -0,0 +1,2 @@ +pam@chromium.org +pkasting@chromium.org diff --git a/net/base/effective_tld_names.cc b/net/base/registry_controlled_domains/effective_tld_names.cc index 69102ab..69102ab 100644 --- a/net/base/effective_tld_names.cc +++ b/net/base/registry_controlled_domains/effective_tld_names.cc diff --git a/net/base/effective_tld_names.dat b/net/base/registry_controlled_domains/effective_tld_names.dat index 48f349c..48f349c 100644 --- a/net/base/effective_tld_names.dat +++ b/net/base/registry_controlled_domains/effective_tld_names.dat diff --git a/net/base/effective_tld_names.gperf b/net/base/registry_controlled_domains/effective_tld_names.gperf index 2d24ed7..2d24ed7 100644 --- a/net/base/effective_tld_names.gperf +++ b/net/base/registry_controlled_domains/effective_tld_names.gperf diff --git a/net/base/effective_tld_names_unittest1.cc b/net/base/registry_controlled_domains/effective_tld_names_unittest1.cc index 8e52a2b..90db768 100644 --- a/net/base/effective_tld_names_unittest1.cc +++ b/net/base/registry_controlled_domains/effective_tld_names_unittest1.cc @@ -30,12 +30,12 @@ #line 1 "effective_tld_names_unittest1.gperf" -// Copyright (c) 2009 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. +// Copyright (c) 2012 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. // Test file used by registry_controlled_domain_unittest. // We edit this file manually, then run -// gperf -a -L "C++" -C -G -c -o -t -k '*' -NFindDomain -ZPerfect_Hash_Test2 -Hhash_test1 -Wword_list1 -D effective_tld_names_unittest1.gperf > effective_tld_names_unittest1.cc +// gperf -a -L "C++" -C -c -o -t -k '*' -NFindDomain -ZPerfect_Hash_Test1 -D effective_tld_names_unittest1.gperf > effective_tld_names_unittest1.cc // to generate the perfect hashmap. #line 10 "effective_tld_names_unittest1.gperf" struct DomainRule { diff --git a/net/base/effective_tld_names_unittest1.gperf b/net/base/registry_controlled_domains/effective_tld_names_unittest1.gperf index f7bb428..7100908 100644 --- a/net/base/effective_tld_names_unittest1.gperf +++ b/net/base/registry_controlled_domains/effective_tld_names_unittest1.gperf @@ -1,7 +1,7 @@ %{ -// Copyright (c) 2009 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. +// Copyright (c) 2012 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. // Test file used by registry_controlled_domain_unittest. // We edit this file manually, then run // gperf -a -L "C++" -C -c -o -t -k '*' -NFindDomain -ZPerfect_Hash_Test1 -D effective_tld_names_unittest1.gperf > effective_tld_names_unittest1.cc diff --git a/net/base/effective_tld_names_unittest2.cc b/net/base/registry_controlled_domains/effective_tld_names_unittest2.cc index 17d1119..05296a7 100644 --- a/net/base/effective_tld_names_unittest2.cc +++ b/net/base/registry_controlled_domains/effective_tld_names_unittest2.cc @@ -30,9 +30,9 @@ #line 1 "effective_tld_names_unittest2.gperf" -// Copyright (c) 2009 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. +// Copyright (c) 2012 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. // Test file used by registry_controlled_domain_unittest. // We edit this file manually, then run // gperf -a -L "C++" -C -c -o -t -k '*' -NFindDomain -ZPerfect_Hash_Test2 -D -T effective_tld_names_unittest2.gperf > effective_tld_names_unittest2.cc diff --git a/net/base/effective_tld_names_unittest2.gperf b/net/base/registry_controlled_domains/effective_tld_names_unittest2.gperf index 34eeb1f..5942f96 100644 --- a/net/base/effective_tld_names_unittest2.gperf +++ b/net/base/registry_controlled_domains/effective_tld_names_unittest2.gperf @@ -1,7 +1,7 @@ %{ -// Copyright (c) 2009 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. +// Copyright (c) 2012 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. // Test file used by registry_controlled_domain_unittest. // We edit this file manually, then run // gperf -a -L "C++" -C -c -o -t -k '*' -NFindDomain -ZPerfect_Hash_Test2 -D -T effective_tld_names_unittest2.gperf > effective_tld_names_unittest2.cc diff --git a/net/base/registry_controlled_domain.cc b/net/base/registry_controlled_domains/registry_controlled_domain.cc index 00d022f..a20af08 100644 --- a/net/base/registry_controlled_domain.cc +++ b/net/base/registry_controlled_domains/registry_controlled_domain.cc @@ -43,7 +43,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "base/logging.h" #include "base/string_util.h" diff --git a/net/base/registry_controlled_domain.h b/net/base/registry_controlled_domains/registry_controlled_domain.h index f40281f..f1d9a11 100644 --- a/net/base/registry_controlled_domain.h +++ b/net/base/registry_controlled_domains/registry_controlled_domain.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -110,8 +110,8 @@ GURL to normalize rules, and validating the rules. */ -#ifndef NET_BASE_REGISTRY_CONTROLLED_DOMAIN_H_ -#define NET_BASE_REGISTRY_CONTROLLED_DOMAIN_H_ +#ifndef NET_BASE_REGISTRY_CONTROLLED_DOMAINS_REGISTRY_CONTROLLED_DOMAIN_H_ +#define NET_BASE_REGISTRY_CONTROLLED_DOMAINS_REGISTRY_CONTROLLED_DOMAIN_H_ #include <string> @@ -214,4 +214,4 @@ class NET_EXPORT RegistryControlledDomainService { } // namespace net -#endif // NET_BASE_REGISTRY_CONTROLLED_DOMAIN_H_ +#endif // NET_BASE_REGISTRY_CONTROLLED_DOMAINS_REGISTRY_CONTROLLED_DOMAIN_H_ diff --git a/net/base/registry_controlled_domain_unittest.cc b/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc index 464e417..7ae5da4 100644 --- a/net/base/registry_controlled_domain_unittest.cc +++ b/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "googleurl/src/gurl.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "testing/gtest/include/gtest/gtest.h" #include "effective_tld_names_unittest1.cc" diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc index dd2b9ae..9639027 100644 --- a/net/base/sdch_manager.cc +++ b/net/base/sdch_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,7 +10,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "crypto/sha2.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/url_request/url_request_http_job.h" namespace net { diff --git a/net/base/server_bound_cert_service.cc b/net/base/server_bound_cert_service.cc index b2d3bc8..46a598f 100644 --- a/net/base/server_bound_cert_service.cc +++ b/net/base/server_bound_cert_service.cc @@ -22,7 +22,7 @@ #include "crypto/ec_private_key.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/base/server_bound_cert_store.h" #include "net/base/x509_certificate.h" #include "net/base/x509_util.h" diff --git a/net/base/static_cookie_policy.cc b/net/base/static_cookie_policy.cc index 9c4bbcf..55f4530 100644 --- a/net/base/static_cookie_policy.cc +++ b/net/base/static_cookie_policy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,7 +7,7 @@ #include "base/logging.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" namespace net { diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc index 2ed9781..eab2e0e 100644 --- a/net/cookies/cookie_monster.cc +++ b/net/cookies/cookie_monster.cc @@ -59,9 +59,9 @@ #include "base/stringprintf.h" #include "googleurl/src/gurl.h" #include "net/cookies/canonical_cookie.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/cookie_util.h" #include "net/cookies/parsed_cookie.h" -#include "net/base/registry_controlled_domain.h" using base::Time; using base::TimeDelta; diff --git a/net/cookies/cookie_util.cc b/net/cookies/cookie_util.cc index bd1019d..6cd3b29 100644 --- a/net/cookies/cookie_util.cc +++ b/net/cookies/cookie_util.cc @@ -13,7 +13,7 @@ #include "build/build_config.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" namespace net { namespace cookie_util { diff --git a/net/net.gyp b/net/net.gyp index a00509a..f8de4ff 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -218,8 +218,8 @@ 'base/prioritized_dispatcher.h', 'base/priority_queue.h', 'base/rand_callback.h', - 'base/registry_controlled_domain.cc', - 'base/registry_controlled_domain.h', + 'base/registry_controlled_domains/registry_controlled_domain.cc', + 'base/registry_controlled_domains/registry_controlled_domain.h', 'base/request_priority.h', 'base/sdch_filter.cc', 'base/sdch_filter.h', @@ -1110,7 +1110,7 @@ 'base/pem_tokenizer_unittest.cc', 'base/prioritized_dispatcher_unittest.cc', 'base/priority_queue_unittest.cc', - 'base/registry_controlled_domain_unittest.cc', + 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc', 'base/run_all_unittests.cc', 'base/sdch_filter_unittest.cc', 'base/server_bound_cert_service_unittest.cc', diff --git a/net/tools/tld_cleanup/README b/net/tools/tld_cleanup/README index 03cd56f..adaac7e 100644 --- a/net/tools/tld_cleanup/README +++ b/net/tools/tld_cleanup/README @@ -1,4 +1,4 @@ -When updating src/net/base/effective_tld_names.dat: +When updating src/net/base/registry_controlled_domains/effective_tld_names.dat: 1. Obtain the new effective_tld_names.dat, probably by downloading http://goo.gl/Ji2bB @@ -11,7 +11,7 @@ When updating src/net/base/effective_tld_names.dat: 5. Run it (no arguments needed), typically from src/build/Release or src/build/Debug. It will re-generate - src/net/base/effective_tld_names.gperf. + src/net/base/registry_controlled_domains/effective_tld_names.gperf. 6. Run gperf on the new effective_tld_names.gperf: gperf -a -L "C++" -C -c -o -t -k '*' -NFindDomain -D -m 5 \ diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc index 2094a37..6774cc4 100644 --- a/net/tools/tld_cleanup/tld_cleanup.cc +++ b/net/tools/tld_cleanup/tld_cleanup.cc @@ -296,12 +296,16 @@ int main(int argc, const char* argv[]) { PathService::Get(base::DIR_SOURCE_ROOT, &input_file); input_file = input_file.Append(FILE_PATH_LITERAL("net")) .Append(FILE_PATH_LITERAL("base")) + .Append(FILE_PATH_LITERAL( + "registry_controlled_domains")) .Append(FILE_PATH_LITERAL("effective_tld_names.dat")); FilePath output_file; PathService::Get(base::DIR_SOURCE_ROOT, &output_file); output_file = output_file.Append(FILE_PATH_LITERAL("net")) .Append(FILE_PATH_LITERAL("base")) .Append(FILE_PATH_LITERAL( + "registry_controlled_domains")) + .Append(FILE_PATH_LITERAL( "effective_tld_names.gperf")); NormalizeResult result = NormalizeFile(input_file, output_file); if (result != kSuccess) { |