[LargeIconService] Adding URL fallback for the server

This CL fixes the fallback_opts parameter for favicon server once again
(after CL 2790113002).

BUG=644102

Review-Url: https://codereview.chromium.org/2804293003
Cr-Commit-Position: refs/heads/master@{#462905}

components/favicon/core/large_icon_service.cc

@@ -32,7 +32,7 @@ namespace {
 const char kGoogleServerV2RequestFormat[] =
     "https://t0.gstatic.com/faviconV2?"
     "client=chrome&drop_404_icon=true&size=%d&min_size=%d&max_size=%d&"
-    "fallback_opts=TYPE,SIZE&url=%s";
+    "fallback_opts=TYPE,SIZE,URL&url=%s";
 const int kGoogleServerV2MaxSizeInPixel = 128;
 const int kGoogleServerV2DesiredSizeInPixel = 64;
 

components/favicon/core/large_icon_service_unittest.cc

@@ -131,7 +131,7 @@ class LargeIconServiceTest : public testing::Test {
 TEST_F(LargeIconServiceTest, ShouldGetFromGoogleServer) {
   const GURL kExpectedServerUrl(
       "https://t0.gstatic.com/faviconV2?client=chrome&drop_404_icon=true"
-      "&size=64&min_size=42&max_size=128&fallback_opts=TYPE,SIZE"
+      "&size=64&min_size=42&max_size=128&fallback_opts=TYPE,SIZE,URL"
       "&url=http://www.example.com/");
 
   EXPECT_CALL(mock_favicon_service_, UnableToDownloadFavicon(_)).Times(0);
@@ -158,7 +158,7 @@ TEST_F(LargeIconServiceTest, ShouldTrimQueryParametersForGoogleServer) {
   const GURL kDummyUrlWithQuery("http://www.example.com?foo=1");
   const GURL kExpectedServerUrl(
       "https://t0.gstatic.com/faviconV2?client=chrome&drop_404_icon=true"
-      "&size=64&min_size=42&max_size=128&fallback_opts=TYPE,SIZE"
+      "&size=64&min_size=42&max_size=128&fallback_opts=TYPE,SIZE,URL"
       "&url=http://www.example.com/");
 
   EXPECT_CALL(*mock_image_fetcher_,
@@ -197,7 +197,7 @@ TEST_F(LargeIconServiceTest, ShouldReportUnavailableIfFetchFromServerFails) {
   const GURL kDummyUrlWithQuery("http://www.example.com?foo=1");
   const GURL kExpectedServerUrl(
       "https://t0.gstatic.com/faviconV2?client=chrome&drop_404_icon=true"
-      "&size=64&min_size=42&max_size=128&fallback_opts=TYPE,SIZE"
+      "&size=64&min_size=42&max_size=128&fallback_opts=TYPE,SIZE,URL"
       "&url=http://www.example.com/");
 
   EXPECT_CALL(mock_favicon_service_, SetLastResortFavicons(_, _, _, _, _))
@@ -223,7 +223,7 @@ TEST_F(LargeIconServiceTest, ShoutNotGetFromGoogleServerIfUnavailable) {
       mock_favicon_service_,
       WasUnableToDownloadFavicon(GURL(
           "https://t0.gstatic.com/faviconV2?client=chrome&drop_404_icon=true"
-          "&size=64&min_size=42&max_size=128&fallback_opts=TYPE,SIZE"
+          "&size=64&min_size=42&max_size=128&fallback_opts=TYPE,SIZE,URL"
           "&url=http://www.example.com/")))
       .WillByDefault(Return(true));