Implement alternative string conversion functions in net/ on Android,

net/proxy/proxy_script_fetcher_impl.cc

 // Copyright (c) 2012 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 "net/proxy/proxy_script_fetcher_impl.h"
 
 #include "base/compiler_specific.h"
-#include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "net/base/data_url.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_string_util.h"
 #include "net/base/request_priority.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_context.h"
 
 // TODO(eroman):
 //   - Support auth-prompts (http://crbug.com/77366)
 
 namespace net {
 
@@ skipping 23 matching lines @@
 // Converts |bytes| (which is encoded by |charset|) to UTF16, saving the resul
 // to |*utf16|.
 // If |charset| is empty, then we don't know what it was and guess.
 void ConvertResponseToUTF16(const std::string& charset,
                             const std::string& bytes,
                             base::string16* utf16) {
   const char* codepage;
 
   if (charset.empty()) {
     // Assume ISO-8859-1 if no charset was specified.
-    codepage = base::kCodepageLatin1;
+    codepage = kCharsetLatin1;
   } else {
     // Otherwise trust the charset that was provided.
     codepage = charset.c_str();
   }
 
-  // We will be generous in the conversion -- if any characters lie
-  // outside of |charset| (i.e. invalid), then substitute them with
-  // U+FFFD rather than failing.
-  base::CodepageToUTF16(bytes, codepage,
-                        base::OnStringConversionError::SUBSTITUTE,
-                        utf16);
+  // Be generous in the conversion -- if any characters lie outside of |charset|
+  // (i.e. invalid), then substitute them with U+FFFD rather than failing.
+  ConvertToUTF16WithSubstitutions(bytes, codepage, utf16);
 }
 
 }  // namespace
 
 ProxyScriptFetcherImpl::ProxyScriptFetcherImpl(
     URLRequestContext* url_request_context)
     : weak_factory_(this),
       url_request_context_(url_request_context),
       buf_(new IOBuffer(kBufSize)),
       next_id_(0),
@@ skipping 233 matching lines @@
   // is still applicable.
   if (cur_request_id_ != id)
     return;
 
   DCHECK(cur_request_.get());
   result_code_ = ERR_TIMED_OUT;
   cur_request_->Cancel();
 }
 
 }  // namespace net