Revert 72380 - Remove wstring from autocomplete....

chrome/browser/ui/toolbar/toolbar_model.cc

 // Copyright (c) 2010 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/ui/toolbar/toolbar_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/cert_store.h"
@@ skipping 35 matching lines @@
       url = GURL();
     } else if (entry) {
       url = entry->virtual_url();
     }
   }
   if (url.spec().length() > chrome::kMaxURLDisplayChars)
     url = url.IsStandard() ? url.GetOrigin() : GURL(url.scheme() + ":");
   // Note that we can't unescape spaces here, because if the user copies this
   // and pastes it into another program, that program may think the URL ends at
   // the space.
-  return UTF16ToWideHack(
-      AutocompleteInput::FormattedStringWithEquivalentMeaning(
-          url,
-          net::FormatUrl(url, languages, net::kFormatUrlOmitAll,
-                         UnescapeRule::NORMAL, NULL, NULL, NULL)));
+  return AutocompleteInput::FormattedStringWithEquivalentMeaning(url,
+      UTF16ToWideHack(net::FormatUrl(url, languages, net::kFormatUrlOmitAll,
+                                     UnescapeRule::NORMAL, NULL, NULL, NULL)));
 }
 
 ToolbarModel::SecurityLevel ToolbarModel::GetSecurityLevel() const {
   if (input_in_progress_)  // When editing, assume no security style.
     return NONE;
 
   NavigationController* navigation_controller = GetNavigationController();
   if (!navigation_controller)  // We might not have a controller on init.
     return NONE;
 
@@ skipping 51 matching lines @@
   return UTF16ToWideHack(SSLManager::GetEVCertName(*cert));
 }
 
 NavigationController* ToolbarModel::GetNavigationController() const {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }