Convert base dependencies to use sys_string_conversions instead of the ICU...

base/json_reader.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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/json_reader.h"
 
 #include "base/float_util.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 
 static const JSONReader::Token kInvalidToken(JSONReader::Token::INVALID_TOKEN,
                                              0, 0);
 static const int kStackLimit = 100;
 
 namespace {
 
 inline int HexToInt(wchar_t c) {
   if ('0' <= c && c <= '9') {
@@ skipping 90 matching lines @@
 }
 
 /* static */
 std::string JSONReader::FormatErrorMessage(int line, int column,
                                            const char* description) {
   return StringPrintf("Line: %i, column: %i, %s",
                       line, column, description);
 }
 
 JSONReader::JSONReader()
-  : start_pos_(NULL), json_pos_(NULL), stack_depth_(0),
-    allow_trailing_comma_(false) {}
+    : start_pos_(NULL), json_pos_(NULL), stack_depth_(0),
+      allow_trailing_comma_(false) {}
 
 Value* JSONReader::JsonToValue(const std::string& json, bool check_root,
                                bool allow_trailing_comma) {
   // The input must be in UTF-8.
   if (!IsStringUTF8(json.c_str())) {
     error_message_ = kUnsupportedEncoding;
     return NULL;
   }
 
   // The conversion from UTF8 to wstring removes null bytes for us
@@ skipping 495 matching lines @@
     if (*pos == '\n') {
       ++line_number;
       column_number = 1;
     } else {
       ++column_number;
     }
   }
 
   error_message_ = FormatErrorMessage(line_number, column_number, description);
 }