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

chrome/browser/importer/firefox_importer_utils.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/importer/firefox_importer_utils.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
 #include "base/file_util.h"
@@ skipping 293 matching lines @@
     // browser.search.selectedEngine does not exist if the user has not changed
     // from the default (or has selected the default).
     // TODO: should fallback to 'browser.search.defaultengine' if selectedEngine
     // is empty.
     return -1;
   }
 
   int default_se_index = -1;
   for (std::vector<TemplateURL*>::const_iterator iter = search_engines.begin();
        iter != search_engines.end(); ++iter) {
-    if (default_se_name == UTF16ToUTF8((*iter)->short_name())) {
+    if (default_se_name == WideToUTF8((*iter)->short_name())) {
       default_se_index = static_cast<int>(iter - search_engines.begin());
       break;
     }
   }
   if (default_se_index == -1) {
     LOG(WARNING) <<
         "Firefox default search engine not found in search engine list";
   }
 
   return default_se_index;
@@ skipping 129 matching lines @@
   }
 
   // String values have double quotes we don't need to return to the caller.
   if (content[start] == '\"' && content[stop - 1] == '\"') {
     ++start;
     --stop;
   }
 
   return content.substr(start, stop - start);
 }