Revert of Add GCMChannelStatusSyncer to schedule requests and enable/disable GCM

components/gcm_driver/gcm_driver_desktop.h

 // 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_GCM_DRIVER_DESKTOP_H_
 #define COMPONENTS_GCM_DRIVER_GCM_DRIVER_DESKTOP_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "components/gcm_driver/gcm_channel_status_syncer.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "components/gcm_driver/gcm_connection_observer.h"
 #include "components/gcm_driver/gcm_driver.h"
 
-class PrefService;
-
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
 }
 
 namespace extensions {
 class ExtensionGCMAppHandlerTest;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace gcm {
 
 class GCMAppHandler;
 class GCMClientFactory;
 class GCMDelayedTaskController;
 
 // GCMDriver implementation for desktop and Chrome OS, using GCMClient.
 class GCMDriverDesktop : public GCMDriver {
  public:
   GCMDriverDesktop(
       scoped_ptr<GCMClientFactory> gcm_client_factory,
       const GCMClient::ChromeBuildInfo& chrome_build_info,
-      PrefService* prefs,
       const base::FilePath& store_path,
       const scoped_refptr<net::URLRequestContextGetter>& request_context,
       const scoped_refptr<base::SequencedTaskRunner>& ui_thread,
       const scoped_refptr<base::SequencedTaskRunner>& io_thread,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner);
   virtual ~GCMDriverDesktop();
 
   // GCMDriver overrides:
   virtual void Shutdown() OVERRIDE;
   virtual void OnSignedIn() OVERRIDE;
@@ skipping 20 matching lines @@
 
   // GCMDriverDesktop specific implementation.
   // Sets a list of accounts with OAuth2 tokens for the next checkin.
   // |account_tokens| maps email addresses to OAuth2 access tokens.
   // |account_removed| indicates that an account has been removed since the
   //     last time the callback was called, which triggers an immediate checkin,
   //     to ensure that association between device and account is removed.
   void SetAccountsForCheckin(
       const std::map<std::string, std::string>& account_tokens);
 
-  // Exposed for testing purpose.
-  bool gcm_enabled() const { return gcm_enabled_; }
-  GCMChannelStatusSyncer* gcm_channel_status_syncer_for_testing() {
-    return &gcm_channel_status_syncer_;
-  }
-
  protected:
   // GCMDriver implementation:
   virtual GCMClient::Result EnsureStarted() OVERRIDE;
   virtual void RegisterImpl(
       const std::string& app_id,
       const std::vector<std::string>& sender_ids) OVERRIDE;
   virtual void UnregisterImpl(const std::string& app_id) OVERRIDE;
   virtual void SendImpl(const std::string& app_id,
                         const std::string& receiver_id,
                         const GCMClient::OutgoingMessage& message) OVERRIDE;
@@ skipping 21 matching lines @@
   void MessageSendError(const std::string& app_id,
                         const GCMClient::SendErrorDetails& send_error_details);
   void SendAcknowledged(const std::string& app_id,
                         const std::string& message_id);
   void GCMClientReady();
   void OnConnected(const net::IPEndPoint& ip_endpoint);
   void OnDisconnected();
 
   void GetGCMStatisticsFinished(const GCMClient::GCMStatistics& stats);
 
-  GCMChannelStatusSyncer gcm_channel_status_syncer_;
-
   // Flag to indicate whether the user is signed in to a GAIA account.
   // TODO(jianli): To be removed when sign-in enforcement is dropped.
   bool signed_in_;
 
   // Flag to indicate if GCM is started.
   bool gcm_started_;
 
   // Flag to indicate if GCM is enabled.
-  // TODO(jianli): Removed when we switch completely to support all users.
   bool gcm_enabled_;
 
   // Flag to indicate the last known state of the GCM client. Because this
   // flag lives on the UI thread, while the GCM client lives on the IO thread,
   // it may be out of date while connection changes are happening.
   bool connected_;
 
   // List of observers to notify when connection state changes.
   // Makes sure list is empty on destruction.
   ObserverList<GCMConnectionObserver, true> connection_observer_list_;
@@ skipping 12 matching lines @@
 
   // Used to pass a weak pointer to the IO worker.
   base::WeakPtrFactory<GCMDriverDesktop> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMDriverDesktop);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_DRIVER_DESKTOP_H_