Revert 270226 "Componentize GCM Part 1: create GCM component and..."

trunk/src/google_apis/gcm/gcm_client.h

 // Copyright 2013 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 GOOGLE_APIS_GCM_GCM_CLIENT_H_
 #define GOOGLE_APIS_GCM_GCM_CLIENT_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 12 matching lines @@
 namespace checkin_proto {
 class ChromeBuildProto;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace gcm {
 
-class Encryptor;
-
 // Interface that encapsulates the network communications with the Google Cloud
 // Messaging server. This interface is not supposed to be thread-safe.
 class GCM_EXPORT GCMClient {
  public:
   enum Result {
     // Successful operation.
     SUCCESS,
     // Invalid parameter.
     INVALID_PARAMETER,
     // Profile not signed in.
@@ skipping 133 matching lines @@
   // |url_request_context_getter|: for url requests.
   // |delegate|: the delegate whose methods will be called asynchronously in
   //             response to events and messages.
   virtual void Initialize(
       const checkin_proto::ChromeBuildProto& chrome_build_proto,
       const base::FilePath& store_path,
       const std::vector<std::string>& account_ids,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
       const scoped_refptr<net::URLRequestContextGetter>&
           url_request_context_getter,
-      scoped_ptr<Encryptor> encryptor,
       Delegate* delegate) = 0;
 
   // Starts the GCM service by first loading the data from the persistent store.
   // This will then kick off the check-in if the check-in info is not found in
   // the store.
   virtual void Start() = 0;
 
   // Stops using the GCM service. This will not erase the persisted data.
   virtual void Stop() = 0;
 
@@ skipping 31 matching lines @@
   // Clear all recorded GCM activity logs.
   virtual void ClearActivityLogs() = 0;
 
   // Gets internal states and statistics.
   virtual GCMStatistics GetStatistics() const = 0;
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_GCM_CLIENT_H_