Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_...

chrome/browser/geolocation/geolocation_settings_state.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/geolocation/geolocation_settings_state.h"
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 76 matching lines @@
       *tab_state_flags |= TABSTATE_HAS_EXCEPTION;
     if (saved_setting != i->second)
       *tab_state_flags |= TABSTATE_HAS_CHANGED;
     if (saved_setting != CONTENT_SETTING_ASK)
       *tab_state_flags |= TABSTATE_HAS_ANY_ICON;
   }
 }
 
 std::string GeolocationSettingsState::GURLToFormattedHost(
     const GURL& url) const {
-  std::wstring display_host_wide;
-  net::AppendFormattedHost(
-      url, UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)),
-      &display_host_wide, NULL, NULL);
-  return WideToUTF8(display_host_wide);
+  string16 display_host;
+  net::AppendFormattedHost(url,
+      profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), &display_host);
+  return UTF16ToUTF8(display_host);
 }