Small changes around GCMNetworkChannel

sync/notifier/gcm_network_channel.cc

 // Copyright 2014 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 "base/base64.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram.h"
 #include "base/sha1.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #if !defined(ANDROID)
 // channel_common.proto defines ANDROID constant that conflicts with Android
 // build. At the same time TiclInvalidationService is not used on Android so it
 // is safe to exclude these protos from Android build.
 #include "google/cacheinvalidation/android_channel.pb.h"
 #include "google/cacheinvalidation/channel_common.pb.h"
 #endif
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/http/http_status_code.h"
@@ skipping 30 matching lines @@
   1000 * 3600 * 4, // 4 hours.
 
   // Time to keep an entry from being discarded even when it
   // has no significant state, -1 to never discard.
   -1,
 
   // Don't use initial delay unless the last request was an error.
   false,
 };
 
-// Outgoing message status values for UMA_HISTOGRAM.
-enum OutgoingMessageStatus {
-  OUTGOING_MESSAGE_SUCCESS,
-  MESSAGE_DISCARDED,     // New message started before old one was sent.
-  ACCESS_TOKEN_FAILURE,  // Requeting access token failed.
-  POST_FAILURE,          // HTTP Post failed.
-
-  // This enum is used in UMA_HISTOGRAM_ENUMERATION. Insert new values above
-  // this line.
-  OUTGOING_MESSAGE_STATUS_COUNT
-};
-
 // Incoming message status values for UMA_HISTOGRAM.
 enum IncomingMessageStatus {
   INCOMING_MESSAGE_SUCCESS,
   MESSAGE_EMPTY,     // GCM message's content is missing or empty.
   INVALID_ENCODING,  // Base64Decode failed.
   INVALID_PROTO,     // Parsing protobuf failed.
 
   // This enum is used in UMA_HISTOGRAM_ENUMERATION. Insert new values above
   // this line.
   INCOMING_MESSAGE_STATUS_COUNT
 };
 
+// Outgoing message status values for UMA_HISTOGRAM.
+enum OutgoingMessageStatus {
+  OUTGOING_MESSAGE_SUCCESS,
+  MESSAGE_DISCARDED,     // New message started before old one was sent.
+  ACCESS_TOKEN_FAILURE,  // Requeting access token failed.
+  POST_FAILURE,          // HTTP Post failed.
+
+  // This enum is used in UMA_HISTOGRAM_ENUMERATION. Insert new values above
+  // this line.
+  OUTGOING_MESSAGE_STATUS_COUNT
+};
+
+const char kIncomingMessageStatusHistogram[] =
+    "GCMInvalidations.IncomingMessageStatus";
 const char kOutgoingMessageStatusHistogram[] =
     "GCMInvalidations.OutgoingMessageStatus";
-const char kIncomingMessageStatusHistogram[] =
-    "GCMInvalidations.IncomingMessageStatus";
+
+void RecordIncomingMessageStatus(IncomingMessageStatus status) {
+  UMA_HISTOGRAM_ENUMERATION(kIncomingMessageStatusHistogram,
+                            status,
+                            INCOMING_MESSAGE_STATUS_COUNT);
+}
+
+void RecordOutgoingMessageStatus(OutgoingMessageStatus status) {
+  UMA_HISTOGRAM_ENUMERATION(kOutgoingMessageStatusHistogram,
+                            MESSAGE_DISCARDED,
+                            OUTGOING_MESSAGE_STATUS_COUNT);
+}
 
 }  // namespace
 
 GCMNetworkChannelDiagnostic::GCMNetworkChannelDiagnostic(
     GCMNetworkChannel* parent)
     : parent_(parent),
       last_message_empty_echo_token_(false),
       last_post_response_code_(0),
       registration_result_(gcm::GCMClient::UNKNOWN_ERROR),
       sent_messages_count_(0) {}
 
 scoped_ptr<base::DictionaryValue>
 GCMNetworkChannelDiagnostic::CollectDebugData() const {
   scoped_ptr<base::DictionaryValue> status(new base::DictionaryValue);
   status->SetString("GCMNetworkChannel.Channel", "GCM");
+  std::string reg_id_hash = base::SHA1HashString(registration_id_);
   status->SetString("GCMNetworkChannel.HashedRegistrationID",
-                    base::SHA1HashString(registration_id_));
+                    base::HexEncode(reg_id_hash.c_str(), reg_id_hash.size()));
   status->SetString("GCMNetworkChannel.RegistrationResult",
                     GCMClientResultToString(registration_result_));
   status->SetBoolean("GCMNetworkChannel.HadLastMessageEmptyEchoToken",
                      last_message_empty_echo_token_);
   status->SetString(
       "GCMNetworkChannel.LastMessageReceivedTime",
       base::TimeFormatShortDateAndTime(last_message_received_time_));
   status->SetInteger("GCMNetworkChannel.LastPostResponseCode",
                      last_post_response_code_);
   status->SetInteger("GCMNetworkChannel.SentMessages", sent_messages_count_);
@@ skipping 89 matching lines @@
   diagnostic_info_.registration_id_ = registration_id_;
   diagnostic_info_.registration_result_ = result;
 }
 
 void GCMNetworkChannel::SendMessage(const std::string& message) {
   DCHECK(CalledOnValidThread());
   DCHECK(!message.empty());
   DVLOG(2) << "SendMessage";
   diagnostic_info_.sent_messages_count_++;
   if (!cached_message_.empty()) {
-    UMA_HISTOGRAM_ENUMERATION(kOutgoingMessageStatusHistogram,
-                              MESSAGE_DISCARDED,
-                              OUTGOING_MESSAGE_STATUS_COUNT);
+    RecordOutgoingMessageStatus(MESSAGE_DISCARDED);
   }
   cached_message_ = message;
 
   if (!registration_id_.empty()) {
     RequestAccessToken();
   }
 }
 
 void GCMNetworkChannel::SetMessageReceiver(
     invalidation::MessageCallback* incoming_receiver) {
@@ skipping 15 matching lines @@
   if (cached_message_.empty()) {
     // Nothing to do.
     return;
   }
 
   if (error.state() != GoogleServiceAuthError::NONE) {
     // Requesting access token failed. Persistent errors will be reported by
     // token service. Just drop this request, cacheinvalidations will retry
     // sending message and at that time we'll retry requesting access token.
     DVLOG(1) << "RequestAccessToken failed: " << error.ToString();
-    UMA_HISTOGRAM_ENUMERATION(kOutgoingMessageStatusHistogram,
-                              ACCESS_TOKEN_FAILURE,
-                              OUTGOING_MESSAGE_STATUS_COUNT);
+    RecordOutgoingMessageStatus(ACCESS_TOKEN_FAILURE);
     cached_message_.clear();
     return;
   }
   DCHECK(!token.empty());
   // Save access token in case POST fails and we need to invalidate it.
   access_token_ = token;
 
   DVLOG(2) << "Got access token, sending message";
   fetcher_.reset(net::URLFetcher::Create(
       BuildUrl(registration_id_), net::URLFetcher::POST, this));
@@ skipping 12 matching lines @@
 
 void GCMNetworkChannel::OnIncomingMessage(const std::string& message,
                                           const std::string& echo_token) {
 #if !defined(ANDROID)
   if (!echo_token.empty())
     echo_token_ = echo_token;
   diagnostic_info_.last_message_empty_echo_token_ = echo_token.empty();
   diagnostic_info_.last_message_received_time_ = base::Time::Now();
 
   if (message.empty()) {
-    UMA_HISTOGRAM_ENUMERATION(kIncomingMessageStatusHistogram,
-                              MESSAGE_EMPTY,
-                              INCOMING_MESSAGE_STATUS_COUNT);
+    RecordIncomingMessageStatus(MESSAGE_EMPTY);
     return;
   }
   std::string data;
   if (!Base64DecodeURLSafe(message, &data)) {
-    UMA_HISTOGRAM_ENUMERATION(kIncomingMessageStatusHistogram,
-                              INVALID_ENCODING,
-                              INCOMING_MESSAGE_STATUS_COUNT);
+    RecordIncomingMessageStatus(INVALID_ENCODING);
     return;
   }
   ipc::invalidation::AddressedAndroidMessage android_message;
   if (!android_message.ParseFromString(data) ||
       !android_message.has_message()) {
-    UMA_HISTOGRAM_ENUMERATION(kIncomingMessageStatusHistogram,
-                              INVALID_PROTO,
-                              INCOMING_MESSAGE_STATUS_COUNT);
+    RecordIncomingMessageStatus(INVALID_PROTO);
     return;
   }
   DVLOG(2) << "Deliver incoming message";
-  UMA_HISTOGRAM_ENUMERATION(kIncomingMessageStatusHistogram,
-                            INCOMING_MESSAGE_SUCCESS,
-                            INCOMING_MESSAGE_STATUS_COUNT);
+  RecordIncomingMessageStatus(INCOMING_MESSAGE_SUCCESS);
   DeliverIncomingMessage(android_message.message());
 #else
   // This code shouldn't be invoked on Android.
   NOTREACHED();
 #endif
 }
 
 void GCMNetworkChannel::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(fetcher_, source);
   // Free fetcher at the end of function.
   scoped_ptr<net::URLFetcher> fetcher = fetcher_.Pass();
 
   net::URLRequestStatus status = fetcher->GetStatus();
   diagnostic_info_.last_post_response_code_ =
       status.is_success() ? source->GetResponseCode() : status.error();
 
   if (status.is_success() &&
       fetcher->GetResponseCode() == net::HTTP_UNAUTHORIZED) {
     DVLOG(1) << "URLFetcher failure: HTTP_UNAUTHORIZED";
     delegate_->InvalidateToken(access_token_);
   }
 
-  if (!status.is_success() || fetcher->GetResponseCode() != net::HTTP_OK ||
-      fetcher->GetResponseCode() != net::HTTP_NO_CONTENT) {
+  if (!status.is_success() ||
+      (fetcher->GetResponseCode() != net::HTTP_OK &&
+       fetcher->GetResponseCode() != net::HTTP_NO_CONTENT)) {
     DVLOG(1) << "URLFetcher failure";
-    UMA_HISTOGRAM_ENUMERATION(kOutgoingMessageStatusHistogram,
-                              POST_FAILURE,
-                              OUTGOING_MESSAGE_STATUS_COUNT);
+    RecordOutgoingMessageStatus(POST_FAILURE);
     return;
   }
 
-  UMA_HISTOGRAM_ENUMERATION(kOutgoingMessageStatusHistogram,
-                            OUTGOING_MESSAGE_SUCCESS,
-                            OUTGOING_MESSAGE_STATUS_COUNT);
+  RecordOutgoingMessageStatus(OUTGOING_MESSAGE_SUCCESS);
   DVLOG(2) << "URLFetcher success";
 }
 
 GURL GCMNetworkChannel::BuildUrl(const std::string& registration_id) {
   DCHECK(!registration_id.empty());
 
 #if !defined(ANDROID)
   ipc::invalidation::EndpointId endpoint_id;
   endpoint_id.set_c2dm_registration_id(registration_id);
   endpoint_id.set_client_key(std::string());
@@ skipping 42 matching lines @@
   size_t padded_size = (input.size() + 3) - (input.size() + 3) % 4;
   std::string padded_input(input);
   padded_input.resize(padded_size, '=');
   // Convert to standard base64 alphabet.
   base::ReplaceChars(padded_input, "-", "+", &padded_input);
   base::ReplaceChars(padded_input, "_", "/", &padded_input);
   return base::Base64Decode(padded_input, output);
 }
 
 }  // namespace syncer