Remove wstring from TemplateURL and friends....

chrome/browser/ui/browser_init.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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/environment.h"
@@ skipping 867 matching lines @@
           profile->GetTemplateURLModel()->GetDefaultSearchProvider();
       if (!default_provider || !default_provider->url()) {
         // No search provider available. Just treat this as regular URL.
         urls.push_back(URLFixerUpper::FixupRelativeFile(cur_dir_, param));
         continue;
       }
       const TemplateURLRef* search_url = default_provider->url();
       DCHECK(search_url->SupportsReplacement());
       std::wstring search_term = param.ToWStringHack().substr(2);
       urls.push_back(GURL(search_url->ReplaceSearchTerms(
-          *default_provider, search_term,
-          TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring())));
+          *default_provider, WideToUTF16Hack(search_term),
+          TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())));
     } else {
       // This will create a file URL or a regular URL.
       // This call can (in rare circumstances) block the UI thread.
       // Allow it until this bug is fixed.
       //  http://code.google.com/p/chromium/issues/detail?id=60641
       GURL url;
       {
         base::ThreadRestrictions::ScopedAllowIO allow_io;
         url = URLFixerUpper::FixupRelativeFile(cur_dir_, param);
       }
@@ skipping 195 matching lines @@
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }