diff options
64 files changed, 65 insertions, 68 deletions
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index 8915611..589b31a 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -23,9 +23,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/history/in_memory_database.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/url_util.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 969c43b..22c59d2 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -83,7 +83,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/automation/tab_proxy.h" @@ -93,6 +92,7 @@ #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/common/json_value_serializer.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc index 9d00988..2bb6305 100644 --- a/chrome/browser/bookmarks/bookmark_storage.cc +++ b/chrome/browser/bookmarks/bookmark_storage.cc @@ -13,8 +13,8 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/json_value_serializer.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" #include "content/common/notification_source.h" #include "content/common/notification_type.h" diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 161aaa4..3309d9e 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -11,8 +11,8 @@ #include "base/task.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros_settings_names.h" -#include "chrome/common/json_value_serializer.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" namespace chromeos { diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc index fa3a54b..b7f303e 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc @@ -14,14 +14,11 @@ #include "base/stringprintf.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" #include "net/proxy/proxy_config_service_common_unittest.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -#if !defined(NDEBUG) -#include "chrome/common/json_value_serializer.h" -#endif // !defined(NDEBUG) - namespace chromeos { namespace { diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc index 4ff348e..c54f2d8 100644 --- a/chrome/browser/diagnostics/recon_diagnostics.cc +++ b/chrome/browser/diagnostics/recon_diagnostics.cc @@ -18,7 +18,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index e1f7e79..2d14eb8 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -20,7 +20,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/user_script.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" namespace keys = extension_manifest_keys; diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index f3305a7..d47b0fb 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -23,8 +23,8 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/web_apps.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc index 9793131..a607704 100644 --- a/chrome/browser/extensions/extension_icon_manager_unittest.cc +++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/json_value_serializer.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/skia_util.h" diff --git a/chrome/browser/extensions/extension_info_map_unittest.cc b/chrome/browser/extensions/extension_info_map_unittest.cc index d8909e6..5580109 100644 --- a/chrome/browser/extensions/extension_info_map_unittest.cc +++ b/chrome/browser/extensions/extension_info_map_unittest.cc @@ -7,8 +7,8 @@ #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/json_value_serializer.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace keys = extension_manifest_keys; diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 34427a0..1c68cf0 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -59,13 +59,13 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" #include "content/browser/plugin_process_host.h" #include "content/browser/plugin_service.h" +#include "content/common/json_value_serializer.h" #include "content/common/notification_service.h" #include "content/common/notification_type.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 7b22b41..60d8738 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -41,7 +41,6 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/extensions/url_pattern.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/testing_profile.h" @@ -50,6 +49,7 @@ #include "content/browser/file_system/browser_file_system_helper.h" #include "content/browser/in_process_webkit/dom_storage_context.h" #include "content/browser/in_process_webkit/webkit_context.h" +#include "content/common/json_value_serializer.h" #include "content/common/notification_registrar.h" #include "content/common/notification_service.h" #include "content/common/notification_type.h" diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc index 953abbc..4543542 100644 --- a/chrome/browser/extensions/extension_ui_unittest.cc +++ b/chrome/browser/extensions/extension_ui_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/extensions/extensions_ui.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/extensions/external_pref_extension_loader.cc b/chrome/browser/extensions/external_pref_extension_loader.cc index 20ece4c..a0aa3e3 100644 --- a/chrome/browser/extensions/external_pref_extension_loader.cc +++ b/chrome/browser/extensions/external_pref_extension_loader.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "content/browser/browser_thread.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" namespace { diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc index 25d2f6d..f98edb7 100644 --- a/chrome/browser/extensions/image_loading_tracker_unittest.cc +++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/json_value_serializer.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" #include "content/common/notification_service.h" #include "content/common/notification_type.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc index 3cb5173..1adc1098 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc @@ -24,9 +24,9 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_unpacker.h" -#include "chrome/common/json_value_serializer.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/common/json_value_serializer.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/policy/config_dir_policy_provider.cc b/chrome/browser/policy/config_dir_policy_provider.cc index fb2f6eb..b659d6a 100644 --- a/chrome/browser/policy/config_dir_policy_provider.cc +++ b/chrome/browser/policy/config_dir_policy_provider.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/values.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" namespace policy { diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc index 823e1e2..aa6354f 100644 --- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc @@ -11,8 +11,8 @@ #include "chrome/browser/policy/config_dir_policy_provider.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/mock_configuration_policy_store.h" -#include "chrome/common/json_value_serializer.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/prefs/pref_service_uitest.cc b/chrome/browser/prefs/pref_service_uitest.cc index 11a5856..af2b1a6 100644 --- a/chrome/browser/prefs/pref_service_uitest.cc +++ b/chrome/browser/prefs/pref_service_uitest.cc @@ -12,11 +12,11 @@ #include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/window_proxy.h" #include "chrome/test/ui/ui_test.h" +#include "content/common/json_value_serializer.h" #include "ui/gfx/rect.h" class PreferenceServiceTest : public UITest { diff --git a/chrome/browser/sync/glue/preference_change_processor.cc b/chrome/browser/sync/glue/preference_change_processor.cc index ab78907..6a6840b 100644 --- a/chrome/browser/sync/glue/preference_change_processor.cc +++ b/chrome/browser/sync/glue/preference_change_processor.cc @@ -14,9 +14,9 @@ #include "chrome/browser/sync/glue/preference_model_associator.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/protocol/preference_specifics.pb.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" #include "content/common/notification_details.h" #include "content/common/notification_source.h" diff --git a/chrome/browser/sync/glue/preference_model_associator.cc b/chrome/browser/sync/glue/preference_model_associator.cc index 0ee1f06..7d75c38 100644 --- a/chrome/browser/sync/glue/preference_model_associator.cc +++ b/chrome/browser/sync/glue/preference_model_associator.cc @@ -14,9 +14,9 @@ #include "chrome/browser/sync/glue/synchronized_preferences.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/protocol/preference_specifics.pb.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" #include "content/common/notification_service.h" namespace browser_sync { diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index eaa1b01..4a99ba6 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -21,10 +21,10 @@ #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_pref_service.h" #include "chrome/test/testing_profile.h" +#include "content/common/json_value_serializer.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index 842833b..92dc94c 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -12,8 +12,8 @@ #include "base/values.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/json_value_serializer.h" #include "content/browser/browser_thread.h" +#include "content/common/json_value_serializer.h" #include "grit/theme_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm index 6130a07..b68686f 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm @@ -16,7 +16,7 @@ #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 05f287f..78b9274 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -64,6 +64,7 @@ 'dependencies': [ 'installer_util', 'installer_util_strings', + '../content/content.gyp:content_common', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/base.gyp:test_support_base', diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi index 83f6ae1..5d44032 100644 --- a/chrome/chrome_installer_util.gypi +++ b/chrome/chrome_installer_util.gypi @@ -96,6 +96,7 @@ 'common_constants', 'chrome_resources', 'chrome_strings', + '../content/content.gyp:content_common', '<(DEPTH)/courgette/courgette.gyp:courgette_lib', '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch', '<(DEPTH)/third_party/icu/icu.gyp:icui18n', diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index be34cfb..d378d85 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -21,7 +21,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/extensions/extension_sidebar_defaults.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/file_stream.h" diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc index 63f4a1f..f9c364e 100644 --- a/chrome/common/extensions/extension_l10n_util.cc +++ b/chrome/common/extensions/extension_l10n_util.cc @@ -18,8 +18,8 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_message_bundle.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" +#include "content/common/json_value_serializer.h" #include "ui/base/l10n/l10n_util.h" #include "unicode/uloc.h" diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc index e49ec0a..092e9e1 100644 --- a/chrome/common/extensions/extension_manifests_unittest.cc +++ b/chrome/common/extensions/extension_manifests_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/extensions/extension_sidebar_defaults.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace errors = extension_manifest_errors; diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index caa85c9..18751b3 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -21,8 +21,8 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" #include "net/base/mime_sniffer.h" #include "skia/ext/image_operations.h" diff --git a/chrome/common/extensions/extension_unpacker.cc b/chrome/common/extensions/extension_unpacker.cc index 3561b6a..4c5f30f 100644 --- a/chrome/common/extensions/extension_unpacker.cc +++ b/chrome/common/extensions/extension_unpacker.cc @@ -18,10 +18,10 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" #include "chrome/common/zip.h" #include "content/common/common_param_traits.h" +#include "content/common/json_value_serializer.h" #include "ipc/ipc_message_utils.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/image_decoder.h" diff --git a/chrome/common/json_pref_store.cc b/chrome/common/json_pref_store.cc index b8d323b..b22e8c2 100644 --- a/chrome/common/json_pref_store.cc +++ b/chrome/common/json_pref_store.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/values.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" namespace { diff --git a/chrome/common/json_schema_validator_unittest_base.cc b/chrome/common/json_schema_validator_unittest_base.cc index 2251b9e..c53e578 100644 --- a/chrome/common/json_schema_validator_unittest_base.cc +++ b/chrome/common/json_schema_validator_unittest_base.cc @@ -16,7 +16,7 @@ #include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/json_schema_validator.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" namespace { diff --git a/chrome/common/json_value_serializer_perftest.cc b/chrome/common/json_value_serializer_perftest.cc index 504ddb2..b932544 100644 --- a/chrome/common/json_value_serializer_perftest.cc +++ b/chrome/common/json_value_serializer_perftest.cc @@ -10,8 +10,8 @@ #include "base/string_util.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/logging_chrome.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/common/json_value_serializer_unittest.cc b/chrome/common/json_value_serializer_unittest.cc index 0df24b0..1cdb59a 100644 --- a/chrome/common/json_value_serializer_unittest.cc +++ b/chrome/common/json_value_serializer_unittest.cc @@ -13,7 +13,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" TEST(JSONValueSerializerTest, Roundtrip) { diff --git a/chrome/common/jstemplate_builder.cc b/chrome/common/jstemplate_builder.cc index 35e4b3a..79f0101 100644 --- a/chrome/common/jstemplate_builder.cc +++ b/chrome/common/jstemplate_builder.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "grit/common_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/common/web_apps_unittest.cc b/chrome/common/web_apps_unittest.cc index 79932e1..9f8605f 100644 --- a/chrome/common/web_apps_unittest.cc +++ b/chrome/common/web_apps_unittest.cc @@ -12,7 +12,7 @@ #include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/json_schema_validator.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/common_constants.gypi b/chrome/common_constants.gypi index 47b4d58..8fc435e 100644 --- a/chrome/common_constants.gypi +++ b/chrome/common_constants.gypi @@ -22,8 +22,6 @@ 'common/chrome_switches.h', 'common/env_vars.cc', 'common/env_vars.h', - 'common/json_value_serializer.cc', - 'common/json_value_serializer.h', 'common/net/gaia/gaia_constants.cc', 'common/net/gaia/gaia_constants.h', 'common/pref_names.cc', diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 0b431b8..dc499aa 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -25,7 +25,6 @@ #include "base/win/windows_version.h" #include "chrome/common/attrition_experiments.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/channel_info.h" #include "chrome/installer/util/product.h" @@ -36,6 +35,7 @@ #include "chrome/installer/util/helper.h" #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/wmi.h" +#include "content/common/json_value_serializer.h" #include "content/common/result_codes.h" #include "installer_util_strings.h" // NOLINT diff --git a/chrome/installer/util/google_chrome_distribution_unittest.cc b/chrome/installer/util/google_chrome_distribution_unittest.cc index 0cad3b4..f3936c4 100644 --- a/chrome/installer/util/google_chrome_distribution_unittest.cc +++ b/chrome/installer/util/google_chrome_distribution_unittest.cc @@ -7,10 +7,10 @@ #include <windows.h> #include "base/memory/scoped_ptr.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/google_chrome_distribution.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(GOOGLE_CHROME_BUILD) diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc index d1110de..480e5df 100644 --- a/chrome/installer/util/install_util.cc +++ b/chrome/installer/util/install_util.cc @@ -24,13 +24,13 @@ #include "base/version.h" #include "base/win/registry.h" #include "base/win/windows_version.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/work_item_list.h" +#include "content/common/json_value_serializer.h" using base::win::RegKey; using installer::ProductState; diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc index 898e370..5989e56 100644 --- a/chrome/installer/util/master_preferences.cc +++ b/chrome/installer/util/master_preferences.cc @@ -9,9 +9,9 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/installer/util/master_preferences_constants.h" #include "chrome/installer/util/util_constants.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc index b2082e5..3594758 100644 --- a/chrome/installer/util/master_preferences_unittest.cc +++ b/chrome/installer/util/master_preferences_unittest.cc @@ -9,10 +9,10 @@ #include "base/path_service.h" #include "base/stringprintf.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/installer/util/master_preferences.h" #include "chrome/installer/util/master_preferences_constants.h" #include "chrome/installer/util/util_constants.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/renderer/automation/dom_automation_controller.cc b/chrome/renderer/automation/dom_automation_controller.cc index 8d708d1..35e7c9a 100644 --- a/chrome/renderer/automation/dom_automation_controller.cc +++ b/chrome/renderer/automation/dom_automation_controller.cc @@ -4,8 +4,8 @@ #include "chrome/renderer/automation/dom_automation_controller.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/render_messages.h" +#include "content/common/json_value_serializer.h" #include "base/string_util.h" DomAutomationController::DomAutomationController() diff --git a/chrome/renderer/extensions/extension_api_json_validity_unittest.cc b/chrome/renderer/extensions/extension_api_json_validity_unittest.cc index 8787398..e1b7758 100644 --- a/chrome/renderer/extensions/extension_api_json_validity_unittest.cc +++ b/chrome/renderer/extensions/extension_api_json_validity_unittest.cc @@ -6,10 +6,10 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/chrome_paths.h" #include "chrome/renderer/extensions/bindings_utils.h" #include "chrome/test/v8_unit_test.h" +#include "content/common/json_value_serializer.h" #include "grit/common_resources.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc index f4d043e..888c0ed 100644 --- a/chrome/renderer/extensions/extension_helper.cc +++ b/chrome/renderer/extensions/extension_helper.cc @@ -10,13 +10,13 @@ #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/extensions/extension_dispatcher.h" #include "chrome/renderer/extensions/extension_process_bindings.h" #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/renderer/extensions/user_script_idle_scheduler.h" #include "chrome/renderer/extensions/user_script_slave.h" +#include "content/common/json_value_serializer.h" #include "content/renderer/render_view.h" #include "webkit/glue/image_resource_fetcher.h" #include "webkit/glue/resource_fetcher.h" diff --git a/chrome/test/automation/automation_json_requests.cc b/chrome/test/automation/automation_json_requests.cc index 0879f8d..c27783d 100644 --- a/chrome/test/automation/automation_json_requests.cc +++ b/chrome/test/automation/automation_json_requests.cc @@ -11,8 +11,8 @@ #include "base/json/json_writer.h" #include "base/test/test_timeouts.h" #include "chrome/common/automation_messages.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/test/automation/automation_proxy.h" +#include "content/common/json_value_serializer.h" namespace { diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index abf8dae..8169c05 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -23,7 +23,6 @@ #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" #include "chrome/test/automation/autocomplete_edit_proxy.h" #include "chrome/test/automation/automation_proxy_uitest.h" @@ -33,6 +32,7 @@ #include "chrome/test/automation/window_proxy.h" #include "chrome/test/ui_test_utils.h" #include "chrome/test/ui/ui_test.h" +#include "content/common/json_value_serializer.h" #include "net/base/host_port_pair.h" #include "net/base/net_util.h" #include "net/test/test_server.h" diff --git a/chrome/test/automation/javascript_execution_controller.cc b/chrome/test/automation/javascript_execution_controller.cc index 59308b3..5be6b98 100644 --- a/chrome/test/automation/javascript_execution_controller.cc +++ b/chrome/test/automation/javascript_execution_controller.cc @@ -4,8 +4,8 @@ #include "chrome/test/automation/javascript_execution_controller.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/test/automation/javascript_message_utils.h" +#include "content/common/json_value_serializer.h" using javascript_utils::JavaScriptPrintf; diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index 433f353..ffc6db2 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -11,10 +11,10 @@ #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" #include "chrome/common/automation_messages.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/test/automation/automation_json_requests.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" TabProxy::TabProxy(AutomationMessageSender* sender, diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/ui/dom_checker_uitest.cc index 81118ae..6ca9c1a 100644 --- a/chrome/test/ui/dom_checker_uitest.cc +++ b/chrome/test/ui/dom_checker_uitest.cc @@ -14,9 +14,9 @@ #include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" diff --git a/chrome/test/ui/dromaeo_benchmark_uitest.cc b/chrome/test/ui/dromaeo_benchmark_uitest.cc index 684f695..a7b0af1 100644 --- a/chrome/test/ui/dromaeo_benchmark_uitest.cc +++ b/chrome/test/ui/dromaeo_benchmark_uitest.cc @@ -11,10 +11,10 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/javascript_test_util.h" #include "chrome/test/ui/ui_perf_test.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" diff --git a/chrome/test/ui/javascript_test_util.cc b/chrome/test/ui/javascript_test_util.cc index 9762a0a..acccdcb 100644 --- a/chrome/test/ui/javascript_test_util.cc +++ b/chrome/test/ui/javascript_test_util.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" bool JsonDictionaryToMap(const std::string& json, diff --git a/chrome/test/ui/sunspider_uitest.cc b/chrome/test/ui/sunspider_uitest.cc index bcc8ff6..57bbb51 100644 --- a/chrome/test/ui/sunspider_uitest.cc +++ b/chrome/test/ui/sunspider_uitest.cc @@ -10,10 +10,10 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/javascript_test_util.h" #include "chrome/test/ui/ui_perf_test.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 102f639..1ccb519 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -36,7 +36,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" @@ -48,6 +47,7 @@ #include "chrome/test/test_launcher_utils.h" #include "chrome/test/test_switches.h" #include "content/common/debug_flags.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "ui/gfx/gl/gl_implementation.h" diff --git a/chrome/test/ui/v8_benchmark_uitest.cc b/chrome/test/ui/v8_benchmark_uitest.cc index b3d12c9..add0c07b 100644 --- a/chrome/test/ui/v8_benchmark_uitest.cc +++ b/chrome/test/ui/v8_benchmark_uitest.cc @@ -11,10 +11,10 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/json_value_serializer.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/javascript_test_util.h" #include "chrome/test/ui/ui_perf_test.h" +#include "content/common/json_value_serializer.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" diff --git a/content/common/debug_flags.cc b/content/common/debug_flags.cc index 9fcf2f0..6b6dfef 100644 --- a/content/common/debug_flags.cc +++ b/content/common/debug_flags.cc @@ -7,7 +7,7 @@ #include "base/base_switches.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" -#include "chrome/common/chrome_switches.h" +#include "content/common/content_switches.h" #include "ipc/ipc_switches.h" bool DebugFlags::ProcessDebugFlags(CommandLine* command_line, diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc index bb00d90..0cce977 100644 --- a/content/common/gpu/gpu_channel_manager.cc +++ b/content/common/gpu/gpu_channel_manager.cc @@ -11,8 +11,6 @@ #include "base/command_line.h" #include "base/threading/worker_pool.h" #include "build/build_config.h" -#include "chrome/common/child_process_logging.h" -#include "chrome/common/chrome_switches.h" #include "content/common/child_process.h" #include "content/common/gpu_messages.h" #include "ipc/ipc_channel_handle.h" diff --git a/chrome/common/json_value_serializer.cc b/content/common/json_value_serializer.cc index df92afd..96fe0ea 100644 --- a/chrome/common/json_value_serializer.cc +++ b/content/common/json_value_serializer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/json_value_serializer.h" +#include "content/common/json_value_serializer.h" #include "base/file_util.h" #include "base/json/json_reader.h" diff --git a/chrome/common/json_value_serializer.h b/content/common/json_value_serializer.h index e0c9569..8d2a8f5 100644 --- a/chrome/common/json_value_serializer.h +++ b/content/common/json_value_serializer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_JSON_VALUE_SERIALIZER_H_ -#define CHROME_COMMON_JSON_VALUE_SERIALIZER_H_ +#ifndef CONTENT_COMMON_JSON_VALUE_SERIALIZER_H_ +#define CONTENT_COMMON_JSON_VALUE_SERIALIZER_H_ #pragma once #include <string> @@ -125,4 +125,4 @@ class JSONFileValueSerializer : public ValueSerializer { DISALLOW_IMPLICIT_CONSTRUCTORS(JSONFileValueSerializer); }; -#endif // CHROME_COMMON_JSON_VALUE_SERIALIZER_H_ +#endif // CONTENT_COMMON_JSON_VALUE_SERIALIZER_H_ diff --git a/content/common/sandbox_init_wrapper_win.cc b/content/common/sandbox_init_wrapper_win.cc index d322130..085f56f 100644 --- a/content/common/sandbox_init_wrapper_win.cc +++ b/content/common/sandbox_init_wrapper_win.cc @@ -6,8 +6,7 @@ #include "base/command_line.h" #include "base/logging.h" - -#include "chrome/common/chrome_switches.h" +#include "content/common/content_switches.h" void SandboxInitWrapper::SetServices(sandbox::SandboxInterfaceInfo* info) { if (!info) diff --git a/content/content_common.gypi b/content/content_common.gypi index 006df34..bf9f1d3 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -125,6 +125,8 @@ 'common/indexed_db_messages.h', 'common/indexed_db_param_traits.cc', 'common/indexed_db_param_traits.h', + 'common/json_value_serializer.cc', + 'common/json_value_serializer.h', 'common/main_function_params.h', 'common/message_router.cc', 'common/message_router.h', diff --git a/content/renderer/p2p/p2p_transport_impl.cc b/content/renderer/p2p/p2p_transport_impl.cc index 2353134..ad542d7 100644 --- a/content/renderer/p2p/p2p_transport_impl.cc +++ b/content/renderer/p2p/p2p_transport_impl.cc @@ -5,10 +5,10 @@ #include "content/renderer/p2p/p2p_transport_impl.h" #include "base/values.h" +#include "content/common/json_value_serializer.h" #include "content/renderer/p2p/ipc_network_manager.h" #include "content/renderer/p2p/ipc_socket_factory.h" #include "content/renderer/render_view.h" -#include "chrome/common/json_value_serializer.h" #include "jingle/glue/channel_socket_adapter.h" #include "jingle/glue/thread_wrapper.h" #include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h" diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 5cea2dc..57de066 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -38,6 +38,7 @@ #include "content/common/drag_messages.h" #include "content/common/file_system/file_system_dispatcher.h" #include "content/common/file_system/webfilesystem_callback_dispatcher.h" +#include "content/common/json_value_serializer.h" #include "content/common/notification_service.h" #include "content/common/pepper_messages.h" #include "content/common/quota_dispatcher.h" |