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

chrome/browser/automation/extension_port_container.cc

 // Copyright (c) 2009 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/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"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
@@ skipping 65 matching lines @@
 
 void ExtensionPortContainer::SendConnectionResponse(int connection_id,
                                                     int port_id) {
   // Compose the reply message.
   scoped_ptr<DictionaryValue> msg_dict(new DictionaryValue());
   msg_dict->SetInteger(ext::kAutomationRequestIdKey, ext::CHANNEL_OPENED);
   msg_dict->SetInteger(ext::kAutomationConnectionIdKey, connection_id);
   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);
 }
 
 bool ExtensionPortContainer::Send(IPC::Message *message) {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
   IPC_BEGIN_MESSAGE_MAP(ExtensionPortContainer, *message)
     IPC_MESSAGE_HANDLER(ViewMsg_ExtensionMessageInvoke,
                         OnExtensionMessageInvoke)
@@ skipping 28 matching lines @@
 
 void ExtensionPortContainer::OnExtensionHandleMessage(
     const std::string& message, int source_port_id) {
   // Compose the reply message and fire it away.
   DictionaryValue msg_dict;
   msg_dict.SetInteger(ext::kAutomationRequestIdKey, ext::POST_MESSAGE);
   msg_dict.SetInteger(ext::kAutomationPortIdKey, port_id_);
   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);
 }
 
 void ExtensionPortContainer::OnExtensionPortDisconnected(int source_port_id) {
   // Compose the disconnect message and fire it away.
   DictionaryValue msg_dict;
   msg_dict.SetInteger(ext::kAutomationRequestIdKey, ext::CHANNEL_CLOSED);
   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);
 }
 
 bool ExtensionPortContainer::InterceptMessageFromExternalHost(
     const std::string& message, const std::string& origin,
     const std::string& target, AutomationProvider* automation,
     RenderViewHost *view_host, int tab_handle) {
   if (target != ext::kAutomationPortRequestTarget)
     return false;
 
   if (origin != ext::kAutomationOrigin) {
     // TODO(siggi): Should we block the message on wrong origin?
     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;
 
   DictionaryValue* message_dict =
       reinterpret_cast<DictionaryValue*>(message_value.get());
 
   int command = -1;
   bool got_value = message_dict->GetInteger(ext::kAutomationRequestIdKey,
                                             &command);
@@ skipping 62 matching lines @@
       // This will delete the port and notify the other end of the disconnect.
       automation->RemovePortContainer(port);
     }
   } else {
     // We don't expect other messages here.
     NOTREACHED();
   }
 
   return true;
 }