Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2680)

Unified Diff: components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc

Issue 635013003: Expose data reduction proxy auth token for internal builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gypi target. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc
index fc4819629c4e9a94a1132f99bc50ca1e6fe282e5..b19ae00198c42674b246cb292915d91c7598a786 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc
+++ b/components/data_reduction_proxy/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;
}

Powered by Google App Engine
This is Rietveld 408576698