Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.cc |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.cc |
index 12929ad8ac0a419693c92c74492db3ed87e16ec3..f130f9f8ded7d39488d12bb064b0aa708f3aa671 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.cc |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.cc |
@@ -23,6 +23,10 @@ |
#include "net/url_request/url_request.h" |
#include "url/gurl.h" |
+#if !defined(OS_ANDROID) && !defined(OS_IOS) |
+#include "google_apis/google_api_keys.h" |
+#endif |
+ |
namespace data_reduction_proxy { |
// The empty version for the authentication protocol. Currently used by |
@@ -213,10 +217,18 @@ std::string DataReductionProxyAuthRequestHandler::GetDefaultKey() const { |
const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
std::string key = |
command_line.GetSwitchValueASCII(switches::kDataReductionProxyKey); |
+// Android and iOS get the default key from a preprocessor constant. All other |
+// platforms get the key from google_apis |
+#if defined(OS_ANDROID) || defined(OS_IOS) |
#if defined(SPDY_PROXY_AUTH_VALUE) |
if (key.empty()) |
key = SPDY_PROXY_AUTH_VALUE; |
#endif |
+#else |
+ if (key.empty()) { |
+ key = google_apis::GetSpdyProxyAuthValue(); |
+ } |
+#endif // defined(OS_ANDROID) || defined(OS_IOS) |
return key; |
} |