summaryrefslogtreecommitdiffstats
path: root/chrome/browser/safe_browsing/protocol_manager.cc
diff options
context:
space:
mode:
authorbryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 18:54:07 +0000
committerbryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 18:54:07 +0000
commitf49e1c41c3156a4258bffd161d57e790637cba58 (patch)
tree98f0df813a623831c642fc669e9b6054fd5ee0f7 /chrome/browser/safe_browsing/protocol_manager.cc
parentf1d491ef6f199a80f1e3396060196cac5496fd8f (diff)
downloadchromium_src-f49e1c41c3156a4258bffd161d57e790637cba58.zip
chromium_src-f49e1c41c3156a4258bffd161d57e790637cba58.tar.gz
chromium_src-f49e1c41c3156a4258bffd161d57e790637cba58.tar.bz2
Include an API key in SafeBrowsing requests.
Review URL: https://chromiumcodereview.appspot.com/10914274 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing/protocol_manager.cc')
-rw-r--r--chrome/browser/safe_browsing/protocol_manager.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index 3329d0b..913d772 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -20,6 +20,7 @@
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/env_vars.h"
#include "content/public/browser/browser_thread.h"
+#include "google_apis/google_api_keys.h"
#include "net/base/escape.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_fetcher.h"
@@ -649,6 +650,11 @@ std::string SafeBrowsingProtocolManager::ComposeUrl(
std::string url = base::StringPrintf("%s/%s?client=%s&appver=%s&pver=2.2",
prefix.c_str(), method.c_str(),
client_name.c_str(), version.c_str());
+ std::string api_key = google_apis::GetAPIKey();
+ if (!api_key.empty()) {
+ base::StringAppendF(&url, "&key=%s",
+ net::EscapeQueryParamValue(api_key, true).c_str());
+ }
if (!additional_query.empty()) {
DCHECK(url.find("?") != std::string::npos);
url.append("&");
@@ -712,6 +718,11 @@ GURL SafeBrowsingProtocolManager::MalwareDetailsUrl() const {
url_prefix_.c_str(),
client_name_.c_str(),
version_.c_str());
+ std::string api_key = google_apis::GetAPIKey();
+ if (!api_key.empty()) {
+ base::StringAppendF(&url, "&key=%s",
+ net::EscapeQueryParamValue(api_key, true).c_str());
+ }
return GURL(url);
}