[GCM] Add port 443 fallback logic and histograms

google_apis/gcm/gcm_client_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/gcm/gcm_client_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 49 matching lines @@
 };
 
 // Indicates a message type of the received message.
 enum MessageType {
   UNKNOWN,           // Undetermined type.
   DATA_MESSAGE,      // Regular data message.
   DELETED_MESSAGES,  // Messages were deleted on the server.
   SEND_ERROR,        // Error sending a message.
 };
 
-const char kMCSEndpoint[] = "https://mtalk.google.com:5228";
+// MCS endpoints. SSL Key pinning is done automatically due to the *.google.com
+// pinning rule.
+// Note: modifying the endpoints will affect the ability to compare the
+// GCM.CurrentEnpoint histogram across versions.
+const char kMCSEndpointMain[] = "https://bla.google.com:5228";

[fgorski, 2014/03/20 16:45:42]

bla.google.com?

[Nicolas Zea, 2014/03/20 20:10:02]

Whoops, good catch, that was from some manual testing. Done.

+const char kMCSEndpointFallback[] = "https://mtalk.google.com:443";
+
 const int kMaxRegistrationRetries = 5;
 const char kMessageTypeDataMessage[] = "gcm";
 const char kMessageTypeDeletedMessagesKey[] = "deleted_messages";
 const char kMessageTypeKey[] = "message_type";
 const char kMessageTypeSendErrorKey[] = "send_error";
 const char kSendErrorMessageIdKey[] = "google.message_id";
 const char kSendMessageFromValue[] = "gcm@chrome.com";
 const int64 kDefaultUserSerialNumber = 0LL;
 
 GCMClient::Result ToGCMClientResult(MCSClient::MessageSendStatus status) {
@@ skipping 98 matching lines @@
 void GCMClientImpl::InitializeMCSClient(
     scoped_ptr<GCMStore::LoadResult> result) {
   // |mcs_client_| might already be set for testing at this point. No need to
   // create a |connection_factory_|.
   if (!mcs_client_.get()) {
     const net::HttpNetworkSession::Params* network_session_params =
         url_request_context_getter_->GetURLRequestContext()->
             GetNetworkSessionParams();
     DCHECK(network_session_params);
     network_session_ = new net::HttpNetworkSession(*network_session_params);
+    std::vector<GURL> endpoints;
+    endpoints.push_back(GURL(kMCSEndpointMain));
+    endpoints.push_back(GURL(kMCSEndpointFallback));
     connection_factory_.reset(new ConnectionFactoryImpl(
-        GURL(kMCSEndpoint),
+        endpoints,
         kDefaultBackoffPolicy,
         network_session_,
         net_log_.net_log()));
     mcs_client_.reset(new MCSClient(chrome_build_proto_.chrome_version(),
                                     clock_.get(),
                                     connection_factory_.get(),
                                     gcm_store_.get()));
   }
 
   mcs_client_->Initialize(
@@ skipping 363 matching lines @@
 
   delegate_->OnMessageSendError(data_message_stanza.category(),
                                 send_error_details);
 }
 
 void GCMClientImpl::SetMCSClientForTesting(scoped_ptr<MCSClient> mcs_client) {
   mcs_client_ = mcs_client.Pass();
 }
 
 }  // namespace gcm