Move the responsibility to convert from JSON to FileResource into drive_api_operations.

chrome/browser/google_apis/drive_api_operations_unittest.cc

 // Copyright (c) 2013 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 "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/message_loop_proxy.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/drive_api_operations.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
@@ skipping 25 matching lines @@
 void CopyResultsFromGetAboutResourceCallbackAndQuit(
     GDataErrorCode* error_out,
     scoped_ptr<AboutResource>* about_resource_out,
     const GDataErrorCode error_in,
     scoped_ptr<AboutResource> about_resource_in) {
   *error_out = error_in;
   *about_resource_out = about_resource_in.Pass();
   MessageLoop::current()->Quit();
 }
 
+void CopyResultsFromFileResourceCallbackAndQuit(
+    GDataErrorCode* error_out,
+    scoped_ptr<FileResource>* file_resource_out,
+    const GDataErrorCode error_in,
+    scoped_ptr<FileResource> file_resource_in) {
+  *error_out = error_in;
+  *file_resource_out = file_resource_in.Pass();
+  MessageLoop::current()->Quit();
+}
+
 }  // namespace
 
 class DriveApiOperationsTest : public testing::Test {
  public:
   DriveApiOperationsTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         file_thread_(content::BrowserThread::FILE),
         io_thread_(content::BrowserThread::IO) {
   }
 
@@ skipping 166 matching lines @@
   EXPECT_EQ("/drive/v2/about", http_request_.relative_url);
   EXPECT_FALSE(feed_data.get());
 }
 
 TEST_F(DriveApiOperationsTest, CreateDirectoryOperation) {
   // Set an expected data file containing the directory's entry data.
   expected_data_file_path_ =
       test_util::GetTestFilePath("drive/directory_entry.json");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
-  scoped_ptr<base::Value> feed_data;
+  scoped_ptr<FileResource> feed_data;
 
   // Create "new directory" in the root directory.
   drive::CreateDirectoryOperation* operation =
       new drive::CreateDirectoryOperation(
           &operation_registry_,
           request_context_getter_.get(),
           *url_generator_,
           "root",
           "new directory",
-          base::Bind(&test_util::CopyResultsFromGetDataCallbackAndQuit,
+          base::Bind(&CopyResultsFromFileResourceCallbackAndQuit,
                      &error, &feed_data));
   operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
                    base::Bind(&test_util::DoNothingForReAuthenticateCallback));
   MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(test_server::METHOD_POST, http_request_.method);
   EXPECT_EQ("/drive/v2/files", http_request_.relative_url);
   EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
 
   EXPECT_TRUE(http_request_.has_content);
 
-  EXPECT_EQ("{\"mimeType\":\"application/vnd.google-apps.folder\","
-            "\"parents\":[{\"id\":\"root\"}],"
-            "\"title\":\"new directory\"}",
-            http_request_.content);
+  scoped_ptr<FileResource> expected(
+      FileResource::CreateFrom(
+          *test_util::LoadJSONFile("drive/directory_entry.json")));
+
+  // Sanity check.
+  ASSERT_TRUE(feed_data.get());
+
+  EXPECT_EQ(expected->file_id(), feed_data->file_id());
+  EXPECT_EQ(expected->title(), feed_data->title());
+  EXPECT_EQ(expected->mime_type(), feed_data->mime_type());
+  EXPECT_EQ(expected->parents().size(), feed_data->parents().size());
 }
 
 TEST_F(DriveApiOperationsTest, RenameResourceOperation) {
   // Set an expected data file containing the directory's entry data.
   // It'd be returned if we rename a directory.
   expected_data_file_path_ =
       test_util::GetTestFilePath("drive/directory_entry.json");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
 
@@ skipping 99 matching lines @@
   MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_NO_CONTENT, error);
   EXPECT_EQ(test_server::METHOD_DELETE, http_request_.method);
   EXPECT_EQ("/drive/v2/files/parent_resource_id/children/resource_id",
             http_request_.relative_url);
   EXPECT_FALSE(http_request_.has_content);
 }
 
 }  // namespace google_apis