Remove wstring from l10n_util. Part 1....

chrome/browser/character_encoding.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_CHARACTER_ENCODING_H_
 #define CHROME_BROWSER_CHARACTER_ENCODING_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 
 class CharacterEncoding {
  public:
   // Enumeration of the types of Browser encoding name we
   // currently support. This is defined outside of Browser
   // to avoid cyclical dependencies.
 
   // Structure to save encoding information.
   struct EncodingInfo {
     explicit EncodingInfo(int id);
     // Gets string key of EncodingInfo. With this method, we can use
     // l10n_util::SortVectorWithStringKey to sort the encoding menu items
     // by current locale character sequence. We need to keep the order within
     // encoding category name, that's why we use category name as key.
-    const std::wstring& GetStringKey() const { return encoding_category_name; }
+    const string16& GetStringKey() const { return encoding_category_name; }
 
     // Encoding command id.
     int encoding_id;
     // Encoding display name.
-    std::wstring encoding_display_name;
+    string16 encoding_display_name;
     // Encoding category name.
-    std::wstring encoding_category_name;
+    string16 encoding_category_name;
   };
 
   // Return canonical encoding name according to the command ID.
   // THIS FUNCTION IS NOT THREADSAFE. You must run this function
   // only in UI thread.
   static std::string GetCanonicalEncodingNameByCommandId(int id);
 
   // Return display name of canonical encoding according to the command
   // ID. THIS FUNCTION IS NOT THREADSAFE. You must run this function
   // only in UI thread.
@@ skipping 52 matching lines @@
   // valid, return corresponding encoding command id. Otherwise return 0;
   static int GetCommandIdByCanonicalEncodingName(
       const std::string& encoding_name);
 
  private:
   // Disallow instantiating it since this class only contains static methods.
   DISALLOW_IMPLICIT_CONSTRUCTORS(CharacterEncoding);
 };
 
 #endif  // CHROME_BROWSER_CHARACTER_ENCODING_H_