TelemetryLogWriter cleanups

remoting/base/chromoting_event.h

 // Copyright 2016 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 REMOTING_SIGNALING_CHROMOTING_EVENT_H_
-#define REMOTING_SIGNALING_CHROMOTING_EVENT_H_
+#ifndef REMOTING_BASE_CHROMOTING_EVENT_H_
+#define REMOTING_BASE_CHROMOTING_EVENT_H_
 
 #include <memory>
 #include <string>
 
 #include "base/values.h"
 
 namespace remoting {
 
 // This is the representation of the log entry being sent to the telemetry
 // server. The content should be synced with chromoting_event.js and
@@ skipping 14 matching lines @@
     HOST_OVERLOAD = 11,
     P2P_FAILURE = 12,
     UNEXPECTED = 13,
     CLIENT_SUSPENDED = 14,
     NACL_DISABLED = 15,
     MAX_SESSION_LENGTH = 16,
     HOST_CONFIGURATION_ERROR = 17,
     NACL_PLUGIN_CRASHED = 18
   };
 
-  enum class Mode { IT2ME = 1, ME2ME = 2, LGAPP = 3 };
+  enum class Mode { IT2ME = 1, ME2ME = 2 };
 
   // macro defines from command line have polluted OS names like
   // "LINUX", "ANDROID", etc.
   enum class Os {
     CHROMOTING_LINUX = 1,
     CHROMOTING_CHROMEOS = 2,
     CHROMOTING_MAC = 3,
     CHROMOTING_WINDOWS = 4,
     OTHER = 5,
     CHROMOTING_ANDROID = 6,
@@ skipping 64 matching lines @@
   ~ChromotingEvent();
 
   ChromotingEvent& operator=(const ChromotingEvent& other);
   ChromotingEvent& operator=(ChromotingEvent&& other);
 
   // Sets an arbitrary key/value entry.
   void SetString(const std::string& key, const std::string& value);
   void SetInteger(const std::string& key, int value);
   void SetBoolean(const std::string& key, bool value);
   void SetDouble(const std::string& key, double value);
-  template <typename E>
-  void SetEnum(const std::string& key, E e) {
-    SetInteger(key, static_cast<int>(e));
+  template <typename EnumType>
+  void SetEnum(const std::string& key, EnumType value) {
+    SetInteger(key, static_cast<int>(value));
   }
 
   // Adds fields of CPU type, OS type and OS version.
   void AddSystemInfo();
 
-  void IncrementTryCount();
-  int try_count() const { return try_count_; }
+  void IncrementSendAttempts();
+  int send_attempts() const { return send_attempts_; }
 
   // Returns a copy of the internal dictionary value.
   std::unique_ptr<base::DictionaryValue> CopyDictionaryValue() const;
 
   // Returns true if the SessionState concludes the end of session.
   static bool IsEndOfSession(SessionState state);
 
  private:
   std::unique_ptr<base::DictionaryValue> values_map_;
 
-  int try_count_ = 0;
+  int send_attempts_ = 0;
 };
 
 }  // namespace remoting
 
-#endif  // REMOTING_SIGNALING_CHROMOTING_EVENT_H_
+#endif  // REMOTING_BASE_CHROMOTING_EVENT_H_