| Index: chrome/browser/safe_search_api/safe_search_url_checker.cc
|
| diff --git a/chrome/browser/safe_search_api/safe_search_url_checker.cc b/chrome/browser/safe_search_api/safe_search_url_checker.cc
|
| index 16dda018fcc8324bbc82d50720c0f966a51d859b..8dadfe95cb91aa148458b5cf2e7def0c635580eb 100644
|
| --- a/chrome/browser/safe_search_api/safe_search_url_checker.cc
|
| +++ b/chrome/browser/safe_search_api/safe_search_url_checker.cc
|
| @@ -45,12 +45,14 @@ std::string BuildRequestData(const std::string& api_key, const GURL& url) {
|
| }
|
|
|
| // Creates a URLFetcher to call the SafeSearch API for |url|.
|
| -std::unique_ptr<net::URLFetcher> CreateFetcher(URLFetcherDelegate* delegate,
|
| - URLRequestContextGetter* context,
|
| - const std::string& api_key,
|
| - const GURL& url) {
|
| - std::unique_ptr<net::URLFetcher> fetcher =
|
| - URLFetcher::Create(0, GURL(kApiUrl), URLFetcher::POST, delegate);
|
| +std::unique_ptr<net::URLFetcher> CreateFetcher(
|
| + URLFetcherDelegate* delegate,
|
| + URLRequestContextGetter* context,
|
| + const std::string& api_key,
|
| + const GURL& url,
|
| + const net::NetworkTrafficAnnotationTag& traffic_annotation) {
|
| + std::unique_ptr<net::URLFetcher> fetcher = URLFetcher::Create(
|
| + 0, GURL(kApiUrl), URLFetcher::POST, delegate, traffic_annotation);
|
| fetcher->SetUploadData(kDataContentType, BuildRequestData(api_key, url));
|
| fetcher->SetRequestContext(context);
|
| fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
|
| @@ -115,12 +117,17 @@ SafeSearchURLChecker::CheckResult::CheckResult(Classification classification,
|
| uncertain(uncertain),
|
| timestamp(base::TimeTicks::Now()) {}
|
|
|
| -SafeSearchURLChecker::SafeSearchURLChecker(URLRequestContextGetter* context)
|
| - : SafeSearchURLChecker(context, kDefaultCacheSize) {}
|
| +SafeSearchURLChecker::SafeSearchURLChecker(
|
| + URLRequestContextGetter* context,
|
| + const net::NetworkTrafficAnnotationTag& traffic_annotation)
|
| + : SafeSearchURLChecker(context, traffic_annotation, kDefaultCacheSize) {}
|
|
|
| -SafeSearchURLChecker::SafeSearchURLChecker(URLRequestContextGetter* context,
|
| - size_t cache_size)
|
| +SafeSearchURLChecker::SafeSearchURLChecker(
|
| + URLRequestContextGetter* context,
|
| + const net::NetworkTrafficAnnotationTag& traffic_annotation,
|
| + size_t cache_size)
|
| : context_(context),
|
| + traffic_annotation_(traffic_annotation),
|
| cache_(cache_size),
|
| cache_timeout_(
|
| base::TimeDelta::FromSeconds(kDefaultCacheTimeoutSeconds)) {}
|
| @@ -171,7 +178,7 @@ bool SafeSearchURLChecker::CheckURL(const GURL& url,
|
| DVLOG(1) << "Checking URL " << url;
|
| std::string api_key = google_apis::GetAPIKey();
|
| std::unique_ptr<URLFetcher> fetcher(
|
| - CreateFetcher(this, context_, api_key, url));
|
| + CreateFetcher(this, context_, api_key, url, traffic_annotation_));
|
| fetcher->Start();
|
| checks_in_progress_.push_back(new Check(url, std::move(fetcher), callback));
|
| return false;
|
|
|