Rename GetStringAsUTF16() to GetString() (and overload), etc.

base/values.h

 // 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.
 
 // This file specifies a recursive data storage class called Value intended for
 // storing setting and other persistable data.  It includes the ability to
 // specify (recursive) lists and dictionaries, so it's fairly expressive.
 // However, the API is optimized for the common case, namely storing a
 // hierarchical tree of simple values.  Given a DictionaryValue root, you can
 // easily do things like:
@@ skipping 271 matching lines @@
   bool Get(const std::string& path, Value** out_value) const;
   /*DEPRECATED*/bool Get(const std::wstring& path, Value** out_value) const;
 
   // These are convenience forms of Get().  The value will be retrieved
   // and the return value will be true if the path is valid and the value at
   // the end of the path can be returned in the form specified.
   bool GetBoolean(const std::string& path, bool* out_value) const;
   bool GetInteger(const std::string& path, int* out_value) const;
   bool GetReal(const std::string& path, double* out_value) const;
   bool GetString(const std::string& path, std::string* out_value) const;
-  bool GetStringAsUTF16(const std::string& path, string16* out_value) const;
+  bool GetString(const std::string& path, string16* out_value) const;
   bool GetStringASCII(const std::string& path, std::string* out_value) const;
   bool GetBinary(const std::string& path, BinaryValue** out_value) const;
   bool GetDictionary(const std::string& path,
                      DictionaryValue** out_value) const;
   bool GetList(const std::string& path, ListValue** out_value) const;
   /*DEPRECATED*/bool GetBoolean(const std::wstring& path,
                                 bool* out_value) const;
   /*DEPRECATED*/bool GetInteger(const std::wstring& path, int* out_value) const;
   /*DEPRECATED*/bool GetReal(const std::wstring& path, double* out_value) const;
-  // Use |GetStringAsUTF16()| instead:
-  /*DEPRECATED*/bool GetString(const std::string& path,
-                               string16* out_value) const;
   /*DEPRECATED*/bool GetString(const std::wstring& path,
                                std::string* out_value) const;
   /*DEPRECATED*/bool GetString(const std::wstring& path,
                                std::wstring* out_value) const;
-  /*DEPRECATED*/bool GetStringAsUTF16(const std::wstring& path,
-                                      string16* out_value) const;
   /*DEPRECATED*/bool GetBinary(const std::wstring& path,
                                BinaryValue** out_value) const;
   /*DEPRECATED*/bool GetDictionary(const std::wstring& path,
                                    DictionaryValue** out_value) const;
   /*DEPRECATED*/bool GetList(const std::wstring& path,
                              ListValue** out_value) const;
 
   // Like Get(), but without special treatment of '.'.  This allows e.g. URLs to
   // be used as paths.
   bool GetWithoutPathExpansion(const std::string& key,
                                Value** out_value) const;
   bool GetIntegerWithoutPathExpansion(const std::string& key,
                                       int* out_value) const;
   bool GetStringWithoutPathExpansion(const std::string& key,
                                      std::string* out_value) const;
-  bool GetStringAsUTF16WithoutPathExpansion(const std::string& key,
-                                            string16* out_value) const;
+  bool GetStringWithoutPathExpansion(const std::string& key,
+                                     string16* out_value) const;
   bool GetDictionaryWithoutPathExpansion(const std::string& key,
                                          DictionaryValue** out_value) const;
   bool GetListWithoutPathExpansion(const std::string& key,
                                    ListValue** out_value) const;
   /*DEPRECATED*/bool GetWithoutPathExpansion(const std::wstring& key,
                                              Value** out_value) const;
   /*DEPRECATED*/bool GetIntegerWithoutPathExpansion(const std::wstring& key,
                                                     int* out_value) const;
   /*DEPRECATED*/bool GetStringWithoutPathExpansion(
                     const std::wstring& key, std::string* out_value) const;
   /*DEPRECATED*/bool GetStringWithoutPathExpansion(
                     const std::wstring& key, std::wstring* out_value) const;
-  /*DEPRECATED*/bool GetStringAsUTF16WithoutPathExpansion(
-                    const std::wstring& key, string16* out_value) const;
   /*DEPRECATED*/bool GetDictionaryWithoutPathExpansion(
                     const std::wstring& key, DictionaryValue** out_value) const;
   /*DEPRECATED*/bool GetListWithoutPathExpansion(const std::wstring& key,
                                                  ListValue** out_value) const;
 
   // Removes the Value with the specified path from this dictionary (or one
   // of its child dictionaries, if the path is more than just a local key).
   // If |out_value| is non-NULL, the removed Value AND ITS OWNERSHIP will be
   // passed out via out_value.  If |out_value| is NULL, the removed value will
   // be deleted.  This method returns true if |path| is a valid path; otherwise
@@ skipping 100 matching lines @@
   // Note that the list always owns the Value passed out via |out_value|.
   bool Get(size_t index, Value** out_value) const;
 
   // Convenience forms of Get().  Modifies |out_value| (and returns true)
   // only if the index is valid and the Value at that index can be returned
   // in the specified form.
   bool GetBoolean(size_t index, bool* out_value) const;
   bool GetInteger(size_t index, int* out_value) const;
   bool GetReal(size_t index, double* out_value) const;
   bool GetString(size_t index, std::string* out_value) const;
-  bool GetString(size_t index, std::wstring* out_value) const;
-  bool GetStringAsUTF16(size_t index, string16* out_value) const;
+  bool GetString(size_t index, string16* out_value) const;
+#if !defined(WCHAR_T_IS_UTF16)
+  /*DEPRECATED*/bool GetString(size_t index, std::wstring* out_value) const;
+#endif
   bool GetBinary(size_t index, BinaryValue** out_value) const;
   bool GetDictionary(size_t index, DictionaryValue** out_value) const;
   bool GetList(size_t index, ListValue** out_value) const;
 
   // Removes the Value with the specified index from this list.
   // If |out_value| is non-NULL, the removed Value AND ITS OWNERSHIP will be
   // passed out via |out_value|.  If |out_value| is NULL, the removed value will
   // be deleted.  This method returns true if |index| is valid; otherwise
   // it will return false and the ListValue object will be unchanged.
   bool Remove(size_t index, Value** out_value);
@@ skipping 40 matching lines @@
   // This method deserializes the subclass-specific format into a Value object.
   // If the return value is non-NULL, the caller takes ownership of returned
   // Value. If the return value is NULL, and if error_code is non-NULL,
   // error_code will be set with the underlying error.
   // If |error_message| is non-null, it will be filled in with a formatted
   // error message including the location of the error if appropriate.
   virtual Value* Deserialize(int* error_code, std::string* error_str) = 0;
 };
 
 #endif  // BASE_VALUES_H_