Bug 851611 - Part 3: Rename headers. r=jrmuizel

--HG--
rename : tools/profiler/sampler.h => tools/profiler/GeckoProfiler.h
rename : tools/profiler/sps_sampler.h => tools/profiler/GeckoProfilerImpl.h
extra : rebase_source : 6ea7c660764a4390cdd8dd91561fff1d7bad6035

content/base/src/nsFrameLoader.cpp

@@ -83,7 +83,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/layout/RenderFrameParent.h"
 #include "nsIAppsService.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "jsapi.h"
 #include "mozilla/dom/HTMLIFrameElement.h"

content/base/src/nsObjectLoadingContent.cpp

@@ -67,7 +67,7 @@
 #include "nsIChannelPolicy.h"
 #include "nsChannelPolicy.h"
 #include "mozilla/dom/Element.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsObjectFrame.h"
 #include "nsDOMClassInfo.h"
 #include "nsWrapperCacheInlines.h"

content/base/src/nsXMLHttpRequest.cpp

@@ -69,7 +69,7 @@
 #include "nsIFileChannel.h"
 #include "mozilla/Telemetry.h"
 #include "jsfriendapi.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "mozilla/dom/EncodingUtils.h"
 #include "mozilla/dom/XMLHttpRequestBinding.h"
 #include "nsIDOMFormData.h"

content/events/src/nsEventDispatcher.cpp

@@ -18,7 +18,7 @@
 #include "nsFrameLoader.h"
 #include "nsDOMTouchEvent.h"
 #include "nsDOMStorage.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "GeneratedEvents.h"
 
 using namespace mozilla;

content/events/src/nsEventStateManager.cpp

@@ -95,7 +95,7 @@
 
 #include "mozilla/Preferences.h"
 #include "mozilla/LookAndFeel.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "nsIDOMClientRect.h"
 

content/html/content/src/nsGenericHTMLFrameElement.cpp

@@ -14,7 +14,7 @@
 #include "nsServiceManagerUtils.h"
 #include "nsIDOMApplicationRegistry.h"
 #include "nsIPermissionManager.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/html/document/src/PluginDocument.cpp

@@ -17,7 +17,7 @@
 #include "nsIPropertyBag2.h"
 #include "mozilla/dom/Element.h"
 #include "nsObjectLoadingContent.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 namespace mozilla {
 namespace dom {

dom/base/nsDOMWindowUtils.cpp

@@ -63,7 +63,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/indexedDB/FileInfo.h"
 #include "mozilla/dom/indexedDB/IndexedDatabaseManager.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsDOMBlobBuilder.h"
 #include "nsIDOMFileHandle.h"
 #include "nsPrintfCString.h"

dom/base/nsJSEnvironment.cpp

@@ -81,7 +81,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/CanvasRenderingContext2DBinding.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

dom/plugins/base/nsPluginStreamListenerPeer.cpp

@@ -25,7 +25,7 @@
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 #include "nsPluginNativeWindow.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsPluginInstanceOwner.h"
 
 #define MAGIC_REQUEST_CONTEXT 0x01020304

dom/plugins/ipc/PluginModuleParent.cpp

@@ -38,7 +38,7 @@
 #include "PluginHangUIParent.h"
 #include "mozilla/widget/AudioSession.h"
 #endif
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using base::KillProcess;
 

dom/src/storage/StorageChild.cpp

@@ -8,7 +8,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "nsError.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 namespace mozilla {
 namespace dom {

dom/src/storage/nsDOMStoragePersistentDB.cpp

@@ -24,7 +24,7 @@
 #include "mozilla/Telemetry.h"
 #include "nsThreadUtils.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using namespace mozilla;
 

gfx/gl/GLContextProviderCGL.mm

@@ -16,7 +16,7 @@
 #include "gfxFailure.h"
 #include "prenv.h"
 #include "mozilla/Preferences.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using namespace mozilla::gfx;
 

gfx/layers/ThebesLayerBuffer.cpp

@@ -12,7 +12,7 @@
 #include "gfxUtils.h"
 #include "ipc/AutoOpenSurface.h"
 #include "nsDeviceContext.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include <algorithm>
 
 namespace mozilla {

gfx/layers/basic/BasicLayerManager.cpp

@@ -15,7 +15,7 @@
 #include "gfxPlatform.h"
 #include "nsXULAppAPI.h"
 #include "RenderTrace.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #define PIXMAN_DONT_DEFINE_STDINT
 #include "pixman.h"

gfx/layers/basic/BasicThebesLayer.cpp

@@ -7,7 +7,7 @@
 #include "gfxUtils.h"
 #include "nsIWidget.h"
 #include "RenderTrace.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "prprf.h"
 

gfx/layers/basic/BasicTiledThebesLayer.cpp

@@ -6,7 +6,7 @@
 #include "mozilla/MathAlgorithms.h"
 #include "BasicTiledThebesLayer.h"
 #include "gfxImageSurface.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "gfxPlatform.h"
 
 #ifdef GFX_TILEDLAYER_DEBUG_OVERLAY

gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp

@@ -21,7 +21,7 @@
 #include "gfxImageSurface.h"
 #include "gfxPlatform.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using namespace android;
 using namespace base;

gfx/layers/ipc/ShadowLayers.cpp

@@ -20,7 +20,7 @@
 #include "ShadowLayerChild.h"
 #include "gfxipc/ShadowLayerUtils.h"
 #include "RenderTrace.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsXULAppAPI.h"
 
 using namespace mozilla::ipc;

gfx/layers/opengl/LayerManagerOGL.cpp

@@ -35,7 +35,7 @@
 
 #include "gfxCrashReporterUtils.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #ifdef MOZ_WIDGET_ANDROID
 #include <android/log.h>

gfx/thebes/gfxContext.cpp

@@ -20,7 +20,7 @@
 #include "gfxPattern.h"
 #include "gfxPlatform.h"
 #include "gfxTeeSurface.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include <algorithm>
 
 #if CAIRO_HAS_DWRITE_FONT

gfx/thebes/gfxFont.cpp

@@ -46,7 +46,7 @@
 #include "harfbuzz/hb.h"
 
 #include "nsCRT.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include <algorithm>
 

gfx/thebes/gfxUtils.cpp

@@ -10,7 +10,7 @@
 #include "nsRegion.h"
 #include "yuv_convert.h"
 #include "ycbcr_to_rgb565.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #ifdef XP_WIN
 #include "gfxWindowsPlatform.h"

image/src/Decoder.cpp

@@ -8,7 +8,7 @@
 #include "nsIServiceManager.h"
 #include "nsIConsoleService.h"
 #include "nsIScriptError.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 namespace mozilla {
 namespace image {

image/src/RasterImage.cpp

@@ -43,7 +43,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/gfx/Scale.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include <algorithm>
 
 using namespace mozilla;

image/src/imgFrame.cpp

@@ -17,7 +17,7 @@
 static bool gDisableOptimize = false;
 
 #include "cairo.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "mozilla/Likely.h"
 
 #if defined(XP_WIN)

js/xpconnect/src/XPCJSRuntime.cpp

@@ -33,7 +33,7 @@
 #include "mozilla/Attributes.h"
 #include "AccessCheck.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsJSPrincipals.h"
 #include <algorithm>
 

layout/base/FrameLayerBuilder.cpp

@@ -24,7 +24,7 @@
 #include "nsSVGIntegrationUtils.h"
 
 #include "mozilla/Preferences.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "mozilla/gfx/Tools.h"
 
 #include "nsAnimationManager.h"

layout/base/RestyleTracker.cpp

@@ -11,7 +11,7 @@
 #include "RestyleTracker.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsStyleChangeList.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 namespace mozilla {
 namespace css {

layout/base/nsCSSFrameConstructor.cpp

@@ -124,7 +124,7 @@
 
 #include "nsRefreshDriver.h"
 #include "nsRuleProcessorData.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

layout/base/nsCSSRendering.cpp

@@ -50,7 +50,7 @@
 #include "nsSVGEffects.h"
 #include "nsSVGIntegrationUtils.h"
 #include "gfxDrawable.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsCSSRenderingBorders.h"
 #include "mozilla/css/ImageLoader.h"
 #include "ImageContainer.h"

layout/base/nsCSSRenderingBorders.cpp

@@ -25,7 +25,7 @@
 #include "nsLayoutUtils.h"
 #include "nsINameSpaceManager.h"
 #include "nsBlockFrame.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsExpirationTracker.h"
 #include "RoundedRect.h"
 

layout/base/nsDisplayList.cpp

@@ -43,7 +43,7 @@
 #include "nsSVGEffects.h"
 #include "nsSVGElement.h"
 #include "nsSVGClipPathFrame.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsAnimationManager.h"
 #include "nsTransitionManager.h"
 #include "nsViewManager.h"

layout/base/nsFrameManager.cpp

@@ -63,7 +63,7 @@
 
 #include "nsFrameManager.h"
 #include "nsRuleProcessorData.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"

layout/base/nsLayoutUtils.cpp

@@ -88,7 +88,7 @@
 #include "nsXULPopupManager.h"
 #endif
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsAnimationManager.h"
 #include "nsTransitionManager.h"
 #include "nsViewportInfo.h"

layout/base/nsPresShell.cpp

@@ -174,7 +174,7 @@
 
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "mozilla/css/ImageLoader.h"
 
 #include "Layers.h"

layout/base/nsRefreshDriver.cpp

@@ -40,7 +40,7 @@
 #include "nsContentUtils.h"
 #include "mozilla/Preferences.h"
 #include "nsViewManager.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsNPAPIPluginInstance.h"
 
 using mozilla::TimeStamp;

layout/generic/nsObjectFrame.cpp

@@ -67,7 +67,7 @@
 #include "nsIObserverService.h"
 #include "nsIScrollableFrame.h"
 #include "mozilla/Preferences.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include <algorithm>
 
 // headers for plugin scriptability

layout/generic/nsTextFrameThebes.cpp

@@ -79,7 +79,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/LookAndFeel.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #ifdef DEBUG
 #undef NOISY_BLINK

layout/generic/nsViewportFrame.cpp

@@ -17,7 +17,7 @@
 #include "FrameLayerBuilder.h"
 #include "nsSubDocumentFrame.h"
 #include "nsAbsoluteContainingBlock.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using namespace mozilla;
 

layout/style/nsStyleContext.cpp

@@ -20,7 +20,7 @@
 #include "nsRuleNode.h"
 #include "nsStyleContext.h"
 #include "nsStyleAnimation.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #ifdef DEBUG
 // #define NOISY_DEBUG

layout/style/nsStyleSet.cpp

@@ -29,7 +29,7 @@
 #include "nsEventStates.h"
 #include "nsStyleSheetService.h"
 #include "mozilla/dom/Element.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

netwerk/base/src/nsInputStreamPump.cpp

@@ -15,7 +15,7 @@
 #include "nsThreadUtils.h"
 #include "nsCOMPtr.h"
 #include "prlog.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include <algorithm>
 
 static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID);

netwerk/base/src/nsStreamLoader.cpp

@@ -7,7 +7,7 @@
 #include "nsIInputStream.h"
 #include "nsIChannel.h"
 #include "nsError.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 nsStreamLoader::nsStreamLoader()
   : mData(nullptr),

netwerk/protocol/http/nsHttpChannel.cpp

@@ -29,7 +29,7 @@
 #include "mozilla/TimeStamp.h"
 #include "nsError.h"
 #include "nsAlgorithm.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsIConsoleService.h"
 #include "base/compiler_specific.h"
 #include "NullHttpTransaction.h"

parser/html/nsHtml5TreeOpExecutor.cpp

@@ -28,7 +28,7 @@
 #include "nsHtml5TreeBuilder.h"
 #include "nsHtml5StreamParser.h"
 #include "mozilla/css/Loader.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsIScriptError.h"
 #include "nsIScriptContext.h"
 #include "mozilla/Preferences.h"

storage/src/mozStorageConnection.cpp

@@ -35,7 +35,7 @@
 #include "SQLCollations.h"
 #include "FileSystemModule.h"
 #include "mozStorageHelper.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "prlog.h"
 #include "prprf.h"

storage/src/mozStorageStatement.cpp

@@ -23,7 +23,7 @@
 #include "mozStorageStatementParams.h"
 #include "mozStorageStatementRow.h"
 #include "mozStorageStatement.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "prlog.h"
 

toolkit/components/places/nsAnnotationService.cpp

@@ -18,7 +18,7 @@
 #include "nsVariant.h"
 #include "mozilla/storage.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "nsNetCID.h"
 

toolkit/components/places/nsNavBookmarks.cpp

@@ -18,7 +18,7 @@
 #include "mozilla/storage.h"
 #include "mozilla/Util.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #define BOOKMARKS_TO_KEYWORDS_INITIAL_CACHE_SIZE 64
 #define RECENT_BOOKMARKS_INITIAL_CACHE_SIZE 10

toolkit/components/startup/StartupTimeline.h

@@ -23,7 +23,7 @@ mozilla_StartupTimeline_Event(FIRST_LOAD_URI, "firstLoadURI")
 
 #include "prtime.h"
 #include "nscore.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #ifdef MOZ_LINKER
 extern "C" {

toolkit/components/startup/nsAppStartup.cpp

@@ -25,7 +25,7 @@
 #include "nsAutoPtr.h"
 #include "nsStringGlue.h"
 #include "mozilla/Preferences.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "prprf.h"
 #include "nsCRT.h"

toolkit/xre/EventTracer.cpp

@@ -48,7 +48,7 @@
  * it took for the event to be serviced.
  */
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "EventTracer.h"
 
@@ -121,7 +121,7 @@ void TracerThread(void *arg)
 
   while (!sExit) {
     TimeStamp start(TimeStamp::Now());
-    SAMPLER_RESPONSIVENESS(start);
+    profiler_responsiveness(start);
     PRIntervalTime next_sleep = interval;
 
     //TODO: only wait up to a maximum of interval; return

toolkit/xre/nsAppRunner.cpp

@@ -2758,7 +2758,7 @@ static DWORD InitDwriteBG(LPVOID lpdwThreadParam)
 bool fire_glxtest_process();
 #endif
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 // Encapsulates startup and shutdown state for XRE_main
 class XREMain

toolkit/xre/nsEmbedFunctions.cpp

@@ -74,7 +74,7 @@
 #include "mozilla/ipc/TestShellParent.h"
 #include "mozilla/ipc/XPCShellEnvironment.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #ifdef MOZ_IPDL_TESTS
 #include "mozilla/_ipdltest/IPDLUnitTests.h"

tools/profiler/GeckoProfiler.h

@@ -137,7 +137,7 @@ static inline void profiler_unlock() {}
 
 #else
 
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
 
 #endif
 

tools/profiler/GeckoProfilerImpl.h

@@ -69,8 +69,8 @@ void mozilla_sampler_stop2();
 bool mozilla_sampler_is_active1();
 bool mozilla_sampler_is_active2();
 
-void mozilla_sampler_responsiveness1(TimeStamp time);
-void mozilla_sampler_responsiveness2(TimeStamp time);
+void mozilla_sampler_responsiveness1(const TimeStamp& time);
+void mozilla_sampler_responsiveness2(const TimeStamp& time);
 
 void mozilla_sampler_frame_number1(int frameNumber);
 void mozilla_sampler_frame_number2(int frameNumber);

tools/profiler/Makefile.in

@@ -14,11 +14,11 @@ XPCSHELL_TESTS = tests
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS = sampler.h
+EXPORTS = GeckoProfiler.h
 
 ifdef MOZ_ENABLE_PROFILER_SPS
 EXPORTS += \
-  sps_sampler.h \
+  GeckoProfilerImpl.h \
   shared-libraries.h \
   $(NULL)
 

tools/profiler/ProfileEntry2.cpp

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <iostream>
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
 #include "platform.h"
 #include "nsThreadUtils.h"
 

tools/profiler/ProfileEntry2.h

@@ -6,6 +6,7 @@
 #ifndef MOZ_PROFILE_ENTRY_H
 #define MOZ_PROFILE_ENTRY_H
 
+#include "GeckoProfilerImpl.h"
 #include "mozilla/Mutex.h"
 
 class ThreadProfile2;

tools/profiler/TableTicker.cpp

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <fstream>
 #include <sstream>
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
 #include "platform.h"
 #include "nsXULAppAPI.h"
 #include "nsThreadUtils.h"

tools/profiler/TableTicker2.cpp

@@ -16,7 +16,7 @@
 
 // Profiler
 #include "PlatformMacros.h"
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
 #include "platform.h"
 #include "nsXULAppAPI.h"
 #include "nsThreadUtils.h"
@@ -45,7 +45,7 @@
 // JS
 #include "jsdbgapi.h"
 
-// This file's exports are listed in sps_sampler.h.
+// This file's exports are listed in GeckoProfilerImpl.h.
 
 // Pseudo backtraces are available on all platforms.  Native
 // backtraces are available only on selected platforms.  Breakpad is
@@ -961,7 +961,7 @@ bool mozilla_sampler_is_active2()
 
 static double sResponsivenessTimes[100];
 static unsigned int sResponsivenessLoc = 0;
-void mozilla_sampler_responsiveness2(TimeStamp aTime)
+void mozilla_sampler_responsiveness2(const TimeStamp& aTime)
 {
   if (!sLastTracerEvent.IsNull()) {
     if (sResponsivenessLoc == 100) {

tools/profiler/UnwinderThread2.cpp

@@ -25,7 +25,6 @@
 #include "mozilla/StandardInteger.h"
 #include "PlatformMacros.h"
 
-#include "sps_sampler.h"
 #include "platform.h"
 #include <iostream>
 
@@ -67,7 +66,7 @@
 //////////////////////////////////////////////////////////
 //// BEGIN externally visible functions (WINDOWS STUBS)
 
-// On Windows this will all need reworking.  sps_sampler.h
+// On Windows this will all need reworking.  GeckoProfilerImpl.h
 // will ensure these functions are never actually called,
 // so just provide no-op stubs for now.
 

tools/profiler/UnwinderThread2.h

@@ -6,7 +6,7 @@
 #ifndef MOZ_UNWINDER_THREAD_2_H
 #define MOZ_UNWINDER_THREAD_2_H
 
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
 #include "ProfileEntry2.h"
 
 /* Top level exports of UnwinderThread.cpp. */

tools/profiler/nsProfiler.cpp

@@ -8,7 +8,7 @@
 #ifdef MOZ_INSTRUMENT_EVENT_LOOP
 #include "EventTracer.h"
 #endif
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsProfiler.h"
 #include "nsMemory.h"
 #include "nsString.h"

tools/profiler/platform-linux.cc

@@ -59,7 +59,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include "platform.h"
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
 
 #include <string.h>
 #include <stdio.h>

view/src/nsViewManager.cpp

@@ -21,7 +21,7 @@
 #include "nsPresContext.h"
 #include "nsEventStateManager.h"
 #include "mozilla/StartupTimeline.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include "nsRefreshDriver.h"
 #include "mozilla/Preferences.h"
 #include "nsContentUtils.h"

widget/android/nsAppShell.cpp

@@ -39,7 +39,7 @@
 
 #include "mozilla/dom/ScreenOrientation.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #ifdef MOZ_ANDROID_HISTORY
 #include "nsNetUtil.h"
 #include "IHistory.h"

widget/cocoa/nsAppShell.mm

@@ -32,7 +32,7 @@
 #include "nsToolkit.h"
 #include "TextInputHandler.h"
 #include "mozilla/HangMonitor.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "npapi.h"
 

widget/cocoa/nsChildView.mm

@@ -64,7 +64,7 @@
 
 #include <ApplicationServices/ApplicationServices.h>
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #include "nsIDOMWheelEvent.h"
 

widget/gonk/nsAppShell.cpp

@@ -50,7 +50,7 @@
 #include "libui/InputReader.h"
 #include "libui/InputDispatcher.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 #define LOG(args...)                                            \
     __android_log_print(ANDROID_LOG_INFO, "Gonk" , ## args)

xpcom/base/nsCycleCollector.cpp

@@ -126,7 +126,7 @@
 #include "nsMemoryInfoDumper.h"
 #include "xpcpublic.h"
 #include "nsXPCOMPrivate.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 #include <stdio.h>
 #include <string.h>
 #ifdef WIN32

xpcom/build/nsXPComInit.cpp

@@ -122,7 +122,7 @@ extern nsresult nsStringInputStreamConstructor(nsISupports *, REFNSIID, void **)
 
 #include "mozilla/VisualEventTracer.h"
 
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using base::AtExitManager;
 using mozilla::ipc::BrowserProcessSubThread;

xpcom/threads/nsTimerImpl.cpp

@@ -10,7 +10,7 @@
 #include "nsThreadManager.h"
 #include "nsThreadUtils.h"
 #include "plarena.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
 
 using mozilla::TimeDuration;
 using mozilla::TimeStamp;