bug 1440673 - Allow TelemetryScalar.h to be included in tests r?Dexter draft
authorChris H-C <chutten@mozilla.com>
Tue, 27 Mar 2018 17:01:28 -0400
changeset 778098 2bc1bfe0ef2a8b5d7f30052dbd15015abfad034e
parent 777934 ff68bf2d34edbcdcdeb3e77b02bf0580017eb498
child 778099 bf7225972780a1a4eb3b5a09891d26ba5139e9d2
push id105384
push userbmo:chutten@mozilla.com
push dateThu, 05 Apr 2018 20:33:48 +0000
reviewersDexter
bugs1440673
milestone61.0a1
bug 1440673 - Allow TelemetryScalar.h to be included in tests r?Dexter TelemetryComms includes some ipc headers we don't have in the gtest build. MozReview-Commit-ID: 9gK6KPHeUIa
toolkit/components/telemetry/TelemetryScalar.h
--- a/toolkit/components/telemetry/TelemetryScalar.h
+++ b/toolkit/components/telemetry/TelemetryScalar.h
@@ -3,23 +3,31 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef TelemetryScalar_h__
 #define TelemetryScalar_h__
 
 #include "mozilla/TelemetryScalarEnums.h"
 #include "mozilla/TelemetryProcessEnums.h"
-#include "ipc/TelemetryComms.h"
 
 // This module is internal to Telemetry. It encapsulates Telemetry's
 // scalar accumulation and storage logic. It should only be used by
 // Telemetry.cpp. These functions should not be used anywhere else.
 // For the public interface to Telemetry functionality, see Telemetry.h.
 
+namespace mozilla {
+namespace Telemetry {
+  struct ScalarAction;
+  struct KeyedScalarAction;
+  struct DiscardedData;
+  struct DynamicScalarDefinition;
+} // namespace Telemetry
+} // namespace mozilla
+
 namespace TelemetryScalar {
 
 void InitializeGlobalState(bool canRecordBase, bool canRecordExtended);
 void DeInitializeGlobalState();
 
 void SetCanRecordBase(bool b);
 void SetCanRecordExtended(bool b);