Merge remote-tracking branch 'origin/tracking' into custom

gfx/thebes/gfxEnv.h

@@ -70,8 +70,6 @@ public:
 
   // Force gfxDevCrash to use MOZ_CRASH in Beta and Release
   DECL_GFX_ENV("MOZ_GFX_CRASH_MOZ_CRASH", GfxDevCrashMozCrash);
-  // Force gfxDevCrash to use telemetry in Nightly and Aurora
-  DECL_GFX_ENV("MOZ_GFX_CRASH_TELEMETRY", GfxDevCrashTelemetry);
 
   DECL_GFX_ENV("MOZ_GFX_VR_NO_DISTORTION", VRNoDistortion);
 

gfx/thebes/gfxFontEntry.cpp

@@ -34,7 +34,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
-#include "mozilla/Telemetry.h"
 #include "gfxSVGGlyphs.h"
 #include "gfx2DGlue.h"
 

gfx/thebes/gfxGDIFontList.cpp

@@ -28,7 +28,6 @@
 #include "GeckoProfiler.h"
 
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Telemetry.h"
 #include "mozilla/WindowsVersion.h"
 
 #include <usp10.h>

gfx/thebes/gfxPlatform.h

@@ -159,9 +159,7 @@ public:
     static gfxPlatform *GetPlatform();
 
     /**
-     * Returns whether or not graphics has been initialized yet. This is
-     * intended for Telemetry where we don't necessarily want to initialize
-     * graphics just to observe its state.
+     * Returns whether or not graphics has been initialized yet.
      */
     static bool Initialized();
 

gfx/thebes/gfxUserFontSet.cpp

@@ -17,7 +17,6 @@
 #include "gfxFontConstants.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
-#include "mozilla/Telemetry.h"
 #include "mozilla/gfx/2D.h"
 #include "gfxPlatformFontList.h"