Refactor GetAboutRequest and GetApplistRequest.

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"
 
 namespace google_apis {
 
 class DriveApiUrlGeneratorTest : public testing::Test {
  public:
   DriveApiUrlGeneratorTest()
       : url_generator_(
             GURL(DriveApiUrlGenerator::kBaseUrlForProduction),
             GURL(DriveApiUrlGenerator::kBaseDownloadUrlForProduction)),
         test_url_generator_(
             test_util::GetBaseUrlForTesting(12345),
             test_util::GetBaseUrlForTesting(12345).Resolve("download/")) {
   }
 
  protected:
   DriveApiUrlGenerator url_generator_;
   DriveApiUrlGenerator test_url_generator_;
 };
 
 // Make sure the hard-coded urls are returned.
-TEST_F(DriveApiUrlGeneratorTest, GetAboutUrl) {
+TEST_F(DriveApiUrlGeneratorTest, GetAboutGetUrl) {
   EXPECT_EQ("https://www.googleapis.com/drive/v2/about",
-            url_generator_.GetAboutUrl().spec());
+            url_generator_.GetAboutGetUrl().spec());
   EXPECT_EQ("http://127.0.0.1:12345/drive/v2/about",
-            test_url_generator_.GetAboutUrl().spec());
+            test_url_generator_.GetAboutGetUrl().spec());
 }
 
-TEST_F(DriveApiUrlGeneratorTest, GetApplistUrl) {
+TEST_F(DriveApiUrlGeneratorTest, GetAppsListUrl) {
   EXPECT_EQ("https://www.googleapis.com/drive/v2/apps",
-            url_generator_.GetApplistUrl().spec());
+            url_generator_.GetAppsListUrl().spec());
   EXPECT_EQ("http://127.0.0.1:12345/drive/v2/apps",
-            test_url_generator_.GetApplistUrl().spec());
+            test_url_generator_.GetAppsListUrl().spec());
 }
 
 TEST_F(DriveApiUrlGeneratorTest, GetChangelistUrl) {
   // Do not add startChangeId parameter if |start_changestamp| is 0.
   EXPECT_EQ("https://www.googleapis.com/drive/v2/changes?maxResults=500",
             url_generator_.GetChangelistUrl(true, 0, 500).spec());
   EXPECT_EQ("http://127.0.0.1:12345/drive/v2/changes?maxResults=500",
             test_url_generator_.GetChangelistUrl(true, 0, 500).spec());
 
   // Set includeDeleted parameter if |include_deleted| is set to false.
@@ skipping 214 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