Supervised user SafeSites: Expose & use API key from src-internal

chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/json/json_reader.h"
@@ skipping 163 matching lines @@
 
 SupervisedUserAsyncURLChecker::Check::~Check() {}
 
 SupervisedUserAsyncURLChecker::CheckResult::CheckResult(
     SupervisedUserURLFilter::FilteringBehavior behavior, bool uncertain)
   : behavior(behavior), uncertain(uncertain) {
 }
 
 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() {}
 
 bool SupervisedUserAsyncURLChecker::CheckURL(const GURL& url,
                                              const CheckCallback& callback) {
   // TODO(treib): Hack: For now, allow all Google URLs to save search QPS. If we
   // ever remove this, we should find a way to allow at least the NTP.
   if (google_util::IsGoogleDomainUrl(url,
                                      google_util::ALLOW_SUBDOMAIN,
@@ skipping 23 matching lines @@
   // See if we already have a check in progress for this URL.
   for (Check* check : checks_in_progress_) {
     if (check->url == url) {
       DVLOG(1) << "Adding to pending check for " << url.spec();
       check->callbacks.push_back(callback);
       return false;
     }
   }
 
   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(
     const net::URLFetcher* source) {
   ScopedVector<Check>::iterator it = checks_in_progress_.begin();
   bool is_safe_search_request = false;
   while (it != checks_in_progress_.end()) {
     if (source == (*it)->fetcher_safe.get()) {
       is_safe_search_request = true;
       (*it)->safe_done = true;
       break;
     } else if (source == (*it)->fetcher_unsafe.get()) {
@@ skipping 58 matching lines @@
 
   UMA_HISTOGRAM_TIMES("ManagedUsers.SafeSitesDelay",
                       base::Time::Now() - check->start_time);
 
   cache_.Put(check->url, CheckResult(behavior, uncertain));
 
   for (size_t i = 0; i < check->callbacks.size(); i++)
     check->callbacks[i].Run(check->url, behavior, uncertain);
   checks_in_progress_.erase(it);
 }