diff options
45 files changed, 81 insertions, 81 deletions
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index e5d06f3..9ab71f2 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -33,8 +33,8 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "net/base/cookie_monster.h" -#include "net/base/cookie_store.h" +#include "net/cookies/cookie_monster.h" +#include "net/cookies/cookie_store.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index a28a08b..bdc86e7 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -137,7 +137,7 @@ #include "content/public/common/child_process_host.h" #include "content/public/common/common_param_traits.h" #include "content/public/common/ssl_status.h" -#include "net/base/cookie_store.h" +#include "net/cookies/cookie_store.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "ui/base/events.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index 8118483..5d2df14 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -13,10 +13,10 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_request_info.h" -#include "net/base/cookie_monster.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" +#include "net/cookies/cookie_monster.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" diff --git a/chrome/browser/browsing_data_cookie_helper.h b/chrome/browser/browsing_data_cookie_helper.h index 5597619..51c230a 100644 --- a/chrome/browser/browsing_data_cookie_helper.h +++ b/chrome/browser/browsing_data_cookie_helper.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. @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" class GURL; class Profile; diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index 446dd18..baaf258 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.cc @@ -48,11 +48,11 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/plugin_data_remover.h" #include "content/public/browser/user_metrics.h" -#include "net/base/cookie_store.h" #include "net/base/net_errors.h" #include "net/base/origin_bound_cert_service.h" #include "net/base/origin_bound_cert_store.h" #include "net/base/transport_security_state.h" +#include "net/cookies/cookie_store.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data_remover_unittest.cc index fa3cb45..65269cc 100644 --- a/chrome/browser/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data_remover_unittest.cc @@ -21,10 +21,10 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" #include "content/test/test_browser_thread.h" -#include "net/base/cookie_monster.h" #include "net/base/origin_bound_cert_service.h" #include "net/base/origin_bound_cert_store.h" #include "net/base/ssl_client_cert_type.h" +#include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 9d2cb72..e558ff2 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -58,22 +58,22 @@ #include "chrome/browser/nacl_host/nacl_process_host.h" #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/net/predictor.h" -#include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/notifications/desktop_notification_service.h" +#include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/plugin_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/prerender/prerender_field_trial.h" -#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" +#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/search_engines/search_engine_type.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/service/service_process_control.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/translate/translate_manager.h" @@ -105,9 +105,9 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/platform_locale_settings.h" -#include "net/base/cookie_monster.h" #include "net/base/net_module.h" #include "net/base/sdch_manager.h" +#include "net/cookies/cookie_monster.h" #include "net/http/http_basic_stream.h" #include "net/http/http_network_layer.h" #include "net/http/http_stream_factory.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 4afc31c..9cd6c70 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -83,9 +83,9 @@ #include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" -#include "net/base/cookie_monster.h" -#include "net/base/cookie_options.h" #include "net/base/ssl_cert_request_info.h" +#include "net/cookies/cookie_monster.h" +#include "net/cookies/cookie_options.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/webpreferences.h" diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index 40c23b9..20b1de0 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -32,8 +32,8 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" #include "grit/generated_resources.h" -#include "net/base/cookie_monster.h" -#include "net/base/cookie_store.h" +#include "net/cookies/cookie_monster.h" +#include "net/cookies/cookie_store.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index f43a678..672687f 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -73,8 +73,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "googleurl/src/gurl.h" -#include "net/base/cookie_monster.h" -#include "net/base/cookie_store.h" +#include "net/cookies/cookie_monster.h" +#include "net/cookies/cookie_store.h" #include "net/http/http_auth_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_transaction_factory.h" diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc index 749ece9..283857d 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.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 "chrome/test/base/testing_profile.h" #include "content/browser/tab_contents/test_tab_contents.h" #include "content/test/test_browser_thread.h" -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index fd45b7a..ccb75bf 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -19,8 +19,8 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#include "net/base/cookie_monster.h" #include "net/base/registry_controlled_domain.h" +#include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/cookies_tree_model.h b/chrome/browser/cookies_tree_model.h index 011e318..2d71374 100644 --- a/chrome/browser/cookies_tree_model.h +++ b/chrome/browser/cookies_tree_model.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. @@ -24,7 +24,7 @@ #include "chrome/browser/browsing_data_local_storage_helper.h" #include "chrome/browser/browsing_data_quota_helper.h" #include "chrome/common/content_settings.h" -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" #include "ui/base/models/tree_node_model.h" class BrowsingDataCookieHelper; diff --git a/chrome/browser/extensions/extension_cookies_api.cc b/chrome/browser/extensions/extension_cookies_api.cc index 1a8fe97..e1c2823 100644 --- a/chrome/browser/extensions/extension_cookies_api.cc +++ b/chrome/browser/extensions/extension_cookies_api.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. @@ -19,7 +19,7 @@ #include "chrome/common/extensions/extension_error_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" -#include "net/base/cookie_monster.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/extensions/extension_cookies_helpers.cc b/chrome/browser/extensions/extension_cookies_helpers.cc index b925a3b..203dc73 100644 --- a/chrome/browser/extensions/extension_cookies_helpers.cc +++ b/chrome/browser/extensions/extension_cookies_helpers.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. @@ -20,7 +20,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" -#include "net/base/cookie_util.h" +#include "net/cookies/cookie_util.h" namespace keys = extension_cookies_api_constants; diff --git a/chrome/browser/extensions/extension_cookies_helpers.h b/chrome/browser/extensions/extension_cookies_helpers.h index 3bb65ca..b2f2c05 100644 --- a/chrome/browser/extensions/extension_cookies_helpers.h +++ b/chrome/browser/extensions/extension_cookies_helpers.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. @@ -13,7 +13,7 @@ #include <string> -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" class Browser; class Extension; diff --git a/chrome/browser/extensions/extension_data_deleter.cc b/chrome/browser/extensions/extension_data_deleter.cc index 7ab0f59..c89a3d9 100644 --- a/chrome/browser/extensions/extension_data_deleter.cc +++ b/chrome/browser/extensions/extension_data_deleter.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. @@ -6,9 +6,9 @@ #include "base/bind.h" #include "base/file_util.h" -#include "chrome/browser/profiles/profile.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/settings/settings_frontend.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" @@ -16,8 +16,8 @@ #include "content/public/browser/indexed_db_context.h" #include "content/public/browser/resource_context.h" #include "net/base/completion_callback.h" -#include "net/base/cookie_monster.h" #include "net/base/net_errors.h" +#include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "webkit/appcache/appcache_service.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index ab6f358c..58c161b 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -70,8 +70,8 @@ #include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" -#include "net/base/cookie_monster.h" -#include "net/base/cookie_options.h" +#include "net/cookies/cookie_monster.h" +#include "net/cookies/cookie_options.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "sync/protocol/app_specifics.pb.h" diff --git a/chrome/browser/importer/toolbar_importer_utils.cc b/chrome/browser/importer/toolbar_importer_utils.cc index b6fb0ec..69931c2 100644 --- a/chrome/browser/importer/toolbar_importer_utils.cc +++ b/chrome/browser/importer/toolbar_importer_utils.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. @@ -12,7 +12,7 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" -#include "net/base/cookie_store.h" +#include "net/cookies/cookie_store.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index dea9201..c4d0da5 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -6,9 +6,9 @@ #include <vector> -#include "base/command_line.h" #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/command_line.h" #include "base/debug/leak_tracker.h" #include "base/logging.h" #include "base/stl_util.h" @@ -35,7 +35,6 @@ #include "content/public/common/content_client.h" #include "content/public/common/url_fetcher.h" #include "net/base/cert_verifier.h" -#include "net/base/cookie_monster.h" #include "net/base/default_origin_bound_cert_store.h" #include "net/base/host_cache.h" #include "net/base/host_resolver.h" @@ -43,6 +42,7 @@ #include "net/base/net_util.h" #include "net/base/origin_bound_cert_service.h" #include "net/base/sdch_manager.h" +#include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_filter.h" #include "net/http/http_auth_handler_factory.h" diff --git a/chrome/browser/net/chrome_cookie_notification_details.h b/chrome/browser/net/chrome_cookie_notification_details.h index 96b32ce..36b0a7f 100644 --- a/chrome/browser/net/chrome_cookie_notification_details.h +++ b/chrome/browser/net/chrome_cookie_notification_details.h @@ -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. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_NET_CHROME_COOKIE_NOTIFICATION_DETAILS_H_ #pragma once -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" struct ChromeCookieDetails { public: diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index a79fb97..a86b6ce 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -9,11 +9,11 @@ #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" +#include "chrome/browser/extensions/api/proxy/proxy_api.h" #include "chrome/browser/extensions/api/webrequest/webrequest_api.h" #include "chrome/browser/extensions/extension_event_router_forwarder.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/browser/extensions/extension_process_manager.h" -#include "chrome/browser/extensions/api/proxy/proxy_api.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/task_manager/task_manager.h" @@ -21,10 +21,10 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_request_info.h" -#include "net/base/cookie_monster.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" +#include "net/cookies/cookie_monster.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index b303d13..9030a4f 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.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. @@ -20,7 +20,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/common/content_client.h" -#include "net/base/cookie_store.h" +#include "net/cookies/cookie_store.h" #include "net/http/http_util.h" using content::BrowserThread; diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 13472de..59da2b8 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -14,12 +14,12 @@ #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" #include "net/base/cert_verifier.h" -#include "net/base/cookie_monster.h" #include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/ssl_config_service_defaults.h" +#include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index 9f699bd..50c43e7 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -7,9 +7,9 @@ #include "chrome/test/base/testing_pref_service.h" #include "content/test/test_browser_thread.h" #include "net/base/cert_verifier.h" -#include "net/base/cookie_monster.h" #include "net/base/mock_host_resolver.h" #include "net/base/ssl_config_service_defaults.h" +#include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_layer.h" diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc index b41333f..19641df 100644 --- a/chrome/browser/net/cookie_policy_browsertest.cc +++ b/chrome/browser/net/cookie_policy_browsertest.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. @@ -12,8 +12,8 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/base/cookie_store.h" #include "net/base/mock_host_resolver.h" +#include "net/cookies/cookie_store.h" #include "net/test/test_server.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.h b/chrome/browser/net/sqlite_persistent_cookie_store.h index da39b5c..08ee08e 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.h +++ b/chrome/browser/net/sqlite_persistent_cookie_store.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. @@ -14,7 +14,7 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" class FilePath; class Task; diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index 9865ad1..006419b 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -18,7 +18,7 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/prefs/pref_member.h" #include "content/public/browser/resource_context.h" -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" class CookieSettings; class DesktopNotificationService; diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 196861e..2c2e15b 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -40,8 +40,8 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" -#include "net/base/cookie_monster.h" #include "net/base/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/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc index 43ef7c4..2caf777 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc @@ -22,7 +22,7 @@ #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" namespace { diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc index 54b33ba..3bb9cb2 100644 --- a/chrome/browser/web_resource/notification_promo.cc +++ b/chrome/browser/web_resource/notification_promo.cc @@ -18,7 +18,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/user_metrics.h" #include "googleurl/src/gurl.h" -#include "net/base/cookie_store.h" +#include "net/cookies/cookie_store.h" #include "net/url_request/url_request_context.h" using content::UserMetricsAction; diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc index 6a11d70..2cf2b43 100644 --- a/chrome/service/net/service_url_request_context.cc +++ b/chrome/service/net/service_url_request_context.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. @@ -15,9 +15,9 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/service/service_process.h" #include "net/base/cert_verifier.h" -#include "net/base/cookie_monster.h" #include "net/base/host_resolver.h" #include "net/base/ssl_config_service_defaults.h" +#include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/chrome/service/net/service_url_request_context.h b/chrome/service/net/service_url_request_context.h index 92ca26d..1578f23 100644 --- a/chrome/service/net/service_url_request_context.h +++ b/chrome/service/net/service_url_request_context.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. @@ -9,9 +9,9 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "net/base/cookie_monster.h" #include "net/base/host_resolver.h" #include "net/base/ssl_config_service_defaults.h" +#include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 162ccc7..8a829b4 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -49,7 +49,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/test/mock_resource_context.h" -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_test_util.h" diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 7e83727..fad7290 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.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. @@ -36,7 +36,7 @@ #include "chrome_frame/urlmon_url_request_private.h" #include "chrome_frame/utils.h" #include "grit/generated_resources.h" -#include "net/base/cookie_monster.h" +#include "net/cookies/cookie_monster.h" // Connection point class to support firing IChromeFrameEvents (dispinterface). template<class T> diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc index 504a3df..3efe04c 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/chrome_frame/test/test_server_test.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,8 +10,8 @@ #include "base/path_service.h" #include "base/win/scoped_handle.h" #include "chrome_frame/test/test_server.h" -#include "net/base/cookie_monster.h" #include "net/base/host_resolver_proc.h" +#include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc index 13a1b0d..c2c7843 100644 --- a/net/url_request/url_request_context.cc +++ b/net/url_request/url_request_context.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. @@ -6,8 +6,8 @@ #include "base/compiler_specific.h" #include "base/string_util.h" -#include "net/base/cookie_store.h" #include "net/base/host_resolver.h" +#include "net/cookies/cookie_store.h" #include "net/ftp/ftp_transaction_factory.h" #include "net/http/http_transaction_factory.h" diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc index cb29c1b..8890839 100644 --- a/net/url_request/url_request_context_storage.cc +++ b/net/url_request/url_request_context_storage.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. @@ -6,11 +6,11 @@ #include "base/logging.h" #include "net/base/cert_verifier.h" -#include "net/base/cookie_store.h" #include "net/base/host_resolver.h" #include "net/base/net_log.h" #include "net/base/network_delegate.h" #include "net/base/origin_bound_cert_service.h" +#include "net/cookies/cookie_store.h" #include "net/ftp/ftp_transaction_factory.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_server_properties.h" diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 69993bd..871f99e 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -18,7 +18,6 @@ #include "base/string_util.h" #include "base/time.h" #include "net/base/cert_status_flags.h" -#include "net/base/cookie_monster.h" #include "net/base/filter.h" #include "net/base/host_port_pair.h" #include "net/base/load_flags.h" @@ -29,6 +28,7 @@ #include "net/base/sdch_manager.h" #include "net/base/ssl_cert_request_info.h" #include "net/base/ssl_config_service.h" +#include "net/cookies/cookie_monster.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h index 11a82b5..f79fc1c 100644 --- a/net/url_request/url_request_http_job.h +++ b/net/url_request/url_request_http_job.h @@ -15,7 +15,7 @@ #include "base/time.h" #include "net/base/auth.h" #include "net/base/completion_callback.h" -#include "net/base/cookie_store.h" +#include "net/cookies/cookie_store.h" #include "net/http/http_request_info.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_throttler_entry_interface.h" diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h index 95e744f..3571131 100644 --- a/net/url_request/url_request_test_util.h +++ b/net/url_request/url_request_test_util.h @@ -17,18 +17,18 @@ #include "base/message_loop_proxy.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_util.h" #include "base/string16.h" +#include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "googleurl/src/url_util.h" #include "net/base/cert_verifier.h" -#include "net/base/cookie_monster.h" #include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/network_delegate.h" #include "net/base/ssl_config_service_defaults.h" +#include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index c0cbbf6..92e32ae 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -5,8 +5,8 @@ #include "build/build_config.h" #if defined(OS_WIN) -#include <shlobj.h> #include <windows.h> +#include <shlobj.h> #endif #include <algorithm> @@ -27,8 +27,6 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" -#include "net/base/cookie_monster.h" -#include "net/base/cookie_store_test_helpers.h" #include "net/base/load_flags.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" @@ -38,6 +36,8 @@ #include "net/base/net_util.h" #include "net/base/ssl_connection_status_flags.h" #include "net/base/upload_data.h" +#include "net/cookies/cookie_monster.h" +#include "net/cookies/cookie_store_test_helpers.h" #include "net/disk_cache/disk_cache.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_cache.h" diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc index 945f631..0be903d 100644 --- a/net/websockets/websocket_job.cc +++ b/net/websockets/websocket_job.cc @@ -12,7 +12,7 @@ #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/cookie_store.h" +#include "net/cookies/cookie_store.h" #include "net/base/io_buffer.h" #include "net/http/http_network_session.h" #include "net/http/http_transaction_factory.h" diff --git a/net/websockets/websocket_job_spdy2_unittest.cc b/net/websockets/websocket_job_spdy2_unittest.cc index ad00fde..d310224 100644 --- a/net/websockets/websocket_job_spdy2_unittest.cc +++ b/net/websockets/websocket_job_spdy2_unittest.cc @@ -15,14 +15,14 @@ #include "base/string_util.h" #include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" -#include "net/base/cookie_store.h" -#include "net/base/cookie_store_test_helpers.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/ssl_config_service.h" #include "net/base/sys_addrinfo.h" #include "net/base/test_completion_callback.h" #include "net/base/transport_security_state.h" +#include "net/cookies/cookie_store.h" +#include "net/cookies/cookie_store_test_helpers.h" #include "net/http/http_transaction_factory.h" #include "net/proxy/proxy_service.h" #include "net/socket/socket_test_util.h" @@ -32,8 +32,8 @@ #include "net/spdy/spdy_websocket_test_util_spdy2.h" #include "net/url_request/url_request_context.h" #include "net/websockets/websocket_throttle.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" using namespace net::test_spdy2; diff --git a/net/websockets/websocket_job_spdy3_unittest.cc b/net/websockets/websocket_job_spdy3_unittest.cc index 235760b..d1dd559 100644 --- a/net/websockets/websocket_job_spdy3_unittest.cc +++ b/net/websockets/websocket_job_spdy3_unittest.cc @@ -15,14 +15,14 @@ #include "base/string_util.h" #include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" -#include "net/base/cookie_store.h" -#include "net/base/cookie_store_test_helpers.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/ssl_config_service.h" #include "net/base/sys_addrinfo.h" #include "net/base/test_completion_callback.h" #include "net/base/transport_security_state.h" +#include "net/cookies/cookie_store.h" +#include "net/cookies/cookie_store_test_helpers.h" #include "net/http/http_transaction_factory.h" #include "net/proxy/proxy_service.h" #include "net/socket/socket_test_util.h" @@ -32,8 +32,8 @@ #include "net/spdy/spdy_websocket_test_util_spdy3.h" #include "net/url_request/url_request_context.h" #include "net/websockets/websocket_throttle.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" using namespace net::test_spdy3; |