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/installer | |
| 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/installer')
5 files changed, 5 insertions, 5 deletions
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" |