Change JSONFileValueSerializer to use FilePath by default.

chrome/common/json_value_serializer.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_COMMON_JSON_VALUE_SERIALIZER_H__
 #define CHROME_COMMON_JSON_VALUE_SERIALIZER_H__
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
 #include "base/values.h"
 
 class JSONStringValueSerializer : public ValueSerializer {
  public:
   // json_string is the string that will be source of the deserialization
   // or the destination of the serialization.  The caller of the constructor
   // retains ownership of the string.
   JSONStringValueSerializer(std::string* json_string)
       : json_string_(json_string),
         initialized_with_const_string_(false),
@@ skipping 38 matching lines @@
 
   DISALLOW_EVIL_CONSTRUCTORS(JSONStringValueSerializer);
 };
 
 class JSONFileValueSerializer : public ValueSerializer {
  public:
   // json_file_patch is the path of a file that will be source of the
   // deserialization or the destination of the serialization.
   // When deserializing, the file should exist, but when serializing, the
   // serializer will attempt to create the file at the specified location.
+  JSONFileValueSerializer(const FilePath& json_file_path)
+    : json_file_path_(json_file_path) {}
+  // DEPRECATED - DO NOT USE
+  // TODO(port): remove references to this
   JSONFileValueSerializer(const std::wstring& json_file_path)
-    : json_file_path_(json_file_path) {}
+    : json_file_path_(FilePath::FromWStringHack(json_file_path)) {}
 
   ~JSONFileValueSerializer() {}
 
   // DO NOT USE except in unit tests to verify the file was written properly.
   // We should never serialize directly to a file since this will block the
   // thread. Instead, serialize to a string and write to the file you want on
   // the file thread.
   //
   // Attempt to serialize the data structure represented by Value into
   // JSON.  If the return value is true, the result will have been written
   // into the file whose name was passed into the constructor.
   bool Serialize(const Value& root);
 
   // Attempt to deserialize the data structure encoded in the file passed
   // in to the constructor into a structure of Value objects.  If the return
   // value is NULL, and if |error_message| is non-null, |error_message| will
   // contain a string describing the error. The caller takes ownership of the
   // returned value.
   Value* Deserialize(std::string* error_message);
 
  private:
-  std::wstring json_file_path_;
+  FilePath json_file_path_;

[Matt Perry, 2009/03/06 19:40:10]

there doesn't need to be a corresponding .cc change for this?

[Erik does not do reviews, 2009/03/06 19:42:14]

believe it or not, no.  The reason is that all of the file_util methods that
operate on paths all take FilePath objects.  If they take wstring, it's as a
decprecated method that just converts to FilePath.

 
   DISALLOW_EVIL_CONSTRUCTORS(JSONFileValueSerializer);
 };
 
 #endif  // CHROME_COMMON_JSON_VALUE_SERIALIZER_H__