Revert of Send GCM id to DMServer

chrome/browser/chromeos/policy/heartbeat_scheduler.h

 // Copyright (c) 2015 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_HEARTBEAT_SCHEDULER_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_HEARTBEAT_SCHEDULER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client.h"
-#include "components/policy/core/common/cloud/cloud_policy_client.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace gcm {
 class GCMDriver;
 }
 
 namespace policy {
 
 class EnterpriseInstallAttributes;
 class HeartbeatRegistrationHelper;
 
 // Class responsible for periodically sending heartbeats to the policy service
 // for monitoring device connectivity.
 class HeartbeatScheduler : public gcm::GCMAppHandler {
  public:
   // Default interval for how often we send up a heartbeat.
   static const int64 kDefaultHeartbeatIntervalMs;
 
-  // Constructor. |cloud_policy_client| will be used to send registered GCM id
-  // to DM server, and can be null. |driver| can be null for tests.
+  // Constructor. |driver| can be null for tests.
   HeartbeatScheduler(
       gcm::GCMDriver* driver,
-      policy::CloudPolicyClient* cloud_policy_client,
       const std::string& enrollment_domain,
       const std::string& device_id,
       const scoped_refptr<base::SequencedTaskRunner>& task_runner);
 
   ~HeartbeatScheduler() override;
 
   // Returns the time of the last heartbeat, or Time(0) if no heartbeat
   // has ever happened.
   base::Time last_heartbeat() const { return last_heartbeat_; }
 
@@ skipping 26 matching lines @@
   // schedules the next heartbeat.
   void RefreshHeartbeatSettings();
 
   // Ensures that the passed interval is within a valid range (not too large or
   // too small).
   base::TimeDelta EnsureValidHeartbeatInterval(const base::TimeDelta& interval);
 
   // Shuts down our GCM connection (called when heartbeats are disabled).
   void ShutdownGCM();
 
-  // Callback for the GCM id update request.
-  void OnGcmIdUpdateRequestSent(bool status);
-
   // TaskRunner used for scheduling heartbeats.
   const scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   // The domain that this device is enrolled to.
   const std::string enrollment_domain_;
 
   // The device_id for this device - sent up with the enrollment domain with
   // heartbeats to identify the device to the server.
   const std::string device_id_;
 
@@ skipping 10 matching lines @@
       heartbeat_frequency_observer_;
   scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
       heartbeat_enabled_observer_;
 
   // The time the last heartbeat was sent.
   base::Time last_heartbeat_;
 
   // Callback invoked via a delay to send a heartbeat.
   base::CancelableClosure heartbeat_callback_;
 
-  policy::CloudPolicyClient* cloud_policy_client_;
-
   // The GCMDriver used to send heartbeat messages.
   gcm::GCMDriver* const gcm_driver_;
 
   // The GCM registration ID - if empty, we are not registered yet.
   std::string registration_id_;
 
   // If true, we are already registered with GCM and should unregister when
   // destroyed.
   bool registered_app_handler_ = false;
 
   // Helper class to manage registering with the GCM server, including
   // retries, etc.
   scoped_ptr<HeartbeatRegistrationHelper> registration_helper_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<HeartbeatScheduler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HeartbeatScheduler);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_HEARTBEAT_SCHEDULER_H_