Carl
c8e8919714
* Updated patches for v79 Remaining issue: * blank tabs when running on x86 emulators Waiting on upstream to fix that. The other upstream storage bug (https://bugs.chromium.org/p/chromium/issues/detail?id=1033655) is fixed in this version.
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From: Joachim Bauch <jojo@struktur.de>
|
|
Date: Mon, 1 Jun 2015 17:14:34 +0200
|
|
Subject: google-cloud-messaging: disable experiment status check
|
|
|
|
This avoids trk:263 from triggering.
|
|
---
|
|
components/gcm_driver/gcm_channel_status_request.cc | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc
|
|
--- a/components/gcm_driver/gcm_channel_status_request.cc
|
|
+++ b/components/gcm_driver/gcm_channel_status_request.cc
|
|
@@ -23,8 +23,10 @@ namespace gcm {
|
|
|
|
namespace {
|
|
|
|
+#if 0
|
|
const char kRequestContentType[] = "application/octet-stream";
|
|
const char kGCMChannelTag[] = "gcm_channel";
|
|
+#endif
|
|
const int kDefaultPollIntervalSeconds = 60 * 60; // 60 minutes.
|
|
const int kMinPollIntervalSeconds = 30 * 60; // 30 minutes.
|
|
|
|
@@ -56,6 +58,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() {
|
|
|
|
void GCMChannelStatusRequest::Start() {
|
|
// url_loader_factory_ can be null for tests.
|
|
+#if 0
|
|
if (!url_loader_factory_)
|
|
return;
|
|
|
|
@@ -110,6 +113,9 @@ void GCMChannelStatusRequest::Start() {
|
|
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
|
|
resource_request->method = "POST";
|
|
resource_request->headers.SetHeader(net::HttpRequestHeaders::kUserAgent,
|
|
+#endif
|
|
+ // Simulate an empty response and disable GCM.
|
|
+ callback_.Run(false, false, 0);
|
|
user_agent_);
|
|
simple_url_loader_ = network::SimpleURLLoader::Create(
|
|
std::move(resource_request), traffic_annotation);
|
|
--
|
|
2.17.1
|
|
|