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

chrome/browser/dom_ui/dom_ui.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/dom_ui/dom_ui.h"
 
 #include "app/l10n_util.h"
-#include "base/json_reader.h"
-#include "base/json_writer.h"
+#include "base/json/json_writer.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/bindings_policy.h"
 
 DOMUI::DOMUI(TabContents* contents)
     : hide_favicon_(false),
@@ skipping 29 matching lines @@
 }
 
 void DOMUI::CallJavascriptFunction(const std::wstring& function_name) {
   std::wstring javascript = function_name + L"();";
   ExecuteJavascript(javascript);
 }
 
 void DOMUI::CallJavascriptFunction(const std::wstring& function_name,
                                    const Value& arg) {
   std::string json;
-  JSONWriter::Write(&arg, false, &json);
+  base::JSONWriter::Write(&arg, false, &json);
   std::wstring javascript = function_name + L"(" + UTF8ToWide(json) + L");";
 
   ExecuteJavascript(javascript);
 }
 
 void DOMUI::CallJavascriptFunction(
     const std::wstring& function_name,
     const Value& arg1, const Value& arg2) {
   std::string json;
-  JSONWriter::Write(&arg1, false, &json);
+  base::JSONWriter::Write(&arg1, false, &json);
   std::wstring javascript = function_name + L"(" + UTF8ToWide(json);
-  JSONWriter::Write(&arg2, false, &json);
+  base::JSONWriter::Write(&arg2, false, &json);
   javascript += L"," + UTF8ToWide(json) + L");";
 
   ExecuteJavascript(javascript);
 }
 
 ThemeProvider* DOMUI::GetThemeProvider() const {
   return tab_contents_->profile()->GetThemeProvider();
 }
 
 void DOMUI::RegisterMessageCallback(const std::string &message,
@@ skipping 88 matching lines @@
         list_member->GetType() == Value::TYPE_STRING) {
       const StringValue* string_value =
           static_cast<const StringValue*>(list_member);
       std::wstring wstring_value;
       string_value->GetAsString(&wstring_value);
       return wstring_value;
     }
   }
   return std::wstring();
 }