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

chrome/browser/sync/sync_setup_flow.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.
 
 #if defined(BROWSER_SYNC)
 
 #include "chrome/browser/sync/sync_setup_flow.h"
 
 #include "app/gfx/font.h"
 #include "app/gfx/font_util.h"
 #include "base/histogram.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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/sync/auth_error_state.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
@@ skipping 28 matching lines @@
 
 void FlowHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback("SubmitAuth",
       NewCallback(this, &FlowHandler::HandleSubmitAuth));
   dom_ui_->RegisterMessageCallback("SubmitMergeAndSync",
       NewCallback(this, &FlowHandler::HandleSubmitMergeAndSync));
 }
 
 static bool GetUsernameAndPassword(const std::string& json,
     std::string* username, std::string* password) {
-  scoped_ptr<Value> parsed_value(JSONReader::Read(json, false));
+  scoped_ptr<Value> parsed_value(base::JSONReader::Read(json, false));
   if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
     return false;
 
   DictionaryValue* result = static_cast<DictionaryValue*>(parsed_value.get());
   if (!result->GetString(L"user", username) ||
       !result->GetString(L"pass", password)) {
       return false;
   }
   return true;
 }
@@ skipping 16 matching lines @@
 }
 
 void FlowHandler::HandleSubmitMergeAndSync(const Value* value) {
   if (flow_)
     flow_->OnUserAcceptedMergeAndSync();
 }
 
 // Called by SyncSetupFlow::Advance.
 void FlowHandler::ShowGaiaLogin(const DictionaryValue& args) {
   std::string json;
-  JSONWriter::Write(&args, false, &json);
+  base::JSONWriter::Write(&args, false, &json);
   std::wstring javascript = std::wstring(L"showGaiaLogin") +
       L"(" + UTF8ToWide(json) + L");";
   ExecuteJavascriptInIFrame(kLoginIFrameXPath, javascript);
 }
 
 void FlowHandler::ShowGaiaSuccessAndClose() {
   ExecuteJavascriptInIFrame(kLoginIFrameXPath, L"showGaiaSuccessAndClose();");
 }
 
 void FlowHandler::ShowGaiaSuccessAndSettingUp() {
   ExecuteJavascriptInIFrame(kLoginIFrameXPath,
                             L"showGaiaSuccessAndSettingUp();");
 }
 
 void FlowHandler::ShowMergeAndSync() {
   if (dom_ui_)  // NULL during testing.
     dom_ui_->CallJavascriptFunction(L"showMergeAndSync");
 }
 
 void FlowHandler::ShowSetupDone(const std::wstring& user) {
   StringValue synced_to_string(WideToUTF8(l10n_util::GetStringF(
       IDS_SYNC_NTP_SYNCED_TO, user)));
   std::string json;
-  JSONWriter::Write(&synced_to_string, false, &json);
+  base::JSONWriter::Write(&synced_to_string, false, &json);
   std::wstring javascript = std::wstring(L"setSyncedToUser") +
       L"(" + UTF8ToWide(json) + L");";
   ExecuteJavascriptInIFrame(kDoneIframeXPath, javascript);
 
   if (dom_ui_)
     dom_ui_->CallJavascriptFunction(L"showSetupDone", synced_to_string);
 }
 
 void FlowHandler::ShowFirstTimeDone(const std::wstring& user) {
   ExecuteJavascriptInIFrame(kDoneIframeXPath,
@@ skipping 146 matching lines @@
 
 // static
 SyncSetupFlow* SyncSetupFlow::Run(ProfileSyncService* service,
                                   SyncSetupFlowContainer* container,
                                   SyncSetupWizard::State start,
                                   SyncSetupWizard::State end) {
   DictionaryValue args;
   if (start == SyncSetupWizard::GAIA_LOGIN)
     SyncSetupFlow::GetArgsForGaiaLogin(service, &args);
   std::string json_args;
-  JSONWriter::Write(&args, false, &json_args);
+  base::JSONWriter::Write(&args, false, &json_args);
 
   Browser* b = BrowserList::GetLastActive();
   if (!b)
     return NULL;
 
   FlowHandler* handler = new FlowHandler();
   SyncSetupFlow* flow = new SyncSetupFlow(start, end, json_args,
       container, handler, service);
   handler->set_flow(flow);
   b->BrowserShowHtmlDialog(flow, NULL);
   return flow;
 }
 
 #endif  // defined(BROWSER_SYNC)