Refactor TrashResourceRequest.

chrome/browser/google_apis/drive_api_url_generator_unittest.cc

Index: chrome/browser/google_apis/drive_api_url_generator_unittest.cc
diff --git a/chrome/browser/google_apis/drive_api_url_generator_unittest.cc b/chrome/browser/google_apis/drive_api_url_generator_unittest.cc
index 52da47a968ce0ec01caff91c9a59271a359c6deb..e87710366c0dd3fe0fd3ae7ecf105dc766acc6ec 100644
--- a/chrome/browser/google_apis/drive_api_url_generator_unittest.cc
+++ b/chrome/browser/google_apis/drive_api_url_generator_unittest.cc
@@ -186,6 +186,23 @@ TEST_F(DriveApiUrlGeneratorTest, GetFilesListUrl) {
   }
 }
 
+TEST_F(DriveApiUrlGeneratorTest, GetFilesTrashUrl) {
+  // |file_id| should be embedded into the url.
+  EXPECT_EQ("https://www.googleapis.com/drive/v2/files/0ADK06pfg/trash",
+            url_generator_.GetFilesTrashUrl("0ADK06pfg").spec());
+  EXPECT_EQ("https://www.googleapis.com/drive/v2/files/0Bz0bd074/trash",
+            url_generator_.GetFilesTrashUrl("0Bz0bd074").spec());
+  EXPECT_EQ("https://www.googleapis.com/drive/v2/files/file%3Afile_id/trash",
+            url_generator_.GetFilesTrashUrl("file:file_id").spec());
+
+  EXPECT_EQ("http://127.0.0.1:12345/drive/v2/files/0ADK06pfg/trash",
+            test_url_generator_.GetFilesTrashUrl("0ADK06pfg").spec());
+  EXPECT_EQ("http://127.0.0.1:12345/drive/v2/files/0Bz0bd074/trash",
+            test_url_generator_.GetFilesTrashUrl("0Bz0bd074").spec());
+  EXPECT_EQ("http://127.0.0.1:12345/drive/v2/files/file%3Afile_id/trash",
+            test_url_generator_.GetFilesTrashUrl("file:file_id").spec());
+}
+
 TEST_F(DriveApiUrlGeneratorTest, GetFileTouchUrl) {
   // |file_id| should be embedded into the url.
   EXPECT_EQ("https://www.googleapis.com/drive/v2/files/0ADK06pfg"
@@ -328,23 +345,6 @@ TEST_F(DriveApiUrlGeneratorTest, GetChildrenUrlForRemoval) {
           "file:folder_id", "file:child_id").spec());
 }
 
-TEST_F(DriveApiUrlGeneratorTest, GetFileTrashUrl) {
-  // |file_id| should be embedded into the url.
-  EXPECT_EQ("https://www.googleapis.com/drive/v2/files/0ADK06pfg/trash",
-            url_generator_.GetFileTrashUrl("0ADK06pfg").spec());
-  EXPECT_EQ("https://www.googleapis.com/drive/v2/files/0Bz0bd074/trash",
-            url_generator_.GetFileTrashUrl("0Bz0bd074").spec());
-  EXPECT_EQ("https://www.googleapis.com/drive/v2/files/file%3Afile_id/trash",
-            url_generator_.GetFileTrashUrl("file:file_id").spec());
-
-  EXPECT_EQ("http://127.0.0.1:12345/drive/v2/files/0ADK06pfg/trash",
-            test_url_generator_.GetFileTrashUrl("0ADK06pfg").spec());
-  EXPECT_EQ("http://127.0.0.1:12345/drive/v2/files/0Bz0bd074/trash",
-            test_url_generator_.GetFileTrashUrl("0Bz0bd074").spec());
-  EXPECT_EQ("http://127.0.0.1:12345/drive/v2/files/file%3Afile_id/trash",
-            test_url_generator_.GetFileTrashUrl("file:file_id").spec());
-}
-
 TEST_F(DriveApiUrlGeneratorTest, GetInitiateUploadNewFileUrl) {
   EXPECT_EQ(
       "https://www.googleapis.com/upload/drive/v2/files?uploadType=resumable",