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

chrome/browser/supervised_user/supervised_user_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 73 matching lines @@
     // Returns the path to a blacklist file to load, or an empty path to
     // indicate "none".
     virtual base::FilePath GetBlacklistPath() const;
     // Returns the URL from which to download a blacklist if no local one exists
     // yet. The blacklist file will be stored at |GetBlacklistPath()|.
     virtual GURL GetBlacklistURL() const;
     // Returns the identifier ("cx") of the Custom Search Engine to use for the
     // experimental "SafeSites" feature, or the empty string to disable the
     // feature.
     virtual std::string GetSafeSitesCx() const;
-    // Returns a custom Google API key to use for SafeSites, or the empty string
-    // to use the default one.
+    // TODO(treib): Unused, remove this!
     virtual std::string GetSafeSitesApiKey() const;

[Marc Treib, 2014/11/13 17:45:40]

I'll remove this after removing the downstream implementations, so I don't break
the build.

   };
 
   ~SupervisedUserService() override;
 
   // ProfileKeyedService override:
   void Shutdown() override;
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   void SetDelegate(Delegate* delegate);
@@ skipping 116 matching lines @@
     SupervisedUserURLFilter* io_url_filter() const;
 
     void SetDefaultFilteringBehavior(
         SupervisedUserURLFilter::FilteringBehavior behavior);
     void LoadWhitelists(ScopedVector<SupervisedUserSiteList> site_lists);
     void LoadBlacklist(const base::FilePath& path);
     void SetManualHosts(scoped_ptr<std::map<std::string, bool> > host_map);
     void SetManualURLs(scoped_ptr<std::map<GURL, bool> > url_map);
 
     void InitAsyncURLChecker(net::URLRequestContextGetter* context,
-                             const std::string& cx,
-                             const std::string& api_key);
+                             const std::string& cx);
 
    private:
     void OnBlacklistLoaded();
 
     // SupervisedUserURLFilter is refcounted because the IO thread filter is
     // used both by ProfileImplIOData and OffTheRecordProfileIOData (to filter
     // network requests), so they both keep a reference to it.
     // Clients should not keep references to the UI thread filter, however
     // (the filter will live as long as the profile lives, and afterwards it
     // should not be used anymore either).
@@ skipping 129 matching lines @@
 
   // Used to create permission requests.
   ScopedVector<PermissionRequestCreator> permissions_creators_;
 
   ObserverList<SupervisedUserServiceObserver> observer_list_;
 
   base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
 };
 
 #endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_