Revert 288017 "Parse Drive API responses all at once in the bloc..."

trunk/src/google_apis/drive/gdata_wapi_requests_unittest.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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/values.h"
 #include "google_apis/drive/dummy_auth_service.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
 #include "google_apis/drive/gdata_wapi_requests.h"
 #include "google_apis/drive/gdata_wapi_url_generator.h"
 #include "google_apis/drive/request_sender.h"
 #include "google_apis/drive/test_util.h"
 #include "net/base/escape.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
@@ skipping 73 matching lines @@
   // The incoming HTTP request is saved so tests can verify the request
   // parameters like HTTP method (ex. some requests should use DELETE
   // instead of GET).
   net::test_server::HttpRequest http_request_;
 };
 
 }  // namespace
 
 TEST_F(GDataWapiRequestsTest, GetResourceEntryRequest_ValidResourceId) {
   GDataErrorCode result_code = GDATA_OTHER_ERROR;
-  scoped_ptr<ResourceEntry> result_data;
+  scoped_ptr<base::Value> result_data;
 
   {
     base::RunLoop run_loop;
     GetResourceEntryRequest* request = new GetResourceEntryRequest(
         request_sender_.get(),
         *url_generator_,
         "file:2_file_resource_id",  // resource ID
         GURL(),  // embed origin
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&result_code, &result_data)));
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_SUCCESS, result_code);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/feeds/default/private/full/file%3A2_file_resource_id"
             "?v=3&alt=json&showroot=true",
             http_request_.relative_url);
+  scoped_ptr<base::Value> expected_json =
+      test_util::LoadJSONFile("gdata/file_entry.json");
+  ASSERT_TRUE(expected_json);
   EXPECT_TRUE(result_data);
-  EXPECT_EQ("File 1.mp3", result_data->filename());
-  EXPECT_EQ("3b4382ebefec6e743578c76bbd0575ce", result_data->file_md5());
+  EXPECT_TRUE(base::Value::Equals(expected_json.get(), result_data.get()));
 }
 
 TEST_F(GDataWapiRequestsTest, GetResourceEntryRequest_InvalidResourceId) {
   GDataErrorCode result_code = GDATA_OTHER_ERROR;
-  scoped_ptr<ResourceEntry> result_data;
+  scoped_ptr<base::Value> result_data;
 
   {
     base::RunLoop run_loop;
     GetResourceEntryRequest* request = new GetResourceEntryRequest(
         request_sender_.get(),
         *url_generator_,
         "<invalid>",  // resource ID
         GURL(),  // embed origin
         test_util::CreateQuitCallback(
             &run_loop,
             test_util::CreateCopyResultCallback(&result_code, &result_data)));
     request_sender_->StartRequestWithRetry(request);
     run_loop.Run();
   }
 
   EXPECT_EQ(HTTP_NOT_FOUND, result_code);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/feeds/default/private/full/%3Cinvalid%3E?v=3&alt=json"
             "&showroot=true",
             http_request_.relative_url);
   ASSERT_FALSE(result_data);
 }
 
 }  // namespace google_apis