summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger/devtools_remote_service.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 20:00:20 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 20:00:20 +0000
commit93d49d70b89b22ec46d0b00b7950297f64865d56 (patch)
tree3243e0209c738df0c18c2ba615667f757fcaec94 /chrome/browser/debugger/devtools_remote_service.cc
parenta9f607e33a91604bc63bd8c846aefbda9bf0dfa9 (diff)
downloadchromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.zip
chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.gz
chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.bz2
Move the json-related files into a separate json directory. This hopefully also
makes the naming of string_escape more clear (it's actually JSON-specific). Move the files into the base namespace. TEST=none BUG=none Review URL: http://codereview.chromium.org/316016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/devtools_remote_service.cc')
-rw-r--r--chrome/browser/debugger/devtools_remote_service.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/debugger/devtools_remote_service.cc b/chrome/browser/debugger/devtools_remote_service.cc
index 4308d18..3f786af9 100644
--- a/chrome/browser/debugger/devtools_remote_service.cc
+++ b/chrome/browser/debugger/devtools_remote_service.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/json_reader.h"
-#include "base/json_writer.h"
+#include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
#include "base/scoped_ptr.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
@@ -32,7 +32,7 @@ DevToolsRemoteService::~DevToolsRemoteService() {}
void DevToolsRemoteService::HandleMessage(
const DevToolsRemoteMessage& message) {
- scoped_ptr<Value> request(JSONReader::Read(message.content(), false));
+ scoped_ptr<Value> request(base::JSONReader::Read(message.content(), false));
if (request.get() == NULL) {
// Bad JSON
NOTREACHED();
@@ -94,7 +94,7 @@ void DevToolsRemoteService::ProcessJson(DictionaryValue* json,
response.SetInteger(kResultWide, Result::kUnknownCommand);
}
std::string response_json;
- JSONWriter::Write(&response, false, &response_json);
+ base::JSONWriter::Write(&response, false, &response_json);
scoped_ptr<DevToolsRemoteMessage> response_message(
DevToolsRemoteMessageBuilder::instance().Create(message.tool(),
message.destination(),