Backed out changeset 8063ff05e5b1 (bug 1678487) for causing windows widget xpc failures. CLOSED TREE

js/xpconnect/src/XPCShellImpl.cpp

@@ -14,7 +14,6 @@
 #include "js/Printf.h"
 #include "js/PropertySpec.h"
 #include "js/SourceText.h"  // JS::SourceText
-#include "gfxPlatform.h"
 #include "mozilla/ChaosMode.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/IOInterposer.h"
@@ -1306,10 +1305,6 @@ int XRE_XPCShellMain(int argc, char** argv, char** envp,
     CodeCoverageHandler::Init();
 #endif
 
-    // Ensure gfxPlatform is initialized to make sure CMS state some test want
-    // to use is set up.
-    gfxPlatform::GetPlatform();
-
     {
       if (!glob) {
         return 1;

testing/gtest/mozilla/GTestRunner.cpp

@@ -9,7 +9,6 @@
 #include "nsICrashReporter.h"
 #include "testing/TestHarness.h"
 #include "prenv.h"
-#include "gfxPlatform.h"
 #ifdef ANDROID
 #  include <android/log.h>
 #endif
@@ -125,11 +124,6 @@ int RunGTestFunc(int* argc, char** argv) {
   char* path = PR_GetEnv("MOZ_GTEST_CWD");
   chdir(path);
 #endif
-
-  // Ensure gfxPlatform is initialized to make sure CMS state some test want
-  // to use is set up.
-  gfxPlatform::GetPlatform();
-
   nsCOMPtr<nsICrashReporter> crashreporter;
   char* crashreporterStr = PR_GetEnv("MOZ_CRASHREPORTER");
   if (crashreporterStr && !strcmp(crashreporterStr, "1")) {