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

chrome/test/ui_test_utils.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/test/ui_test_utils.h"
 
 #include <vector>
 
-#include "base/json_reader.h"
+#include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
@@ skipping 370 matching lines @@
   std::wstring script = L"window.domAutomationController.setAutomationId(0);" +
       original_script;
   render_view_host->ExecuteJavascriptInWebFrame(frame_xpath, script);
   DOMOperationObserver dom_op_observer(render_view_host);
   std::string json = dom_op_observer.response();
   // Wrap |json| in an array before deserializing because valid JSON has an
   // array or an object as the root.
   json.insert(0, "[");
   json.append("]");
 
-  scoped_ptr<Value> root_val(JSONReader::Read(json, true));
+  scoped_ptr<Value> root_val(base::JSONReader::Read(json, true));
   if (!root_val->IsType(Value::TYPE_LIST))
     return NULL;
 
   ListValue* list = static_cast<ListValue*>(root_val.get());
   Value* result;
   if (!list || !list->GetSize() ||
       !list->Remove(0, &result))  // Remove gives us ownership of the value.
     return NULL;
 
   return result;
@@ skipping 86 matching lines @@
                      NotificationObserver* observer,
                      int64 timeout_ms) {
   NotificationRegistrar registrar;
   registrar.Add(observer, type, NotificationService::AllSources());
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, new MessageLoop::QuitTask, timeout_ms);
   RunMessageLoop();
 }
 
 }  // namespace ui_test_utils