Move the json-related files into a separate json directory. This hopefully al...

chrome/browser/automation/extension_port_container.cc

Index: chrome/browser/automation/extension_port_container.cc
===================================================================
--- chrome/browser/automation/extension_port_container.cc	(revision 29830)
+++ chrome/browser/automation/extension_port_container.cc	(working copy)
@@ -5,8 +5,8 @@
 #include "chrome/browser/automation/extension_port_container.h"
 
 #include "base/logging.h"
-#include "base/json_reader.h"
-#include "base/json_writer.h"
+#include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
@@ -92,7 +92,7 @@
   msg_dict->SetInteger(ext::kAutomationPortIdKey, port_id);
 
   std::string msg_json;
-  JSONWriter::Write(msg_dict.get(), false, &msg_json);
+  base::JSONWriter::Write(msg_dict.get(), false, &msg_json);
 
   PostResponseToExternalPort(msg_json);
 }
@@ -141,7 +141,7 @@
   msg_dict.SetString(ext::kAutomationMessageDataKey, message);
 
   std::string msg_json;
-  JSONWriter::Write(&msg_dict, false, &msg_json);
+  base::JSONWriter::Write(&msg_dict, false, &msg_json);
 
   PostMessageToExternalPort(msg_json);
 }
@@ -153,7 +153,7 @@
   msg_dict.SetInteger(ext::kAutomationPortIdKey, port_id_);
 
   std::string msg_json;
-  JSONWriter::Write(&msg_dict, false, &msg_json);
+  base::JSONWriter::Write(&msg_dict, false, &msg_json);
 
   PostMessageToExternalPort(msg_json);
 }
@@ -170,7 +170,7 @@
     LOG(WARNING) << "Wrong origin on automation port message " << origin;
   }
 
-  scoped_ptr<Value> message_value(JSONReader::Read(message, false));
+  scoped_ptr<Value> message_value(base::JSONReader::Read(message, false));
   DCHECK(message_value->IsType(Value::TYPE_DICTIONARY));
   if (!message_value->IsType(Value::TYPE_DICTIONARY))
     return true;