Revert 71485 - Remove wstring from TemplateURL and friends....

chrome/browser/tab_contents/tab_contents.cc

 // 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/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 2157 matching lines @@
   const NavigationEntry* previous_entry =
       controller_.GetEntryAtIndex(last_index - 1);
   if (IsFormSubmit(previous_entry)) {
     // Only generate a keyword if the previous page wasn't itself a form
     // submit.
     return;
   }
 
   GURL keyword_url = previous_entry->user_typed_url().is_valid() ?
           previous_entry->user_typed_url() : previous_entry->url();
-  string16 keyword =
+  std::wstring keyword =
       TemplateURLModel::GenerateKeyword(keyword_url, true);  // autodetected
   if (keyword.empty())
     return;
 
   TemplateURLModel* url_model = profile()->GetTemplateURLModel();
   if (!url_model)
     return;
 
   if (!url_model->loaded()) {
     url_model->Load();
@@ skipping 807 matching lines @@
 
   // We want to use the user typed URL if available since that represents what
   // the user typed to get here, and fall back on the regular URL if not.
   if (!base_entry)
     return;
   GURL keyword_url = base_entry->user_typed_url().is_valid() ?
           base_entry->user_typed_url() : base_entry->url();
   if (!keyword_url.is_valid())
     return;
 
-  string16 keyword = TemplateURLModel::GenerateKeyword(
+  std::wstring keyword = TemplateURLModel::GenerateKeyword(
       keyword_url,
       provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER);
 
   // Download the OpenSearch description document. If this is successful, a
   // new keyword will be created when done.
   profile()->GetTemplateURLFetcher()->ScheduleDownload(
       keyword,
       url,
       base_entry->favicon().url(),
       new TemplateURLFetcherUICallbacks(this),
@@ skipping 361 matching lines @@
 }
 
 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) {
   render_manager_.SwapInRenderViewHost(rvh);
 }
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
   rwh_view->SetSize(view()->GetContainerSize());
 }