Refactor TrashResourceRequest.

chrome/browser/google_apis/drive_api_url_generator_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 "chrome/browser/google_apis/drive_api_url_generator.h"
 
 #include "chrome/browser/google_apis/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ skipping 168 matching lines @@
 
     EXPECT_EQ(
         "http://127.0.0.1:12345/drive/v2/files" +
             kTestPatterns[i].expected_query,
         test_url_generator_.GetFilesListUrl(
             kTestPatterns[i].max_results, kTestPatterns[i].page_token,
             kTestPatterns[i].q).spec());
   }
 }
 
+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"
             "?setModifiedDate=true&updateViewedDate=false",
             url_generator_.GetFileTouchUrl("0ADK06pfg").spec());
   EXPECT_EQ("https://www.googleapis.com/drive/v2/files/0Bz0bd074"
             "?setModifiedDate=true&updateViewedDate=false",
             url_generator_.GetFileTouchUrl("0Bz0bd074").spec());
   EXPECT_EQ("https://www.googleapis.com/drive/v2/files/file%3Afile_id"
             "?setModifiedDate=true&updateViewedDate=false",
@@ skipping 122 matching lines @@
       "http://127.0.0.1:12345/drive/v2/files/0Bz0bd074/children/0ADK06pfg",
       test_url_generator_.GetChildrenUrlForRemoval(
           "0Bz0bd074", "0ADK06pfg").spec());
   EXPECT_EQ(
       "http://127.0.0.1:12345/drive/v2/files/file%3Afolder_id/children/"
       "file%3Achild_id",
       test_url_generator_.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",
       url_generator_.GetInitiateUploadNewFileUrl().spec());
 
   EXPECT_EQ(
       "http://127.0.0.1:12345/upload/drive/v2/files?uploadType=resumable",
       test_url_generator_.GetInitiateUploadNewFileUrl().spec());
 }
 
@@ skipping 35 matching lines @@
       url_generator_.GenerateDownloadFileUrl("resourceId").spec());
   EXPECT_EQ(
       "https://www.googledrive.com/host/file%3AresourceId",
       url_generator_.GenerateDownloadFileUrl("file:resourceId").spec());
   EXPECT_EQ(
       "http://127.0.0.1:12345/download/resourceId",
       test_url_generator_.GenerateDownloadFileUrl("resourceId").spec());
 }
 
 }  // namespace google_apis