importer: use FilePath instead of wstring in some places

base/values.h

 // Copyright (c) 2009 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 196 matching lines @@
 class DictionaryValue : public Value {
  public:
   DictionaryValue() : Value(TYPE_DICTIONARY) {}
   ~DictionaryValue();
 
   // Subclassed methods
   Value* DeepCopy() const;
   virtual bool Equals(const Value* other) const;
 
   // Returns true if the current dictionary has a value for the given key.
+  bool HasKeyASCII(const std::string& key) const;
+  // Deprecated version of the above.  TODO: add a string16 version for Unicode.
+  // http://code.google.com/p/chromium/issues/detail?id=23581
   bool HasKey(const std::wstring& key) const;
 
   // Returns the number of Values in this dictionary.
   size_t size() const { return dictionary_.size(); }
 
   // Returns whether the dictionary is empty.
   bool empty() const { return dictionary_.empty(); }
 
   // Clears any current contents of this dictionary.
   void Clear();
@@ skipping 30 matching lines @@
   // Otherwise, it will return false and "value" will be untouched.
   // Note that the dictionary always owns the value that's returned.
   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::wstring& path, bool* out_value) const;
   bool GetInteger(const std::wstring& path, int* out_value) const;
   bool GetReal(const std::wstring& path, double* out_value) const;
+  bool GetString(const std::string& path, string16* out_value) const;
+  bool GetStringASCII(const std::string& path, std::string* out_value) const;
+  // TODO: deprecate wstring accessors.
+  // http://code.google.com/p/chromium/issues/detail?id=23581
   bool GetString(const std::wstring& path, std::string* out_value) const;
   bool GetString(const std::wstring& path, std::wstring* out_value) const;
   bool GetStringAsUTF16(const std::wstring& path, string16* out_value) const;
   bool GetBinary(const std::wstring& path, BinaryValue** out_value) const;
   bool GetDictionary(const std::wstring& path,
                      DictionaryValue** out_value) const;
   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.
@@ skipping 146 matching lines @@
   virtual bool Serialize(const Value& root) = 0;
 
   // 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_message is non-NULL,
   // error_message should be filled with a message describing the error.
   virtual Value* Deserialize(std::string* error_message) = 0;
 };
 
 #endif  // BASE_VALUES_H_