Retrieve chrome build info in GCMProfileService, instead of GCMDriver

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>
 
 #include "base/basictypes.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
 
 template <class T> class scoped_refptr;
 
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
 }
 
-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.
@@ skipping 14 matching lines @@
     // Network socket error.
     NETWORK_ERROR,
     // Problem at the server.
     SERVER_ERROR,
     // Exceeded the specified TTL during message sending.
     TTL_EXCEEDED,
     // Other errors.
     UNKNOWN_ERROR
   };
 
+  enum ChromePlatform {
+    PLATFORM_WIN,
+    PLATFORM_MAC,
+    PLATFORM_LINUX,
+    PLATFORM_CROS,
+    PLATFORM_IOS,
+    PLATFORM_ANDROID,
+    PLATFORM_UNKNOWN
+  };
+
+  enum ChromeChannel {
+    CHANNEL_STABLE,
+    CHANNEL_BETA,
+    CHANNEL_DEV,
+    CHANNEL_CANARY,
+    CHANNEL_UNKNOWN
+  };
+
+  struct GCM_EXPORT ChromeBuildInfo {
+    ChromeBuildInfo();
+    ~ChromeBuildInfo();
+
+    ChromePlatform platform;
+    ChromeChannel channel;
+    std::string version;
+  };
+
   // Message data consisting of key-value pairs.
   typedef std::map<std::string, std::string> MessageData;
 
   // Message to be delivered to the other party.
   struct GCM_EXPORT OutgoingMessage {
     OutgoingMessage();
     ~OutgoingMessage();
 
     // Message ID.
     std::string id;
@@ skipping 95 matching lines @@
     // Called when activities are being recorded and a new activity has just
     // been recorded.
     virtual void OnActivityRecorded() = 0;
   };
 
   GCMClient();
   virtual ~GCMClient();
 
   // Begins initialization of the GCM Client. This will not trigger a
   // connection.
-  // |chrome_build_proto|: chrome info, i.e., version, channel and etc.
+  // |chrome_build_info|: chrome info, i.e., version, channel and etc.
   // |store_path|: path to the GCM store.
   // |account_ids|: account IDs to be related to the device when checking in.
   // |blocking_task_runner|: for running blocking file tasks.
   // |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 ChromeBuildInfo& chrome_build_info,
       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
@@ skipping 37 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_