diff options
author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 18:36:00 +0000 |
---|---|---|
committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 18:36:00 +0000 |
commit | 005bab086c8d301c29e99db5903b00bb18cbdaaf (patch) | |
tree | 5e64a9a62a571276d1f040d9ac49a1a185473c28 /chrome/common | |
parent | e378878b3eb3ad69affcdb3f8e36accbd1ea4c4c (diff) | |
download | chromium_src-005bab086c8d301c29e99db5903b00bb18cbdaaf.zip chromium_src-005bab086c8d301c29e99db5903b00bb18cbdaaf.tar.gz chromium_src-005bab086c8d301c29e99db5903b00bb18cbdaaf.tar.bz2 |
Move json_value_serializer from content/common to base.
R=darin@chromium.org
BUG=92044
TEST=
Review URL: http://codereview.chromium.org/8165009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/extensions/extension_file_util.cc | 2 | ||||
-rw-r--r-- | chrome/common/extensions/extension_l10n_util.cc | 2 | ||||
-rw-r--r-- | chrome/common/extensions/extension_manifests_unittest.cc | 2 | ||||
-rw-r--r-- | chrome/common/extensions/extension_permission_set_unittest.cc | 2 | ||||
-rw-r--r-- | chrome/common/extensions/extension_unittest.cc | 2 | ||||
-rw-r--r-- | chrome/common/extensions/extension_unpacker.cc | 2 | ||||
-rw-r--r-- | chrome/common/json_pref_store.cc | 2 | ||||
-rw-r--r-- | chrome/common/json_schema_validator_unittest_base.cc | 2 | ||||
-rw-r--r-- | chrome/common/json_value_serializer_perftest.cc | 4 | ||||
-rw-r--r-- | chrome/common/json_value_serializer_unittest.cc | 2 | ||||
-rw-r--r-- | chrome/common/jstemplate_builder.cc | 4 | ||||
-rw-r--r-- | chrome/common/web_apps_unittest.cc | 2 |
12 files changed, 14 insertions, 14 deletions
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 { |