Revert of Drive: Let DriveUploader use batch request API.

google_apis/drive/drive_api_requests_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/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 1997 matching lines @@
       "--OUTERBOUNDARY--",
       http_request_.content);
   EXPECT_EQ(HTTP_SUCCESS, errors[0]);
   ASSERT_TRUE(file_resources[0]);
   EXPECT_EQ("file_id_1", file_resources[0]->file_id());
   ASSERT_FALSE(file_resources[1]);
   EXPECT_EQ(DRIVE_PARSE_ERROR, errors[1]);
 }
 
 TEST_F(DriveApiRequestsTest, EmptyBatchUploadRequest) {
-  drive::BatchUploadRequest* const request =
-      new drive::BatchUploadRequest(request_sender_.get(), *url_generator_);
-  base::WeakPtr<drive::BatchUploadRequest> weak_ptr =
-      request->GetWeakPtrAsBatchUploadRequest();
-  request->Commit();
-  ASSERT_FALSE(weak_ptr.get());
+  scoped_ptr<drive::BatchUploadRequest> request(new drive::BatchUploadRequest(
+      request_sender_.get(), *url_generator_));
+  EXPECT_DEATH(request->Commit(), "");
 }
 
 TEST(ParseMultipartResponseTest, Empty) {
   std::vector<drive::MultipartHttpResponse> parts;
   EXPECT_FALSE(drive::ParseMultipartResponse(
       "multipart/mixed; boundary=BOUNDARY", "", &parts));
   EXPECT_FALSE(drive::ParseMultipartResponse("multipart/mixed; boundary=",
                                              "CONTENT", &parts));
 }
 
@@ skipping 90 matching lines @@
                                     "Header: value\r\n"
                                     "\r\n"
                                     "BODY\r\n"
                                     "--BOUNDARY-- \t",
                                     &parts));
   ASSERT_EQ(1u, parts.size());
   EXPECT_EQ(HTTP_SUCCESS, parts[0].code);
   EXPECT_EQ("BODY", parts[0].body);
 }
 }  // namespace google_apis