google_apis: Rename OperationRunner to RequestSender

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/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/drive_api_operations.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/drive_api_url_generator.h"
-#include "chrome/browser/google_apis/operation_runner.h"
+#include "chrome/browser/google_apis/request_sender.h"
 #include "chrome/browser/google_apis/task_util.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.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"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 18 matching lines @@
 
 }  // 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),
         test_server_(content::BrowserThread::GetMessageLoopProxyForThread(
-                         content::BrowserThread::IO)) {
+            content::BrowserThread::IO)) {
   }
 
   virtual void SetUp() OVERRIDE {
     file_thread_.Start();
     io_thread_.StartIOThread();
     profile_.reset(new TestingProfile);
 
     request_context_getter_ = new net::TestURLRequestContextGetter(
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::IO));
 
-    operation_runner_.reset(new OperationRunner(profile_.get(),
-                                                request_context_getter_.get(),
-                                                std::vector<std::string>(),
-                                                kTestUserAgent));
+    operation_runner_.reset(new RequestSender(profile_.get(),
+                                              request_context_getter_.get(),
+                                              std::vector<std::string>(),
+                                              kTestUserAgent));
     operation_runner_->auth_service()->set_access_token_for_testing(
         kTestDriveApiAuthToken);
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
     test_server_.RegisterRequestHandler(
         base::Bind(&DriveApiOperationsTest::HandleChildrenDeleteRequest,
                    base::Unretained(this)));
     test_server_.RegisterRequestHandler(
@@ skipping 23 matching lines @@
     request_context_getter_ = NULL;
     ResetExpectedResponse();
   }
 
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
   net::test_server::EmbeddedTestServer test_server_;
   scoped_ptr<TestingProfile> profile_;
-  scoped_ptr<OperationRunner> operation_runner_;
+  scoped_ptr<RequestSender> operation_runner_;
   scoped_ptr<DriveApiUrlGenerator> url_generator_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   base::ScopedTempDir temp_dir_;
 
   // This is a path to the file which contains expected response from
   // the server. See also HandleDataFileRequest below.
   base::FilePath expected_data_file_path_;
 
   // This is a path string in the expected response header from the server
   // for initiating file uploading.
@@ skipping 200 matching lines @@
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<AboutResource> about_resource;
 
   GetAboutOperation* operation = new GetAboutOperation(
       operation_runner_.get(),
       request_context_getter_.get(),
       *url_generator_,
       CreateComposedCallback(
           base::Bind(&test_util::RunAndQuit),
           test_util::CreateCopyResultCallback(&error, &about_resource)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/about", http_request_.relative_url);
 
   scoped_ptr<AboutResource> expected(
       AboutResource::CreateFrom(
           *test_util::LoadJSONFile("chromeos/drive/about.json")));
   ASSERT_TRUE(about_resource.get());
@@ skipping 11 matching lines @@
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<AboutResource> about_resource;
 
   GetAboutOperation* operation = new GetAboutOperation(
       operation_runner_.get(),
       request_context_getter_.get(),
       *url_generator_,
       CreateComposedCallback(
           base::Bind(&test_util::RunAndQuit),
           test_util::CreateCopyResultCallback(&error, &about_resource)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   // "parse error" should be returned, and the about resource should be NULL.
   EXPECT_EQ(GDATA_PARSE_ERROR, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/about", http_request_.relative_url);
   EXPECT_FALSE(about_resource.get());
 }
 
 TEST_F(DriveApiOperationsTest, GetApplistOperation) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "chromeos/drive/applist.json");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<base::Value> result;
 
   GetApplistOperation* operation = new GetApplistOperation(
       operation_runner_.get(),
       request_context_getter_.get(),
       *url_generator_,
       CreateComposedCallback(
           base::Bind(&test_util::RunAndQuit),
           test_util::CreateCopyResultCallback(&error, &result)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/apps", http_request_.relative_url);
   EXPECT_TRUE(result);
 }
 
 TEST_F(DriveApiOperationsTest, GetChangelistOperation) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "chromeos/drive/changelist.json");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<base::Value> result;
 
   GetChangelistOperation* operation = new GetChangelistOperation(
       operation_runner_.get(),
       request_context_getter_.get(),
       *url_generator_,
       true,  // include deleted
       100,  // start changestamp
       500,  // max results
       CreateComposedCallback(
           base::Bind(&test_util::RunAndQuit),
           test_util::CreateCopyResultCallback(&error, &result)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/changes?startChangeId=100&maxResults=500",
             http_request_.relative_url);
   EXPECT_TRUE(result);
 }
 
 TEST_F(DriveApiOperationsTest, GetFilelistOperation) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "chromeos/drive/filelist.json");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<base::Value> result;
 
   GetFilelistOperation* operation = new GetFilelistOperation(
       operation_runner_.get(),
       request_context_getter_.get(),
       *url_generator_,
       "\"abcde\" in parents",
       50,  // max results
       CreateComposedCallback(
           base::Bind(&test_util::RunAndQuit),
           test_util::CreateCopyResultCallback(&error, &result)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/files?maxResults=50&q=%22abcde%22+in+parents",
             http_request_.relative_url);
   EXPECT_TRUE(result);
 }
 
 TEST_F(DriveApiOperationsTest, ContinueGetFileListOperation) {
   // Set an expected data file containing valid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
       "chromeos/drive/filelist.json");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<base::Value> result;
 
   drive::ContinueGetFileListOperation* operation =
       new drive::ContinueGetFileListOperation(
           operation_runner_.get(),
           request_context_getter_.get(),
           test_server_.GetURL("/continue/get/file/list"),
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &result)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/continue/get/file/list", http_request_.relative_url);
   EXPECT_TRUE(result);
 }
 
 TEST_F(DriveApiOperationsTest, CreateDirectoryOperation) {
   // Set an expected data file containing the directory's entry data.
   expected_data_file_path_ =
       test_util::GetTestFilePath("chromeos/drive/directory_entry.json");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<FileResource> file_resource;
 
   // Create "new directory" in the root directory.
   drive::CreateDirectoryOperation* operation =
       new drive::CreateDirectoryOperation(
           operation_runner_.get(),
           request_context_getter_.get(),
           *url_generator_,
           "root",
           "new directory",
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &file_resource)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::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);
 
   scoped_ptr<FileResource> expected(
@@ skipping 21 matching lines @@
   drive::RenameResourceOperation* operation =
       new drive::RenameResourceOperation(
           operation_runner_.get(),
           request_context_getter_.get(),
           *url_generator_,
           "resource_id",
           "new name",
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_PATCH, http_request_.method);
   EXPECT_EQ("/drive/v2/files/resource_id", http_request_.relative_url);
   EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
 
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_EQ("{\"title\":\"new name\"}", http_request_.content);
 }
@@ skipping 14 matching lines @@
   drive::TouchResourceOperation* operation = new drive::TouchResourceOperation(
       operation_runner_.get(),
       request_context_getter_.get(),
       *url_generator_,
       "resource_id",
       base::Time::FromUTCExploded(kModifiedDate),
       base::Time::FromUTCExploded(kLastViewedByMeDate),
       CreateComposedCallback(
           base::Bind(&test_util::RunAndQuit),
           test_util::CreateCopyResultCallback(&error, &file_resource)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_PATCH, http_request_.method);
   EXPECT_EQ("/drive/v2/files/resource_id"
             "?setModifiedDate=true&updateViewedDate=false",
             http_request_.relative_url);
   EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
 
   EXPECT_TRUE(http_request_.has_content);
@@ skipping 16 matching lines @@
       new drive::CopyResourceOperation(
           operation_runner_.get(),
           request_context_getter_.get(),
           *url_generator_,
           "resource_id",
           "parent_resource_id",
           "new name",
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &file_resource)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
   EXPECT_EQ("/drive/v2/files/resource_id/copy", 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\"}],\"title\":\"new name\"}",
@@ skipping 15 matching lines @@
       new drive::CopyResourceOperation(
           operation_runner_.get(),
           request_context_getter_.get(),
           *url_generator_,
           "resource_id",
           std::string(),  // parent resource id.
           "new name",
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error, &file_resource)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
   EXPECT_EQ("/drive/v2/files/resource_id/copy", http_request_.relative_url);
   EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
 
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_EQ("{\"title\":\"new name\"}", http_request_.content);
   EXPECT_TRUE(file_resource);
@@ skipping 10 matching lines @@
   // Trash a resource with the given resource id.
   drive::TrashResourceOperation* operation =
       new drive::TrashResourceOperation(
           operation_runner_.get(),
           request_context_getter_.get(),
           *url_generator_,
           "resource_id",
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
   EXPECT_EQ("/drive/v2/files/resource_id/trash", http_request_.relative_url);
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_TRUE(http_request_.content.empty());
 }
 
 TEST_F(DriveApiOperationsTest, InsertResourceOperation) {
   // Set an expected data file containing the children entry.
   expected_content_type_ = "application/json";
   expected_content_ = kTestChildrenResponse;
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
 
   // Add a resource with "resource_id" to a directory with
   // "parent_resource_id".
   drive::InsertResourceOperation* operation =
       new drive::InsertResourceOperation(
           operation_runner_.get(),
           request_context_getter_.get(),
           *url_generator_,
           "parent_resource_id",
           "resource_id",
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
   EXPECT_EQ("/drive/v2/files/parent_resource_id/children",
             http_request_.relative_url);
   EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
 
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_EQ("{\"id\":\"resource_id\"}", http_request_.content);
 }
 
 TEST_F(DriveApiOperationsTest, DeleteResourceOperation) {
   GDataErrorCode error = GDATA_OTHER_ERROR;
 
   // Remove a resource with "resource_id" from a directory with
   // "parent_resource_id".
   drive::DeleteResourceOperation* operation =
       new drive::DeleteResourceOperation(
           operation_runner_.get(),
           request_context_getter_.get(),
           *url_generator_,
           "parent_resource_id",
           "resource_id",
           CreateComposedCallback(
               base::Bind(&test_util::RunAndQuit),
               test_util::CreateCopyResultCallback(&error)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_NO_CONTENT, error);
   EXPECT_EQ(net::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);
 }
 
 TEST_F(DriveApiOperationsTest, UploadNewFileOperation) {
@@ skipping 17 matching lines @@
           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)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   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\""
+            "\"id\":\"parent_resource_id\","
+            "\"kind\":\"drive#fileLink\""
             "}],"
             "\"title\":\"new file title\"}",
             http_request_.content);
 
   // Upload the content to the upload URL.
   UploadRangeResponse response;
   scoped_ptr<FileResource> new_entry;
 
   drive::ResumeUploadOperation* resume_operation =
       new drive::ResumeUploadOperation(
           operation_runner_.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());
-  operation_runner_->StartOperationWithRetry(resume_operation);
+  operation_runner_->StartRequestWithRetry(resume_operation);
   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 0-" +
             base::Int64ToString(kTestContent.size() - 1) + "/" +
             base::Int64ToString(kTestContent.size()),
@@ skipping 29 matching lines @@
           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)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   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("0", 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\""
+            "\"id\":\"parent_resource_id\","
+            "\"kind\":\"drive#fileLink\""
             "}],"
             "\"title\":\"new file title\"}",
             http_request_.content);
 
   // Upload the content to the upload URL.
   UploadRangeResponse response;
   scoped_ptr<FileResource> new_entry;
 
   drive::ResumeUploadOperation* resume_operation =
       new drive::ResumeUploadOperation(
           operation_runner_.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());
-  operation_runner_->StartOperationWithRetry(resume_operation);
+  operation_runner_->StartRequestWithRetry(resume_operation);
   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 NOT be added.
   EXPECT_EQ(0U, http_request_.headers.count("Content-Range"));
   // The upload content should be set in the HTTP request.
   EXPECT_TRUE(http_request_.has_content);
@@ skipping 30 matching lines @@
           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)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   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\""
+            "\"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 GetUploadStatusOperation.
   {
     UploadRangeResponse response;
     scoped_ptr<FileResource> new_entry;
 
     // Check the response by GetUploadStatusOperation.
     drive::GetUploadStatusOperation* get_upload_status_operation =
         new drive::GetUploadStatusOperation(
             operation_runner_.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)));
-    operation_runner_->StartOperationWithRetry(get_upload_status_operation);
+    operation_runner_->StartRequestWithRetry(get_upload_status_operation);
     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);
@@ skipping 25 matching lines @@
             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());
-    operation_runner_->StartOperationWithRetry(resume_operation);
+    operation_runner_->StartRequestWithRetry(resume_operation);
     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(start_position) + "-" +
               base::Int64ToString(end_position - 1) + "/" +
@@ skipping 23 matching lines @@
     drive::GetUploadStatusOperation* get_upload_status_operation =
         new drive::GetUploadStatusOperation(
             operation_runner_.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)));
-    operation_runner_->StartOperationWithRetry(get_upload_status_operation);
+    operation_runner_->StartRequestWithRetry(get_upload_status_operation);
     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);
@@ skipping 28 matching lines @@
           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)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(kTestUploadExistingFilePath, 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("*", http_request_.headers["If-Match"]);
 
   EXPECT_EQ(net::test_server::METHOD_PUT, http_request_.method);
@@ skipping 14 matching lines @@
           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());
-  operation_runner_->StartOperationWithRetry(resume_operation);
+  operation_runner_->StartRequestWithRetry(resume_operation);
   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 0-" +
             base::Int64ToString(kTestContent.size() - 1) + "/" +
             base::Int64ToString(kTestContent.size()),
@@ skipping 29 matching lines @@
           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)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(kTestUploadExistingFilePath, 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(kTestETag, http_request_.headers["If-Match"]);
 
   EXPECT_EQ(net::test_server::METHOD_PUT, http_request_.method);
@@ skipping 14 matching lines @@
           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());
-  operation_runner_->StartOperationWithRetry(resume_operation);
+  operation_runner_->StartRequestWithRetry(resume_operation);
   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 0-" +
             base::Int64ToString(kTestContent.size() - 1) + "/" +
             base::Int64ToString(kTestContent.size()),
@@ skipping 26 matching lines @@
           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)));
-  operation_runner_->StartOperationWithRetry(operation);
+  operation_runner_->StartRequestWithRetry(operation);
   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