Fixed a mismatch of UMA GCM metric name between files

components/gcm_driver/gcm_client_impl.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 "components/gcm_driver/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 150 matching lines @@
     const gcm::GCMClient::OutgoingMessage& message) {
   OutgoingMessageTTLCategory ttl_category;
   if (message.time_to_live == 0)
     ttl_category = TTL_ZERO;
   else if (message.time_to_live <= 60 )
     ttl_category = TTL_LESS_THAN_OR_EQUAL_TO_ONE_MINUTE;
   else if (message.time_to_live <= 60 * 60)
     ttl_category = TTL_LESS_THAN_OR_EQUAL_TO_ONE_HOUR;
   else if (message.time_to_live <= 24 * 60 * 60)
     ttl_category = TTL_LESS_THAN_OR_EQUAL_TO_ONE_DAY;
-  else if (message.time_to_live <= 7 * 24 * 60 * 60)
-    ttl_category = TTL_LESS_THAN_OR_EQUAL_TO_ONE_WEEK;
-  else if (message.time_to_live < gcm::GCMClient::OutgoingMessage::kMaximumTTL)
-    ttl_category = TTL_MORE_THAN_ONE_WEEK;
   else
     ttl_category = TTL_MAXIMUM;
 
-  UMA_HISTOGRAM_ENUMERATION("GCM.GCMOutgoingMessageTTLCategory",
+  UMA_HISTOGRAM_ENUMERATION("GCM.OutgoingMessageTTL",
                             ttl_category,
                             TTL_CATEGORY_COUNT);
 }
 
 }  // namespace
 
 GCMInternalsBuilder::GCMInternalsBuilder() {}
 GCMInternalsBuilder::~GCMInternalsBuilder() {}
 
 scoped_ptr<base::Clock> GCMInternalsBuilder::BuildClock() {
@@ skipping 764 matching lines @@
 
   recorder_.RecordIncomingSendError(
       data_message_stanza.category(),
       data_message_stanza.to(),
       data_message_stanza.id());
   delegate_->OnMessageSendError(data_message_stanza.category(),
                                 send_error_details);
 }
 
 }  // namespace gcm