Small clean up of GDataWapiUrlGenerator.

chrome/browser/google_apis/gdata_wapi_url_generator_unittest.cc

 // Copyright (c) 2012 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/gdata_wapi_url_generator.h"
 
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace google_apis {
@@ skipping 18 matching lines @@
   EXPECT_EQ("http://www.example.com/?convert=false&v=3&alt=json&showroot=true",
             GDataWapiUrlGenerator::AddInitiateUploadUrlParams(
                 GURL("http://www.example.com")).spec());
 }
 
 TEST_F(GDataWapiUrlGeneratorTest, AddFeedUrlParams) {
   EXPECT_EQ(
       "http://www.example.com/?v=3&alt=json&showroot=true&"
       "showfolders=true"
       "&include-shared=true"
-      "&max-results=100"
-      "&include-installed-apps=true",
+      "&max-results=100",
       GDataWapiUrlGenerator::AddFeedUrlParams(GURL("http://www.example.com"),
                                               100,  // num_items_to_fetch
                                               0,    // changestamp
                                               std::string()  // search_string
                                               ).spec());
   EXPECT_EQ(
       "http://www.example.com/?v=3&alt=json&showroot=true&"
       "showfolders=true"
       "&include-shared=true"
       "&max-results=100"
-      "&include-installed-apps=true"
       "&start-index=123",
       GDataWapiUrlGenerator::AddFeedUrlParams(GURL("http://www.example.com"),
                                               100,  // num_items_to_fetch
                                               123,  // changestamp
                                               std::string()  // search_string
                                               ).spec());
   EXPECT_EQ("http://www.example.com/?v=3&alt=json&showroot=true&"
             "showfolders=true"
             "&include-shared=true"
             "&max-results=100"
-            "&include-installed-apps=true"
             "&start-index=123"
             "&q=%22foo+bar%22",
             GDataWapiUrlGenerator::AddFeedUrlParams(
                 GURL("http://www.example.com"),
                 100,  // num_items_to_fetch
                 123,  // changestamp
                 "\"foo bar\""  // search_string
                                                  ).spec());
 }
 
 TEST_F(GDataWapiUrlGeneratorTest, GenerateResourceListUrl) {
   // This is the very basic URL for the GetResourceList operation.
   EXPECT_EQ("https://docs.google.com/feeds/default/private/full"
             "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true"
-            "&max-results=500&include-installed-apps=true",
+            "&max-results=500",
             url_generator_.GenerateResourceListUrl(
                 GURL(),         // override_url,
                 0,              // start_changestamp,
                 std::string(),  // search_string,
                 std::string()   // directory resource ID
                 ).spec());
 
   // With an override URL provided, the base URL is changed, but the default
   // parameters remain as-is.
   EXPECT_EQ("http://localhost/"
             "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true"
-            "&max-results=500&include-installed-apps=true",
+            "&max-results=500",
             url_generator_.GenerateResourceListUrl(
                 GURL("http://localhost/"),  // override_url,
                 0,                          // start_changestamp,
                 std::string(),              // search_string,
                 std::string()               // directory resource ID
                 ).spec());
 
   // With a non-zero start_changestamp provided, the base URL is changed from
   // "full" to "changes", and "start-index" parameter is added.
   EXPECT_EQ("https://docs.google.com/feeds/default/private/changes"
             "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true"
-            "&max-results=500&include-installed-apps=true"
-            "&start-index=100",
+            "&max-results=500&start-index=100",
             url_generator_.GenerateResourceListUrl(
                 GURL(),         // override_url,
                 100,            // start_changestamp,
                 std::string(),  // search_string,
                 std::string()   // directory resource ID
                 ).spec());
 
   // With a non-empty search string provided, "max-results" value is changed,
   // and "q" parameter is added.
   EXPECT_EQ("https://docs.google.com/feeds/default/private/full"
             "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true"
-            "&max-results=50&include-installed-apps=true&q=foo",
+            "&max-results=50&q=foo",
             url_generator_.GenerateResourceListUrl(
                 GURL(),        // override_url,
                 0,             // start_changestamp,
                 "foo",         // search_string,
                 std::string()  // directory resource ID
                 ).spec());
 
   // With a non-empty directory resource ID provided, the base URL is
   // changed, but the default parameters remain.
   EXPECT_EQ(
       "https://docs.google.com/feeds/default/private/full/XXX/contents"
       "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true"
-      "&max-results=500&include-installed-apps=true",
+      "&max-results=500",
       url_generator_.GenerateResourceListUrl(GURL(),  // override_url,
                                              0,       // start_changestamp,
                                              std::string(),  // search_string,
                                              "XXX"  // directory resource ID
                                              ).spec());
 
   // With a non-empty override_url provided, the base URL is changed, but
   // the default parameters remain. Note that start-index should not be
   // overridden.
   EXPECT_EQ("http://example.com/"
             "?start-index=123&v=3&alt=json&showroot=true&showfolders=true"
-            "&include-shared=true&max-results=500&include-installed-apps=true",
+            "&include-shared=true&max-results=500",
             url_generator_.GenerateResourceListUrl(
                 GURL("http://example.com/?start-index=123"),  // override_url,
                 100,            // start_changestamp,
                 std::string(),  // search_string,
                 "XXX"           // directory resource ID
                 ).spec());
 }
 
 TEST_F(GDataWapiUrlGeneratorTest, GenerateEditUrl) {
   EXPECT_EQ(
@@ skipping 53 matching lines @@
       url_generator_.GenerateAccountMetadataUrl(true).spec());
 
   // Exclude installed apps.
   EXPECT_EQ(
       "https://docs.google.com/feeds/metadata/default?v=3&alt=json"
       "&showroot=true",
       url_generator_.GenerateAccountMetadataUrl(false).spec());
 }
 
 }  // namespace google_apis