diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/components/ntp_tiles | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
| download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/ntp_tiles')
| -rw-r--r-- | chromium/components/ntp_tiles/icon_cacher_impl.cc | 8 | ||||
| -rw-r--r-- | chromium/components/ntp_tiles/icon_cacher_impl_unittest.cc | 6 | ||||
| -rw-r--r-- | chromium/components/ntp_tiles/popular_sites_impl.cc | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/chromium/components/ntp_tiles/icon_cacher_impl.cc b/chromium/components/ntp_tiles/icon_cacher_impl.cc index ad8cfdd9300..2b5853e9995 100644 --- a/chromium/components/ntp_tiles/icon_cacher_impl.cc +++ b/chromium/components/ntp_tiles/icon_cacher_impl.cc @@ -8,6 +8,7 @@ #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" +#include "components/favicon/core/favicon_server_fetcher_params.h" #include "components/favicon/core/favicon_service.h" #include "components/favicon/core/favicon_util.h" #include "components/favicon/core/large_icon_service.h" @@ -264,9 +265,10 @@ void IconCacherImpl::OnGetLargeIconOrFallbackStyleFinished( })"); large_icon_service_ ->GetLargeIconOrFallbackStyleFromGoogleServerSkippingLocalCache( - page_url, - GetMinimumFetchingSizeForChromeSuggestionsFaviconsFromServer(), - GetDesiredFetchingSizeForChromeSuggestionsFaviconsFromServer(), + favicon::FaviconServerFetcherParams::CreateForMobile( + page_url, + GetMinimumFetchingSizeForChromeSuggestionsFaviconsFromServer(), + GetDesiredFetchingSizeForChromeSuggestionsFaviconsFromServer()), /*may_page_url_be_private=*/true, traffic_annotation, base::Bind(&IconCacherImpl::OnMostLikelyFaviconDownloaded, weak_ptr_factory_.GetWeakPtr(), page_url)); diff --git a/chromium/components/ntp_tiles/icon_cacher_impl_unittest.cc b/chromium/components/ntp_tiles/icon_cacher_impl_unittest.cc index 7e79179659e..3722b859a91 100644 --- a/chromium/components/ntp_tiles/icon_cacher_impl_unittest.cc +++ b/chromium/components/ntp_tiles/icon_cacher_impl_unittest.cc @@ -197,13 +197,13 @@ class IconCacherTestPopularSites : public IconCacherTestBase { } base::FilePath pak_path; #if defined(OS_ANDROID) - PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path); + base::PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path); #else - PathService::Get(base::DIR_MODULE, &pak_path); + base::PathService::Get(base::DIR_MODULE, &pak_path); #endif base::FilePath ui_test_pak_path; - ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); + ASSERT_TRUE(base::PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( diff --git a/chromium/components/ntp_tiles/popular_sites_impl.cc b/chromium/components/ntp_tiles/popular_sites_impl.cc index b0fb9273834..4282e128d9b 100644 --- a/chromium/components/ntp_tiles/popular_sites_impl.cc +++ b/chromium/components/ntp_tiles/popular_sites_impl.cc @@ -33,6 +33,8 @@ #include "net/base/load_flags.h" #include "net/http/http_status_code.h" #include "net/traffic_annotation/network_traffic_annotation.h" +#include "net/url_request/url_fetcher.h" +#include "net/url_request/url_request_status.h" #if defined(OS_ANDROID) || defined(OS_IOS) #include "base/json/json_reader.h" |