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

chrome/browser/supervised_user/supervised_user_service.h

Index: chrome/browser/supervised_user/supervised_user_service.h
diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h
index 0a8571c7b5be145826802e8cf3ee1cb9cda86361..e7ef2abbebddcbbc7028bb734cd5f681cd84e95e 100644
--- a/chrome/browser/supervised_user/supervised_user_service.h
+++ b/chrome/browser/supervised_user/supervised_user_service.h
@@ -91,8 +91,7 @@ class SupervisedUserService : public KeyedService,
     // experimental "SafeSites" feature, or the empty string to disable the
     // feature.
     virtual std::string GetSafeSitesCx() const;

[Bernhard Bauer, 2014/11/13 18:01:49]

Are we keeping the CX in the delegate?

[Marc Treib, 2014/11/13 18:04:15]

That was the plan, yes. We could also move it directly into the AsyncChecker,
but then we'd need a new "bool EnableSafeSites()" in the delegate.

[Bernhard Bauer, 2014/11/14 09:04:58]

I would have put it together with the secret, just like we do for the OAuth
client ID and secret. (And yes, then also added a flag in the delegate, because
that's really what the delegate does: it configures the SUService).

-    // 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;
   };
 
@@ -230,8 +229,7 @@ class SupervisedUserService : public KeyedService,
     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();