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

chrome/renderer/extensions/extension_api_client_unittest.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 "base/file_util.h"
-#include "base/json_reader.h"
+#include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/test/render_view_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class ExtensionAPIClientTest : public RenderViewTest {
@@ skipping 35 matching lines @@
     ASSERT_EQ("", GetConsoleMessage()) << js;
     ASSERT_TRUE(request_msg) << js;
     ViewHostMsg_ExtensionRequest::Param params;
     ViewHostMsg_ExtensionRequest::Read(request_msg, &params);
     ASSERT_EQ(function.c_str(), params.a) << js;
 
     Value* args = NULL;
     ASSERT_TRUE(params.b.IsType(Value::TYPE_LIST));
     ASSERT_TRUE(static_cast<const ListValue*>(&params.b)->Get(0, &args));
 
-    JSONReader reader;
+    base::JSONReader reader;
     scoped_ptr<Value> arg1_value(reader.JsonToValue(arg1, false, false));
     ASSERT_TRUE(args->Equals(arg1_value.get())) << js;
     render_thread_.sink().ClearMessages();
   }
 };
 
 // Tests that callback dispatching works correctly and that JSON is properly
 // deserialized before handing off to the extension code. We use the createTab
 // API here, but we could use any of them since they all dispatch callbacks the
 // same way.
@@ skipping 551 matching lines @@
 
   ExpectJsFail("chrome.i18n.getMessage('name', [])",
                "Uncaught Error: Invalid value for argument 1. Value does not "
                "match any valid type choices.");
 
   ExpectJsFail("chrome.i18n.getMessage('name', ['p1', 'p2', 'p3', 'p4', 'p5', "
                "'p6', 'p7', 'p8', 'p9', 'p10'])",
                "Uncaught Error: Invalid value for argument 1. Value does not "
                "match any valid type choices.");
 }