Migrate more files to histogram_macros.h from histogram.h.

google_apis/gcm/engine/heartbeat_manager.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 "google_apis/gcm/engine/heartbeat_manager.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/location.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "net/base/network_change_notifier.h"
 
 namespace gcm {
 
@@ skipping 272 matching lines @@
       interval <= max_heartbeat_interval;
 }
 
 void HeartbeatManager::ResetConnection(
     ConnectionFactory::ConnectionResetReason reason) {
   Stop();
   trigger_reconnect_callback_.Run(reason);
 }
 
 }  // namespace gcm