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

2 files changed, 6 insertions, 6 deletions

diff --git a/chrome/renderer/extensions/extension_api_client_unittest.cc b/chrome/renderer/extensions/extension_api_client_unittest.cc
index 0900803..ac06153 100644
--- a/chrome/renderer/extensions/extension_api_client_unittest.cc
+++ b/chrome/renderer/extensions/extension_api_client_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/file_util.h"
-#include "base/json_reader.h"
+#include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
@@ -59,7 +59,7 @@ class ExtensionAPIClientTest : public RenderViewTest {
     ASSERT_TRUE(params.b.IsType(Value::TYPE_LIST));
     ASSERT_TRUE(static_cast<const ListValue*>(&params.b)->Get(0, &args));
 
-    JSONReader reader;
+    base::JSONReader reader;
     scoped_ptr<Value> arg1_value(reader.JsonToValue(arg1, false, false));
     ASSERT_TRUE(args->Equals(arg1_value.get())) << js;
     render_thread_.sink().ClearMessages();
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 9641c23..2e8d036 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/renderer/extensions/extension_process_bindings.h"
+
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "chrome/renderer/extensions/extension_process_bindings.h"
-
-#include "base/json_reader.h"
+#include "base/json/json_reader.h"
 #include "base/singleton.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_message_bundle.h"
@@ -397,7 +397,7 @@ class ExtensionImpl : public ExtensionBase {
   // callback will be dispatched to EventBindings::HandleResponse.
   static v8::Handle<v8::Value> StartRequest(const v8::Arguments& args) {
     std::string str_args = *v8::String::Utf8Value(args[1]);
-    JSONReader reader;
+    base::JSONReader reader;
     Value* value_args = reader.JsonToValue(str_args, false, false);
 
     // Since we do the serialization in the v8 extension, we should always get