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

chrome/browser/automation/automation_provider.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/automation_provider.h"
 
 #include <set>
 
 #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"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/values.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
@@ skipping 1624 matching lines @@
     return false;
 
   if (origin != extension_automation_constants::kAutomationOrigin) {
     LOG(WARNING) << "Wrong origin on automation browser event " << origin;
     return false;
   }
 
   // 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;
   }
 
   const ListValue* args = static_cast<const ListValue*>(message_value.get());
 
   std::string event_name;
   if (!args->GetString(0, &event_name)) {
     LOG(WARNING) << "No browser event name specified through automation";
@@ skipping 482 matching lines @@
                                       reply_message);
 
     profile_->GetExtensionsService()->LoadExtension(extension_dir);
     profile_->GetUserScriptMaster()->AddWatchedPath(extension_dir);
   } else {
     AutomationMsg_LoadExpandedExtension::WriteReplyParams(
         reply_message, AUTOMATION_MSG_EXTENSION_INSTALL_FAILED);
     Send(reply_message);
   }
 }