Clean up recent string conversion function changes, part 1: Remove unnecessar...

net/base/escape.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 <algorithm>
 
 #include "net/base/escape.h"
 
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
@@ skipping 234 matching lines @@
   // alphanumerics and !'()*-._~
   escaped->assign(UTF8ToWide(Escape(encoded, kQueryCharmap, true)));
   return true;
 }
 
 std::wstring UnescapeAndDecodeUTF8URLComponent(const std::string& text,
                                                UnescapeRule::Type rules,
                                                size_t* offset_for_adjustment) {
   std::wstring result;
   size_t original_offset = offset_for_adjustment ? *offset_for_adjustment : 0;
-  if (base::CodepageToWideAndAdjustOffset(
-          UnescapeURLImpl(text, rules, offset_for_adjustment),
-          "UTF-8", base::OnStringConversionError::FAIL, &result,
-          offset_for_adjustment))
+  std::string unescaped_url(
+      UnescapeURLImpl(text, rules, offset_for_adjustment));
+  if (UTF8ToWideAndAdjustOffset(unescaped_url.data(), unescaped_url.length(),
+                                &result, offset_for_adjustment))
     return result;          // Character set looks like it's valid.
 
   // Not valid.  Return the escaped version.  Undo our changes to
   // |offset_for_adjustment| since we haven't changed the string after all.
   if (offset_for_adjustment)
     *offset_for_adjustment = original_offset;
   return UTF8ToWideAndAdjustOffset(text, offset_for_adjustment);
 }
 
 std::string UnescapeURLComponent(const std::string& escaped_text,
@@ skipping 45 matching lines @@
   return result;
 }
 
 std::string EscapeForHTML(const std::string& input) {
   return EscapeForHTMLImpl(input);
 }
 
 std::wstring EscapeForHTML(const std::wstring& input) {
   return EscapeForHTMLImpl(input);
 }