diff options
47 files changed, 67 insertions, 61 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index 3ff4c59..3bf0e60 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -19,7 +19,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/load_flags.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc index 0d280b2..c964559 100644 --- a/chrome/browser/autocomplete/autocomplete_input.cc +++ b/chrome/browser/autocomplete/autocomplete_input.cc @@ -12,7 +12,7 @@ #include "content/public/common/url_constants.h" #include "googleurl/src/url_canon_ip.h" #include "net/base/net_util.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" AutocompleteInput::AutocompleteInput() : type_(INVALID), diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc index b18b27b..59742e2 100644 --- a/chrome/browser/autocomplete/history_url_provider.cc +++ b/chrome/browser/autocomplete/history_url_provider.cc @@ -31,7 +31,7 @@ #include "googleurl/src/url_parse.h" #include "googleurl/src/url_util.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 { diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc index 0e261e1..f537849 100644 --- a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc +++ b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc @@ -13,7 +13,7 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/parsed_cookie.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/content_settings/local_shared_objects_container.cc b/chrome/browser/content_settings/local_shared_objects_container.cc index b7c6921..8b63d09 100644 --- a/chrome/browser/content_settings/local_shared_objects_container.cc +++ b/chrome/browser/content_settings/local_shared_objects_container.cc @@ -14,7 +14,7 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/canonical_cookie.h" LocalSharedObjectsContainer::LocalSharedObjectsContainer(Profile* profile) diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index 53e651c..e3687e4 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -21,7 +21,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/canonical_cookie.h" #include "net/url_request/url_request_context.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 9a62852..cc7d1c8 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -101,7 +101,7 @@ #include "content/public/common/pepper_plugin_info.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "sync/api/sync_change.h" #include "sync/api/sync_error_factory.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc index 97a16a7..1e59459 100644 --- a/chrome/browser/google/google_util.cc +++ b/chrome/browser/google/google_util.cc @@ -20,7 +20,7 @@ #include "chrome/installer/util/google_update_settings.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_parse.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #if defined(OS_MACOSX) #include "chrome/browser/mac/keystone_glue.h" diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index 8bdaab6..7488b35 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -35,7 +35,7 @@ #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #if defined(OS_ANDROID) #include "chrome/browser/history/android/android_provider_backend.h" diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index 16541fa..d7f9f63 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc @@ -15,7 +15,7 @@ #include "chrome/common/pref_names.h" #include "net/base/load_flags.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/url_request/url_fetcher.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index 86a7702..b519feb 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -27,7 +27,7 @@ #include "chrome/browser/net/clear_on_exit_policy.h" #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/canonical_cookie.h" #include "sql/meta_table.h" #include "sql/statement.h" diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index 8f64782..8d61593 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -19,7 +19,7 @@ #include "googleurl/src/url_util.h" #include "net/base/escape.h" #include "net/base/net_util.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" const char* URLFixerUpper::home_directory_override = NULL; diff --git a/chrome/browser/protector/protector_service.cc b/chrome/browser/protector/protector_service.cc index aa16f7f..d57344e 100644 --- a/chrome/browser/protector/protector_service.cc +++ b/chrome/browser/protector/protector_service.cc @@ -17,7 +17,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_source.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" namespace protector { diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index fd8c2be..8f19b2d 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -40,7 +40,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 332accd..d97dc29 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -181,7 +181,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" #include "ui/base/animation/animation.h" diff --git a/chrome/browser/ui/constrained_window_tab_helper.cc b/chrome/browser/ui/constrained_window_tab_helper.cc index a372e31..3d8d103 100644 --- a/chrome/browser/ui/constrained_window_tab_helper.cc +++ b/chrome/browser/ui/constrained_window_tab_helper.cc @@ -13,7 +13,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" using content::WebContents; diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 8553072..53c2cf5 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -26,7 +26,7 @@ #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc index 91bfc11..b6a4b99 100644 --- a/chrome/browser/ui/website_settings/website_settings.cc +++ b/chrome/browser/ui/website_settings/website_settings.cc @@ -34,7 +34,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/cert_status_flags.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/base/ssl_cipher_suite_names.h" #include "net/base/ssl_connection_status_flags.h" #include "net/base/x509_certificate.h" diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index d6033d5..b7a4404 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -46,7 +46,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/permissions/permission_set.cc b/chrome/common/extensions/permissions/permission_set.cc index 580c8dba..de34a86 100644 --- a/chrome/common/extensions/permissions/permission_set.cc +++ b/chrome/common/extensions/permissions/permission_set.cc @@ -14,7 +14,7 @@ #include "chrome/common/extensions/url_pattern_set.h" #include "content/public/common/url_constants.h" #include "grit/generated_resources.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc index 2b9fdc3..15ceb6d 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc @@ -15,7 +15,7 @@ #include "chrome/renderer/safe_browsing/feature_extractor_clock.h" #include "chrome/renderer/safe_browsing/features.h" #include "content/public/renderer/render_view.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeCollection.h" diff --git a/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc index 2a51cac..5233d86 100644 --- a/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 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. @@ -15,7 +15,7 @@ #include "base/string_util.h" #include "chrome/renderer/safe_browsing/features.h" #include "googleurl/src/gurl.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" namespace safe_browsing { diff --git a/chrome_frame/ready_mode/ready_mode.cc b/chrome_frame/ready_mode/ready_mode.cc index 8f6e1b5..b07f158 100644 --- a/chrome_frame/ready_mode/ready_mode.cc +++ b/chrome_frame/ready_mode/ready_mode.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. @@ -16,7 +16,7 @@ #include "base/win/scoped_comptr.h" #include "base/win/win_util.h" #include "chrome/installer/util/browser_distribution.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "chrome_frame/infobars/infobar_manager.h" #include "chrome_frame/ready_mode/internal/ready_mode_web_browser_adapter.h" #include "chrome_frame/ready_mode/internal/ready_prompt_content.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host_impl.cc b/content/browser/renderer_host/resource_dispatcher_host_impl.cc index 30f3381..a897353 100644 --- a/content/browser/renderer_host/resource_dispatcher_host_impl.cc +++ b/content/browser/renderer_host/resource_dispatcher_host_impl.cc @@ -65,7 +65,7 @@ #include "net/base/load_flags.h" #include "net/base/mime_util.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/request_priority.h" #include "net/base/ssl_cert_request_info.h" #include "net/base/upload_data.h" diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc index 0b36c6c..bded902 100644 --- a/content/browser/site_instance_impl.cc +++ b/content/browser/site_instance_impl.cc @@ -15,7 +15,7 @@ #include "content/public/browser/web_ui_controller_factory.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" using content::RenderProcessHost; using content::RenderProcessHostImpl; diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc index dc4a8bc..e665f11 100644 --- a/content/browser/worker_host/worker_process_host.cc +++ b/content/browser/worker_host/worker_process_host.cc @@ -45,7 +45,7 @@ #include "content/public/common/result_codes.h" #include "ipc/ipc_switches.h" #include "net/base/mime_util.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "ui/base/ui_base_switches.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/sandbox_mount_point_provider.h" diff --git a/content/browser/worker_host/worker_service_impl.cc b/content/browser/worker_host/worker_service_impl.cc index df54cdd..0e23287 100644 --- a/content/browser/worker_host/worker_service_impl.cc +++ b/content/browser/worker_host/worker_service_impl.cc @@ -20,7 +20,7 @@ #include "content/public/browser/worker_service_observer.h" #include "content/public/common/content_switches.h" #include "content/public/common/process_type.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" namespace content { 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) { diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc index ff3ad3a..7d7194a 100644 --- a/ui/base/text/text_elider.cc +++ b/ui/base/text/text_elider.cc @@ -24,7 +24,7 @@ #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/net_util.h" -#include "net/base/registry_controlled_domain.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "ui/gfx/font.h" #include "unicode/rbbi.h" #include "unicode/uloc.h" |