Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Unified Diff: chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc

Issue 690423003: Supervised user SafeSites: Expose & use API key from src-internal (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc
diff --git a/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc b/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc
index db0455d6fee56f856d965e30e71b3e1da99b2a2f..97f90337b30681b674fa76256f30ef348ef66a9a 100644
--- a/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc
+++ b/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc
@@ -181,19 +181,15 @@ SupervisedUserAsyncURLChecker::CheckResult::CheckResult(
SupervisedUserAsyncURLChecker::SupervisedUserAsyncURLChecker(
URLRequestContextGetter* context,
- const std::string& cx,
- const std::string& api_key)
+ const std::string& cx)
: context_(context), cx_(cx), cache_(kDefaultCacheSize) {
- SetApiKey(api_key);
}
SupervisedUserAsyncURLChecker::SupervisedUserAsyncURLChecker(
URLRequestContextGetter* context,
const std::string& cx,
- const std::string& api_key,
size_t cache_size)
: context_(context), cx_(cx), cache_(cache_size) {
- SetApiKey(api_key);
}
SupervisedUserAsyncURLChecker::~SupervisedUserAsyncURLChecker() {}
@@ -237,10 +233,11 @@ bool SupervisedUserAsyncURLChecker::CheckURL(const GURL& url,
}
DVLOG(1) << "Checking URL " << url;
+ std::string api_key = google_apis::GetSafeSitesAPIKey();
scoped_ptr<URLFetcher> fetcher_safe(
- CreateFetcher(this, context_, cx_, api_key_, url, true));
+ CreateFetcher(this, context_, cx_, api_key, url, true));
scoped_ptr<URLFetcher> fetcher_unsafe(
- CreateFetcher(this, context_, cx_, api_key_, url, false));
+ CreateFetcher(this, context_, cx_, api_key, url, false));
fetcher_safe->Start();
fetcher_unsafe->Start();
checks_in_progress_.push_back(
@@ -248,10 +245,6 @@ bool SupervisedUserAsyncURLChecker::CheckURL(const GURL& url,
return false;
}
-void SupervisedUserAsyncURLChecker::SetApiKey(const std::string& api_key) {
- api_key_ = api_key.empty() ? google_apis::GetAPIKey() : api_key;
-}
-
void SupervisedUserAsyncURLChecker::OnURLFetchComplete(
const net::URLFetcher* source) {
ScopedVector<Check>::iterator it = checks_in_progress_.begin();

Powered by Google App Engine
This is Rietveld 408576698