diff options
68 files changed, 78 insertions, 83 deletions
diff --git a/base/base.gypi b/base/base.gypi index 8f5cbda..0cfd03f 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -124,6 +124,8 @@ 'id_map.h', 'json/json_reader.cc', 'json/json_reader.h', + 'json/json_value_serializer.cc', + 'json/json_value_serializer.h', 'json/json_writer.cc', 'json/json_writer.h', 'json/string_escape.cc', diff --git a/content/common/json_value_serializer.cc b/base/json/json_value_serializer.cc index 96fe0ea..d667bc1 100644 --- a/content/common/json_value_serializer.cc +++ b/base/json/json_value_serializer.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "content/common/json_value_serializer.h" +#include "base/json/json_value_serializer.h" #include "base/file_util.h" #include "base/json/json_reader.h" diff --git a/content/common/json_value_serializer.h b/base/json/json_value_serializer.h index 4b11e52..650008e 100644 --- a/content/common/json_value_serializer.h +++ b/base/json/json_value_serializer.h @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_JSON_VALUE_SERIALIZER_H_ -#define CONTENT_COMMON_JSON_VALUE_SERIALIZER_H_ +#ifndef BASE_JSON_JSON_VALUE_SERIALIZER_H_ +#define BASE_JSON_JSON_VALUE_SERIALIZER_H_ #pragma once #include <string> +#include "base/base_export.h" #include "base/basictypes.h" #include "base/file_path.h" #include "base/values.h" -#include "content/common/content_export.h" -class CONTENT_EXPORT JSONStringValueSerializer : public base::ValueSerializer { +class BASE_EXPORT JSONStringValueSerializer : public base::ValueSerializer { public: // json_string is the string that will be source of the deserialization // or the destination of the serialization. The caller of the constructor @@ -67,7 +67,7 @@ class CONTENT_EXPORT JSONStringValueSerializer : public base::ValueSerializer { DISALLOW_COPY_AND_ASSIGN(JSONStringValueSerializer); }; -class CONTENT_EXPORT JSONFileValueSerializer : public base::ValueSerializer { +class BASE_EXPORT JSONFileValueSerializer : public base::ValueSerializer { public: // json_file_patch is the path of a file that will be source of the // deserialization or the destination of the serialization. @@ -126,4 +126,4 @@ class CONTENT_EXPORT JSONFileValueSerializer : public base::ValueSerializer { DISALLOW_IMPLICIT_CONSTRUCTORS(JSONFileValueSerializer); }; -#endif // CONTENT_COMMON_JSON_VALUE_SERIALIZER_H_ +#endif // BASE_JSON_JSON_VALUE_SERIALIZER_H_ diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index c50b8c8..018d20e 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -11,6 +11,7 @@ #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" #include "base/i18n/icu_string_conversions.h" +#include "base/json/json_value_serializer.h" #include "base/message_loop.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -27,7 +28,6 @@ #include "chrome/browser/search_engines/template_url_service_factory.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 fcfd0f5..bfe1029 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -11,6 +11,7 @@ #include "base/debug/trace_event.h" #include "base/file_path.h" #include "base/json/json_reader.h" +#include "base/json/json_value_serializer.h" #include "base/json/json_writer.h" #include "base/json/string_escape.h" #include "base/message_loop.h" @@ -87,7 +88,6 @@ #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 "content/common/view_messages.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 37be6bd..cb6b2ec 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -13,6 +13,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" @@ -75,7 +76,6 @@ #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/child_process_info.h" -#include "content/common/json_value_serializer.h" #include "content/common/notification_service.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc index 4f82460..7447124 100644 --- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc @@ -4,6 +4,7 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string_util.h" @@ -14,7 +15,6 @@ #include "chrome/browser/bookmarks/bookmark_model_test_utils.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/common/chrome_paths.h" -#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc index 49ede4e..cca6f1a 100644 --- a/chrome/browser/bookmarks/bookmark_storage.cc +++ b/chrome/browser/bookmarks/bookmark_storage.cc @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/file_util_proxy.h" +#include "base/json/json_value_serializer.h" #include "base/metrics/histogram.h" #include "base/time.h" #include "chrome/browser/bookmarks/bookmark_codec.h" @@ -15,7 +16,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" #include "content/browser/browser_thread.h" -#include "content/common/json_value_serializer.h" #include "content/common/notification_source.h" using base::TimeTicks; diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 9500394..399965d 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -6,6 +6,7 @@ #include <ostream> +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/string_util.h" #include "base/task.h" @@ -15,7 +16,6 @@ #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/browser/prefs/proxy_prefs.h" #include "content/browser/browser_thread.h" -#include "content/common/json_value_serializer.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc index 11bf46a..dda6f91 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc @@ -9,12 +9,12 @@ #include <vector> #include "base/format_macros.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/string_util.h" #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" diff --git a/chrome/browser/component_updater/component_installers_unittest.cc b/chrome/browser/component_updater/component_installers_unittest.cc index 45eda8c..0825fc9 100644 --- a/chrome/browser/component_updater/component_installers_unittest.cc +++ b/chrome/browser/component_updater/component_installers_unittest.cc @@ -6,13 +6,13 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/version.h" #include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "content/browser/browser_thread.h" -#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/component_updater/component_unpacker.cc b/chrome/browser/component_updater/component_unpacker.cc index 8453df2..0b64eba 100644 --- a/chrome/browser/component_updater/component_unpacker.cc +++ b/chrome/browser/component_updater/component_unpacker.cc @@ -8,6 +8,7 @@ #include <vector> #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_handle.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" @@ -15,7 +16,6 @@ #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/zip.h" -#include "content/common/json_value_serializer.h" #include "crypto/secure_hash.h" #include "crypto/signature_verifier.h" diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc index 63d1b29..ed56dae 100644 --- a/chrome/browser/diagnostics/recon_diagnostics.cc +++ b/chrome/browser/diagnostics/recon_diagnostics.cc @@ -8,6 +8,7 @@ #include "base/file_util.h" #include "base/json/json_reader.h" +#include "base/json/json_value_serializer.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -18,7 +19,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_version_info.h" -#include "content/common/json_value_serializer.h" #include "ui/base/text/bytes_formatting.h" #if defined(OS_WIN) diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 4535df5..b7b3b8f 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -10,6 +10,7 @@ #include "base/base64.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" #include "base/string_util.h" @@ -19,7 +20,6 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/user_script.h" -#include "content/common/json_value_serializer.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index 23c1d50..26fc3a8 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -12,6 +12,7 @@ #include "base/base64.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" @@ -23,7 +24,6 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/web_apps.h" -#include "content/common/json_value_serializer.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc index 8f81fd5..0694a85 100644 --- a/chrome/browser/extensions/extension_icon_manager_unittest.cc +++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/json/json_value_serializer.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/values.h" @@ -10,7 +11,6 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.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 8bba598..770e22d 100644 --- a/chrome/browser/extensions/extension_info_map_unittest.cc +++ b/chrome/browser/extensions/extension_info_map_unittest.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/json/json_value_serializer.h" #include "base/message_loop.h" #include "base/path_service.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.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 1754e6c..0e3ebca 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -10,6 +10,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" @@ -82,7 +83,6 @@ #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/user_metrics.h" #include "content/common/content_notification_types.h" -#include "content/common/json_value_serializer.h" #include "content/common/notification_service.h" #include "content/common/pepper_plugin_registry.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 51931de..e0247b8 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -13,6 +13,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/json/json_reader.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -57,7 +58,6 @@ #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 "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc index 77b664c..587645e 100644 --- a/chrome/browser/extensions/extension_ui_unittest.cc +++ b/chrome/browser/extensions/extension_ui_unittest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "base/string_util.h" #include "chrome/browser/ui/webui/options/extension_settings_handler.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/extensions/extension_webrequest_api_unittest.cc b/chrome/browser/extensions/extension_webrequest_api_unittest.cc index e46478d..4c64ff9 100644 --- a/chrome/browser/extensions/extension_webrequest_api_unittest.cc +++ b/chrome/browser/extensions/extension_webrequest_api_unittest.cc @@ -5,6 +5,7 @@ #include <queue> #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "chrome/browser/extensions/extension_event_router_forwarder.h" @@ -17,7 +18,6 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" -#include "content/common/json_value_serializer.h" #include "net/base/net_util.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/external_pref_extension_loader.cc b/chrome/browser/extensions/external_pref_extension_loader.cc index 4898937..474a0b8 100644 --- a/chrome/browser/extensions/external_pref_extension_loader.cc +++ b/chrome/browser/extensions/external_pref_extension_loader.cc @@ -6,12 +6,12 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" #include "content/browser/browser_thread.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 2cb5631..1f022f1 100644 --- a/chrome/browser/extensions/image_loading_tracker_unittest.cc +++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/json/json_value_serializer.h" #include "base/message_loop.h" #include "base/path_service.h" #include "chrome/browser/extensions/image_loading_tracker.h" @@ -11,7 +12,6 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" #include "content/browser/browser_thread.h" -#include "content/common/json_value_serializer.h" #include "content/common/notification_service.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc index 967f8fb..897f4ab 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc @@ -9,6 +9,7 @@ #include "base/base64.h" #include "base/file_util.h" #include "base/file_util_proxy.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_handle.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" @@ -27,7 +28,6 @@ #include "chrome/common/extensions/extension_unpacker.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/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc index 93a4a7d..f59f5c5 100644 --- a/chrome/browser/intents/web_intents_registry_unittest.cc +++ b/chrome/browser/intents/web_intents_registry_unittest.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "chrome/browser/intents/web_intents_registry.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/chrome_paths.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/policy/config_dir_policy_provider.cc b/chrome/browser/policy/config_dir_policy_provider.cc index 41aa8e2..36d89d8 100644 --- a/chrome/browser/policy/config_dir_policy_provider.cc +++ b/chrome/browser/policy/config_dir_policy_provider.cc @@ -9,9 +9,9 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/platform_file.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 8506c4a..9fffad6 100644 --- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc @@ -5,6 +5,7 @@ #include <algorithm> #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" @@ -12,7 +13,6 @@ #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/policy_map.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_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc index 17fa1307..2028f8d 100644 --- a/chrome/browser/prefs/pref_model_associator.cc +++ b/chrome/browser/prefs/pref_model_associator.cc @@ -6,6 +6,7 @@ #include "base/auto_reset.h" #include "base/json/json_reader.h" +#include "base/json/json_value_serializer.h" #include "base/location.h" #include "base/logging.h" #include "base/utf_string_conversions.h" @@ -14,7 +15,6 @@ #include "chrome/browser/sync/protocol/preference_specifics.pb.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "content/common/json_value_serializer.h" #include "content/common/notification_service.h" using syncable::PREFERENCES; diff --git a/chrome/browser/prefs/pref_service_uitest.cc b/chrome/browser/prefs/pref_service_uitest.cc index ee9c2a4..aea9bd0 100644 --- a/chrome/browser/prefs/pref_service_uitest.cc +++ b/chrome/browser/prefs/pref_service_uitest.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/scoped_temp_dir.h" #include "base/test/test_file_util.h" #include "base/values.h" @@ -17,7 +18,6 @@ #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/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index 6f0decc..af3367f 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -6,6 +6,7 @@ #include <string> #include "base/json/json_reader.h" +#include "base/json/json_value_serializer.h" #include "base/location.h" #include "base/stl_util.h" #include "base/string_piece.h" @@ -31,7 +32,6 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/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 28bef94..91a84c4 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -6,6 +6,7 @@ #include "base/file_util.h" #include "base/json/json_reader.h" +#include "base/json/json_value_serializer.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" @@ -13,7 +14,6 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/common/chrome_paths.h" #include "content/browser/browser_thread.h" -#include "content/common/json_value_serializer.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.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 84cdadf..4b517ab 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 @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #import "base/memory/scoped_nsobject.h" #include "base/path_service.h" #include "base/sys_string_conversions.h" @@ -17,7 +18,6 @@ #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.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/browser/ui/webui/options/chromeos/system_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc index 362fa82..4828ef2 100644 --- a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc @@ -10,11 +10,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/json/json_value_serializer.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/json_value_serializer.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/accessibility_util.h" #include "chrome/browser/chromeos/language_preferences.h" diff --git a/chrome/browser/ui/webui/quota_internals_ui.cc b/chrome/browser/ui/webui/quota_internals_ui.cc index 1b658a3..793bc42 100644 --- a/chrome/browser/ui/webui/quota_internals_ui.cc +++ b/chrome/browser/ui/webui/quota_internals_ui.cc @@ -6,13 +6,13 @@ #include <string> +#include "base/json/json_value_serializer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" #include "chrome/browser/ui/webui/quota_internals_handler.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/json_value_serializer.h" #include "grit/quota_internals_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index a8ad8bb..3446f41 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -8,6 +8,7 @@ #include <vector> #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" @@ -24,7 +25,6 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/extensions/extension_sidebar_defaults.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 dff7938..a8ec5e6 100644 --- a/chrome/common/extensions/extension_l10n_util.cc +++ b/chrome/common/extensions/extension_l10n_util.cc @@ -10,6 +10,7 @@ #include <vector> #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "base/stringprintf.h" @@ -19,7 +20,6 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_message_bundle.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 dd1f4f8..33f4ee5 100644 --- a/chrome/common/extensions/extension_manifests_unittest.cc +++ b/chrome/common/extensions/extension_manifests_unittest.cc @@ -12,6 +12,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/i18n/rtl.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/stringprintf.h" @@ -26,7 +27,6 @@ #include "chrome/common/extensions/extension_sidebar_defaults.h" #include "chrome/common/extensions/file_browser_handler.h" #include "chrome/common/extensions/url_pattern.h" -#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/extension_permission_set_unittest.cc b/chrome/common/extensions/extension_permission_set_unittest.cc index 644965f..cdc3ca6 100644 --- a/chrome/common/extensions/extension_permission_set_unittest.cc +++ b/chrome/common/extensions/extension_permission_set_unittest.cc @@ -4,12 +4,12 @@ #include "chrome/common/extensions/extension_permission_set.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index a969a39..d57fd2d 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -7,6 +7,7 @@ #include "base/format_macros.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" @@ -17,7 +18,6 @@ #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/extensions/extension_resource.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 9a06bbc..694cf73 100644 --- a/chrome/common/extensions/extension_unpacker.cc +++ b/chrome/common/extensions/extension_unpacker.cc @@ -7,6 +7,7 @@ #include <set> #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_handle.h" #include "base/scoped_temp_dir.h" #include "base/string_util.h" @@ -20,7 +21,6 @@ #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 "net/base/file_stream.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/common/json_pref_store.cc b/chrome/common/json_pref_store.cc index 9411f72..ac4a780 100644 --- a/chrome/common/json_pref_store.cc +++ b/chrome/common/json_pref_store.cc @@ -9,10 +9,10 @@ #include "base/bind.h" #include "base/callback.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" #include "base/values.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 5a91123..ac07f5c 100644 --- a/chrome/common/json_schema_validator_unittest_base.cc +++ b/chrome/common/json_schema_validator_unittest_base.cc @@ -9,6 +9,7 @@ #include <limits> #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" @@ -16,7 +17,6 @@ #include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/json_schema_validator.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 b932544..86b0f9d 100644 --- a/chrome/common/json_value_serializer_perftest.cc +++ b/chrome/common/json_value_serializer_perftest.cc @@ -1,17 +1,17 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #include <vector> #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "base/perftimer.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/common/chrome_paths.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 541ac8c..2ee9f61 100644 --- a/chrome/common/json_value_serializer_unittest.cc +++ b/chrome/common/json_value_serializer_unittest.cc @@ -5,6 +5,7 @@ #include "base/basictypes.h" #include "base/file_util.h" #include "base/json/json_reader.h" +#include "base/json/json_value_serializer.h" #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" @@ -13,7 +14,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/chrome_paths.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 b132b55..e633bffb 100644 --- a/chrome/common/jstemplate_builder.cc +++ b/chrome/common/jstemplate_builder.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,9 +7,9 @@ #include "chrome/common/jstemplate_builder.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/string_util.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 9f8605f..85898be 100644 --- a/chrome/common/web_apps_unittest.cc +++ b/chrome/common/web_apps_unittest.cc @@ -6,13 +6,13 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/json_schema_validator.h" -#include "content/common/json_value_serializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index bfb98f3..92b5ea5 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -14,6 +14,7 @@ #include "base/command_line.h" #include "base/file_path.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/rand_util.h" @@ -37,7 +38,6 @@ #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 "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 f3936c4..11767c3 100644 --- a/chrome/installer/util/google_chrome_distribution_unittest.cc +++ b/chrome/installer/util/google_chrome_distribution_unittest.cc @@ -6,11 +6,11 @@ #include <windows.h> +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.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 95bc66c..6531916 100644 --- a/chrome/installer/util/install_util.cc +++ b/chrome/installer/util/install_util.cc @@ -15,6 +15,7 @@ #include "base/command_line.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" @@ -30,7 +31,6 @@ #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 3e98d1f..e3f344e 100644 --- a/chrome/installer/util/master_preferences.cc +++ b/chrome/installer/util/master_preferences.cc @@ -6,13 +6,13 @@ #include "base/environment.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.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 3594758..b5972ce 100644 --- a/chrome/installer/util/master_preferences_unittest.cc +++ b/chrome/installer/util/master_preferences_unittest.cc @@ -5,6 +5,7 @@ // Unit tests for master preferences related methods. #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/stringprintf.h" @@ -12,7 +13,6 @@ #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 2daac0b..0416103 100644 --- a/chrome/renderer/automation/dom_automation_controller.cc +++ b/chrome/renderer/automation/dom_automation_controller.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #include "chrome/renderer/automation/dom_automation_controller.h" -#include "chrome/common/render_messages.h" -#include "content/common/json_value_serializer.h" +#include "base/json/json_value_serializer.h" #include "base/string_util.h" +#include "chrome/common/render_messages.h" DomAutomationController::DomAutomationController() : sender_(NULL), diff --git a/chrome/renderer/extensions/extension_api_json_validity_unittest.cc b/chrome/renderer/extensions/extension_api_json_validity_unittest.cc index 29de3d8..2508893 100644 --- a/chrome/renderer/extensions/extension_api_json_validity_unittest.cc +++ b/chrome/renderer/extensions/extension_api_json_validity_unittest.cc @@ -4,11 +4,11 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/v8_unit_test.h" -#include "content/common/json_value_serializer.h" #include "grit/common_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc index c2c880c..917257f 100644 --- a/chrome/renderer/extensions/extension_helper.cc +++ b/chrome/renderer/extensions/extension_helper.cc @@ -5,6 +5,7 @@ #include "chrome/renderer/extensions/extension_helper.h" #include "base/command_line.h" +#include "base/json/json_value_serializer.h" #include "base/lazy_instance.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -22,7 +23,6 @@ #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 "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/chrome/test/automation/automation_json_requests.cc b/chrome/test/automation/automation_json_requests.cc index ab0de31..76e8d2d 100644 --- a/chrome/test/automation/automation_json_requests.cc +++ b/chrome/test/automation/automation_json_requests.cc @@ -8,6 +8,7 @@ #include "base/file_path.h" #include "base/format_macros.h" #include "base/json/json_reader.h" +#include "base/json/json_value_serializer.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/stringprintf.h" @@ -16,7 +17,6 @@ #include "base/values.h" #include "chrome/common/automation_messages.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 be1aa9d..e70a746 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -9,6 +9,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/i18n/rtl.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_temp_dir.h" #include "base/string_util.h" @@ -31,7 +32,6 @@ #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/ui/ui_test.h" #include "content/browser/net/url_request_slow_http_job.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 5be6b98..6b1862c 100644 --- a/chrome/test/automation/javascript_execution_controller.cc +++ b/chrome/test/automation/javascript_execution_controller.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #include "chrome/test/automation/javascript_execution_controller.h" +#include "base/json/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 0a2a5c1..3d6cdff 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/string16.h" #include "base/threading/platform_thread.h" @@ -14,7 +15,6 @@ #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/perf/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc index 8255a94..4f3a3c3 100644 --- a/chrome/test/perf/dom_checker_uitest.cc +++ b/chrome/test/perf/dom_checker_uitest.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string_split.h" @@ -16,7 +17,6 @@ #include "chrome/common/chrome_switches.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/perf/dromaeo_benchmark_uitest.cc b/chrome/test/perf/dromaeo_benchmark_uitest.cc index d3b5225..ad9634f 100644 --- a/chrome/test/perf/dromaeo_benchmark_uitest.cc +++ b/chrome/test/perf/dromaeo_benchmark_uitest.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/test/test_timeouts.h" @@ -15,7 +16,6 @@ #include "chrome/test/base/ui_test_utils.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/perf/sunspider_uitest.cc b/chrome/test/perf/sunspider_uitest.cc index 6024cf9..b545819 100644 --- a/chrome/test/perf/sunspider_uitest.cc +++ b/chrome/test/perf/sunspider_uitest.cc @@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/test/test_timeouts.h" @@ -13,7 +14,6 @@ #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/perf/v8_benchmark_uitest.cc b/chrome/test/perf/v8_benchmark_uitest.cc index 969b61f..3f22fc2 100644 --- a/chrome/test/perf/v8_benchmark_uitest.cc +++ b/chrome/test/perf/v8_benchmark_uitest.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/test/test_timeouts.h" @@ -14,7 +15,6 @@ #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 87dcbb7..b71d67f 100644 --- a/chrome/test/ui/javascript_test_util.cc +++ b/chrome/test/ui/javascript_test_util.cc @@ -4,12 +4,12 @@ #include "chrome/test/ui/javascript_test_util.h" +#include "base/json/json_value_serializer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.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/ui_test.cc b/chrome/test/ui/ui_test.cc index bc89d33..f463598 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -18,6 +18,7 @@ #include "base/environment.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" @@ -46,7 +47,6 @@ #include "chrome/test/base/chrome_process_util.h" #include "chrome/test/base/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/content/content_common.gypi b/content/content_common.gypi index 1788d69..c32f977 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -136,8 +136,6 @@ 'common/indexed_db_param_traits.cc', 'common/indexed_db_param_traits.h', 'common/intents_messages.h', - 'common/json_value_serializer.cc', - 'common/json_value_serializer.h', 'common/mac/attributed_string_coder.h', 'common/mac/attributed_string_coder.mm', 'common/mac/font_descriptor.h', diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index b5549df..0e58757 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/json/json_value_serializer.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/metrics/histogram.h" @@ -32,7 +33,6 @@ #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/pepper_plugin_registry.h" diff --git a/remoting/host/plugin/policy_hack/nat_policy_linux.cc b/remoting/host/plugin/policy_hack/nat_policy_linux.cc index e7c177d..e4a2bf0 100644 --- a/remoting/host/plugin/policy_hack/nat_policy_linux.cc +++ b/remoting/host/plugin/policy_hack/nat_policy_linux.cc @@ -19,13 +19,13 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/files/file_path_watcher.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/values.h" -#include "content/common/json_value_serializer.h" namespace remoting { namespace policy_hack { diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index bc8087a7..a71932c 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -202,11 +202,6 @@ '../third_party/npapi/npapi.gyp:npapi', ], 'sources': [ - # Hack for NPAPI policy support. REMOVE ASAP. - # Bug: http://crbug.com/92576 - '../content/common/json_value_serializer.cc', - '../content/common/json_value_serializer.h', - 'host/plugin/host_log_handler.cc', 'host/plugin/host_log_handler.h', 'host/plugin/host_plugin.cc', |