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 97f90337b30681b674fa76256f30ef348ef66a9a..db0455d6fee56f856d965e30e71b3e1da99b2a2f 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,15 +181,19 @@ |
SupervisedUserAsyncURLChecker::SupervisedUserAsyncURLChecker( |
URLRequestContextGetter* context, |
- const std::string& cx) |
+ const std::string& cx, |
+ const std::string& api_key) |
: 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() {} |
@@ -233,16 +237,19 @@ |
} |
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( |
new Check(url, fetcher_safe.Pass(), fetcher_unsafe.Pass(), callback)); |
return false; |
+} |
+ |
+void SupervisedUserAsyncURLChecker::SetApiKey(const std::string& api_key) { |
+ api_key_ = api_key.empty() ? google_apis::GetAPIKey() : api_key; |
} |
void SupervisedUserAsyncURLChecker::OnURLFetchComplete( |