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
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index c28322f..d791afb6 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -9,7 +9,7 @@
#include "app/l10n_util.h"
#include "app/message_box_flags.h"
#include "base/file_version_info.h"
-#include "base/json_reader.h"
+#include "base/json/json_reader.h"
#include "base/keyboard_codes.h"
#include "base/message_loop.h"
#include "base/path_service.h"
@@ -1662,7 +1662,7 @@
// The message is a JSON-encoded array with two elements, both strings. The
// first is the name of the event to dispatch. The second is a JSON-encoding
// of the arguments specific to that event.
- scoped_ptr<Value> message_value(JSONReader::Read(message, false));
+ scoped_ptr<Value> message_value(base::JSONReader::Read(message, false));
if (!message_value.get() || !message_value->IsType(Value::TYPE_LIST)) {
LOG(WARNING) << "Invalid browser event specified through automation";
return false;