| Index: chrome/browser/tab_contents/tab_contents.cc
 | 
| ===================================================================
 | 
| --- chrome/browser/tab_contents/tab_contents.cc	(revision 71499)
 | 
| +++ chrome/browser/tab_contents/tab_contents.cc	(working copy)
 | 
| @@ -2175,7 +2175,7 @@
 | 
|  
 | 
|    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;
 | 
| @@ -3003,7 +3003,7 @@
 | 
|    if (!keyword_url.is_valid())
 | 
|      return;
 | 
|  
 | 
| -  string16 keyword = TemplateURLModel::GenerateKeyword(
 | 
| +  std::wstring keyword = TemplateURLModel::GenerateKeyword(
 | 
|        keyword_url,
 | 
|        provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER);
 | 
|  
 | 
| 
 |