Get rid of RequestRegistry (part 3): remove Drive path from request objects.

chrome/browser/google_apis/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/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 740 matching lines @@
   GDataErrorCode error = GDATA_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with
   // "parent_resource_id".
   drive::InitiateUploadNewFileRequest* request =
       new drive::InitiateUploadNewFileRequest(
           request_sender_.get(),
           request_context_getter_.get(),
           *url_generator_,
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           kTestContentType,
           kTestContent.size(),
           "parent_resource_id",  // The resource id of the parent directory.
           "new file title",  // The title of the file being uploaded.
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &upload_url)));
   request_sender_->StartRequestWithRetry(request);
   base::MessageLoop::current()->Run();
 
@@ skipping 16 matching lines @@
             http_request_.content);
 
   // Upload the content to the upload URL.
   UploadRangeResponse response;
   scoped_ptr<FileResource> new_entry;
 
   drive::ResumeUploadRequest* resume_request =
       new drive::ResumeUploadRequest(
           request_sender_.get(),
           request_context_getter_.get(),
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           upload_url,
           0,  // start_position
           kTestContent.size(),  // end_position (exclusive)
           kTestContent.size(),  // content_length,
           kTestContentType,
           kTestFilePath,
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&response, &new_entry)),
           ProgressCallback());
@@ skipping 32 matching lines @@
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   drive::InitiateUploadNewFileRequest* request =
       new drive::InitiateUploadNewFileRequest(
           request_sender_.get(),
           request_context_getter_.get(),
           *url_generator_,
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           kTestContentType,
           0,
           "parent_resource_id",  // The resource id of the parent directory.
           "new file title",  // The title of the file being uploaded.
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &upload_url)));
   request_sender_->StartRequestWithRetry(request);
   base::MessageLoop::current()->Run();
 
@@ skipping 15 matching lines @@
             http_request_.content);
 
   // Upload the content to the upload URL.
   UploadRangeResponse response;
   scoped_ptr<FileResource> new_entry;
 
   drive::ResumeUploadRequest* resume_request =
       new drive::ResumeUploadRequest(
           request_sender_.get(),
           request_context_getter_.get(),
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           upload_url,
           0,  // start_position
           0,  // end_position (exclusive)
           0,  // content_length,
           kTestContentType,
           kTestFilePath,
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&response, &new_entry)),
           ProgressCallback());
@@ skipping 10 matching lines @@
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_EQ(kTestContent, http_request_.content);
 
   // Check the response.
   EXPECT_EQ(HTTP_CREATED, response.code);  // Because it's a new file
   // The start and end positions should be set to -1, if an upload is complete.
   EXPECT_EQ(-1, response.start_position_received);
   EXPECT_EQ(-1, response.end_position_received);
 }
 
-// TODO(kinaba): crbug.com/{241241,164098} Re-enable the test.
-#define NO_GET_UPLOAD_STATUS_TEST
-
 TEST_F(DriveApiRequestsTest, UploadNewLargeFileRequest) {
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadNewFilePath;
 
   const char kTestContentType[] = "text/plain";
   const size_t kNumChunkBytes = 10;  // Num bytes in a chunk.
   const std::string kTestContent(100, 'a');
   const base::FilePath kTestFilePath =
       temp_dir_.path().AppendASCII("upload_file.txt");
   ASSERT_TRUE(test_util::WriteStringToFile(kTestFilePath, kTestContent));
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   drive::InitiateUploadNewFileRequest* request =
       new drive::InitiateUploadNewFileRequest(
           request_sender_.get(),
           request_context_getter_.get(),
           *url_generator_,
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           kTestContentType,
           kTestContent.size(),
           "parent_resource_id",  // The resource id of the parent directory.
           "new file title",  // The title of the file being uploaded.
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &upload_url)));
   request_sender_->StartRequestWithRetry(request);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(kTestUploadNewFilePath, upload_url.path());
   EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]);
   EXPECT_EQ(base::Int64ToString(kTestContent.size()),
             http_request_.headers["X-Upload-Content-Length"]);
 
   EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
   EXPECT_EQ("/upload/drive/v2/files?uploadType=resumable",
             http_request_.relative_url);
   EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_EQ("{\"parents\":[{"
             "\"id\":\"parent_resource_id\","
             "\"kind\":\"drive#fileLink\""
             "}],"
             "\"title\":\"new file title\"}",
             http_request_.content);
 
-#if !defined(NO_GET_UPLOAD_STATUS_TEST)
   // Before sending any data, check the current status.
   // This is an edge case test for GetUploadStatusRequest.
   {
     UploadRangeResponse response;
     scoped_ptr<FileResource> new_entry;
 
     // Check the response by GetUploadStatusRequest.
     drive::GetUploadStatusRequest* get_upload_status_request =
         new drive::GetUploadStatusRequest(
             request_sender_.get(),
             request_context_getter_.get(),
-            base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
             upload_url,
             kTestContent.size(),
             CreateComposedCallback(
                 base::Bind(&test_util::RunAndQuit),
                 test_util::CreateCopyResultCallback(&response, &new_entry)));
     request_sender_->StartRequestWithRetry(get_upload_status_request);
     base::MessageLoop::current()->Run();
 
     // METHOD_PUT should be used to upload data.
     EXPECT_EQ(net::test_server::METHOD_PUT, http_request_.method);
     // Request should go to the upload URL.
     EXPECT_EQ(upload_url.path(), http_request_.relative_url);
     // Content-Range header should be added.
     EXPECT_EQ("bytes */" + base::Int64ToString(kTestContent.size()),
               http_request_.headers["Content-Range"]);
     EXPECT_TRUE(http_request_.has_content);
     EXPECT_TRUE(http_request_.content.empty());
 
     // Check the response.
     EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code);
     EXPECT_EQ(0, response.start_position_received);
     EXPECT_EQ(0, response.end_position_received);
   }
-#endif  // NO_GET_UPLOAD_STATUS_TEST
 
   // Upload the content to the upload URL.
   for (size_t start_position = 0; start_position < kTestContent.size();
        start_position += kNumChunkBytes) {
     const std::string payload = kTestContent.substr(
         start_position,
         std::min(kNumChunkBytes, kTestContent.size() - start_position));
     const size_t end_position = start_position + payload.size();
 
     UploadRangeResponse response;
     scoped_ptr<FileResource> new_entry;
 
     drive::ResumeUploadRequest* resume_request =
         new drive::ResumeUploadRequest(
             request_sender_.get(),
             request_context_getter_.get(),
-            base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
             upload_url,
             start_position,
             end_position,
             kTestContent.size(),  // content_length,
             kTestContentType,
             kTestFilePath,
             CreateComposedCallback(
                 base::Bind(&test_util::RunAndQuit),
                 test_util::CreateCopyResultCallback(&response, &new_entry)),
             ProgressCallback());
@@ skipping 22 matching lines @@
       EXPECT_EQ(-1, response.start_position_received);
       EXPECT_EQ(-1, response.end_position_received);
       break;
     }
 
     // Check the response.
     EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code);
     EXPECT_EQ(0, response.start_position_received);
     EXPECT_EQ(static_cast<int64>(end_position), response.end_position_received);
 
-#if !defined(NO_GET_UPLOAD_STATUS_TEST)
     // Check the response by GetUploadStatusRequest.
     drive::GetUploadStatusRequest* get_upload_status_request =
         new drive::GetUploadStatusRequest(
             request_sender_.get(),
             request_context_getter_.get(),
-            base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
             upload_url,
             kTestContent.size(),
             CreateComposedCallback(
                 base::Bind(&test_util::RunAndQuit),
                 test_util::CreateCopyResultCallback(&response, &new_entry)));
     request_sender_->StartRequestWithRetry(get_upload_status_request);
     base::MessageLoop::current()->Run();
 
     // METHOD_PUT should be used to upload data.
     EXPECT_EQ(net::test_server::METHOD_PUT, http_request_.method);
     // Request should go to the upload URL.
     EXPECT_EQ(upload_url.path(), http_request_.relative_url);
     // Content-Range header should be added.
     EXPECT_EQ("bytes */" + base::Int64ToString(kTestContent.size()),
               http_request_.headers["Content-Range"]);
     EXPECT_TRUE(http_request_.has_content);
     EXPECT_TRUE(http_request_.content.empty());
 
     // Check the response.
     EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code);
     EXPECT_EQ(0, response.start_position_received);
     EXPECT_EQ(static_cast<int64>(end_position),
               response.end_position_received);
-#endif  // NO_GET_UPLOAD_STATUS_TEST
   }
 }
 
 TEST_F(DriveApiRequestsTest, UploadExistingFileRequest) {
   // Set an expected url for uploading.
   expected_upload_path_ = kTestUploadExistingFilePath;
 
   const char kTestContentType[] = "text/plain";
   const std::string kTestContent(100, 'a');
   const base::FilePath kTestFilePath =
       temp_dir_.path().AppendASCII("upload_file.txt");
   ASSERT_TRUE(test_util::WriteStringToFile(kTestFilePath, kTestContent));
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   drive::InitiateUploadExistingFileRequest* request =
       new drive::InitiateUploadExistingFileRequest(
           request_sender_.get(),
           request_context_getter_.get(),
           *url_generator_,
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           kTestContentType,
           kTestContent.size(),
           "resource_id",  // The resource id of the file to be overwritten.
           std::string(),  // No etag.
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &upload_url)));
   request_sender_->StartRequestWithRetry(request);
   base::MessageLoop::current()->Run();
 
@@ skipping 11 matching lines @@
   EXPECT_TRUE(http_request_.content.empty());
 
   // Upload the content to the upload URL.
   UploadRangeResponse response;
   scoped_ptr<FileResource> new_entry;
 
   drive::ResumeUploadRequest* resume_request =
       new drive::ResumeUploadRequest(
           request_sender_.get(),
           request_context_getter_.get(),
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           upload_url,
           0,  // start_position
           kTestContent.size(),  // end_position (exclusive)
           kTestContent.size(),  // content_length,
           kTestContentType,
           kTestFilePath,
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&response, &new_entry)),
           ProgressCallback());
@@ skipping 32 matching lines @@
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   drive::InitiateUploadExistingFileRequest* request =
       new drive::InitiateUploadExistingFileRequest(
           request_sender_.get(),
           request_context_getter_.get(),
           *url_generator_,
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           kTestContentType,
           kTestContent.size(),
           "resource_id",  // The resource id of the file to be overwritten.
           kTestETag,
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &upload_url)));
   request_sender_->StartRequestWithRetry(request);
   base::MessageLoop::current()->Run();
 
@@ skipping 11 matching lines @@
   EXPECT_TRUE(http_request_.content.empty());
 
   // Upload the content to the upload URL.
   UploadRangeResponse response;
   scoped_ptr<FileResource> new_entry;
 
   drive::ResumeUploadRequest* resume_request =
       new drive::ResumeUploadRequest(
           request_sender_.get(),
           request_context_getter_.get(),
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           upload_url,
           0,  // start_position
           kTestContent.size(),  // end_position (exclusive)
           kTestContent.size(),  // content_length,
           kTestContentType,
           kTestFilePath,
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&response, &new_entry)),
           ProgressCallback());
@@ skipping 29 matching lines @@
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   GURL upload_url;
 
   // Initiate uploading a new file to the directory with "parent_resource_id".
   drive::InitiateUploadExistingFileRequest* request =
       new drive::InitiateUploadExistingFileRequest(
           request_sender_.get(),
           request_context_getter_.get(),
           *url_generator_,
-          base::FilePath(FILE_PATH_LITERAL("drive/file/path")),
           kTestContentType,
           kTestContent.size(),
           "resource_id",  // The resource id of the file to be overwritten.
           "Conflicting-etag",
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &upload_url)));
   request_sender_->StartRequestWithRetry(request);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_PRECONDITION, error);
   EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]);
   EXPECT_EQ(base::Int64ToString(kTestContent.size()),
             http_request_.headers["X-Upload-Content-Length"]);
   EXPECT_EQ("Conflicting-etag", http_request_.headers["If-Match"]);
 
   EXPECT_EQ(net::test_server::METHOD_PUT, http_request_.method);
   EXPECT_EQ("/upload/drive/v2/files/resource_id?uploadType=resumable",
             http_request_.relative_url);
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_TRUE(http_request_.content.empty());
 }
 
 }  // namespace google_apis