Revert of Send GCM id to DMServer

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 238 matching lines @@
       new chromeos::attestation::AttestationPolicyObserver(client()));
 
   // Enable device reporting and status monitoring for enterprise enrolled
   // devices. We want to create these objects for enrolled devices, even if
   // monitoring is currently inactive, in case monitoring is turned back on in
   // a future policy fetch - the classes themselves track the current state of
   // the monitoring settings and only perform monitoring if it is active.
   if (install_attributes->IsEnterpriseDevice()) {
     CreateStatusUploader();
     syslog_uploader_.reset(new SystemLogUploader(nullptr, task_runner_));
-    heartbeat_scheduler_.reset(new HeartbeatScheduler(
-        g_browser_process->gcm_driver(), client(),
-        install_attributes->GetDomain(), install_attributes->GetDeviceId(),
-        task_runner_));
+    heartbeat_scheduler_.reset(
+        new HeartbeatScheduler(g_browser_process->gcm_driver(),
+                               install_attributes->GetDomain(),
+                               install_attributes->GetDeviceId(),
+                               task_runner_));
   }
 
   NotifyConnected();
 }
 
 void DeviceCloudPolicyManagerChromeOS::Unregister(
     const UnregisterCallback& callback) {
   if (!service()) {
     LOG(ERROR) << "Tried to unregister but DeviceCloudPolicyManagerChromeOS is "
                << "not connected.";
@@ skipping 66 matching lines @@
       make_scoped_ptr(new DeviceStatusCollector(
           local_state_, chromeos::system::StatisticsProvider::GetInstance(),
           DeviceStatusCollector::LocationUpdateRequester(),
           DeviceStatusCollector::VolumeInfoFetcher(),
           DeviceStatusCollector::CPUStatisticsFetcher(),
           DeviceStatusCollector::CPUTempFetcher())),
       task_runner_));
 }
 
 }  // namespace policy