Split ValueSerializer into separate Serializer and Deserializer classes.

google_apis/drive/test_util.cc

 // Copyright (c) 2012 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 "google_apis/drive/test_util.h"
 
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 63 matching lines @@
   }
 
   *data = base::RandBytesAsString(size);
   return WriteStringToFile(*path, *data);
 }
 
 scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_path) {
   base::FilePath path = GetTestFilePath(relative_path);
 
   std::string error;
-  JSONFileValueSerializer serializer(path);
-  scoped_ptr<base::Value> value(serializer.Deserialize(NULL, &error));
+  JSONFileValueDeserializer deserializer(path);
+  scoped_ptr<base::Value> value(deserializer.Deserialize(NULL, &error));
   LOG_IF(WARNING, !value.get()) << "Failed to parse " << path.value()
                                 << ": " << error;
   return value.Pass();
 }
 
 // Returns a HttpResponse created from the given file path.
 scoped_ptr<net::test_server::BasicHttpResponse> CreateHttpResponseFromFile(
     const base::FilePath& file_path) {
   std::string content;
   if (!base::ReadFileToString(file_path, &content))
@@ skipping 76 matching lines @@
   return result;
 }
 
 void TestGetContentCallback::OnGetContent(google_apis::DriveApiErrorCode error,
                                           scoped_ptr<std::string> data) {
   data_.push_back(data.release());
 }
 
 }  // namespace test_util
 }  // namespace google_apis