summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 18:36:00 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 18:36:00 +0000
commit005bab086c8d301c29e99db5903b00bb18cbdaaf (patch)
tree5e64a9a62a571276d1f040d9ac49a1a185473c28 /chrome/renderer
parente378878b3eb3ad69affcdb3f8e36accbd1ea4c4c (diff)
downloadchromium_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/renderer')
-rw-r--r--chrome/renderer/automation/dom_automation_controller.cc6
-rw-r--r--chrome/renderer/extensions/extension_api_json_validity_unittest.cc2
-rw-r--r--chrome/renderer/extensions/extension_helper.cc2
3 files changed, 5 insertions, 5 deletions
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"