Apply rewrite_includes.py diffs

Apparently these were missed on one or more CLs. I found it by
accident when I created a CL that just deleted files.

Change-Id: I83bc6b97b9d704a83af072adeb3fa8cbe37d1c9e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/928817
Commit-Queue: Nicolette Prevost <nicolettep@google.com>
Auto-Submit: Kaylee Lubick <kjlubick@google.com>
Reviewed-by: Nicolette Prevost <nicolettep@google.com>
Commit-Queue: Kaylee Lubick <kjlubick@google.com>

Author: kjlubick

gm/image_pict.cpp

@@ -26,9 +26,9 @@
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypes.h"
 #include "include/gpu/ganesh/GrDirectContext.h"
+#include "include/gpu/ganesh/GrExternalTextureGenerator.h"
 #include "include/gpu/ganesh/GrRecordingContext.h"
 #include "include/gpu/ganesh/GrTypes.h"
-#include "include/gpu/ganesh/GrExternalTextureGenerator.h"
 #include "include/gpu/ganesh/SkSurfaceGanesh.h"
 #include "include/private/gpu/ganesh/GrTextureGenerator.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"

src/gpu/ganesh/GrBackendSurface.cpp

@@ -8,8 +8,8 @@
 #include "include/gpu/ganesh/GrBackendSurface.h"
 
 #include "include/core/SkTextureCompressionType.h"
-#include "include/gpu/ganesh/GrTypes.h"
 #include "include/gpu/MutableTextureState.h"  // IWYU pragma: keep
+#include "include/gpu/ganesh/GrTypes.h"
 #include "include/private/base/SkAssert.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"
 #include "src/gpu/GpuTypesPriv.h"

src/gpu/ganesh/GrBackendSurfacePriv.h

@@ -9,8 +9,8 @@
 #define GrBackendSurfacePriv_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/gpu/ganesh/GrBackendSurface.h"
 #include "include/gpu/MutableTextureState.h"  // IWYU pragma: keep
+#include "include/gpu/ganesh/GrBackendSurface.h"
 #include "include/private/base/SkAssert.h"
 #include "include/private/base/SkDebug.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"

src/gpu/ganesh/GrContext_Base.cpp

@@ -7,10 +7,10 @@
 
 #include "include/private/gpu/ganesh/GrContext_Base.h"
 
+#include "include/gpu/ShaderErrorHandler.h"
 #include "include/gpu/ganesh/GrBackendSurface.h"
 #include "include/gpu/ganesh/GrContextOptions.h"
 #include "include/gpu/ganesh/GrContextThreadSafeProxy.h"
-#include "include/gpu/ShaderErrorHandler.h"
 #include "include/private/base/SkAssert.h"
 #include "src/gpu/ganesh/GrBaseContextPriv.h"
 #include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h"

src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp

@@ -7,9 +7,9 @@
 #include "include/core/SkTypes.h"
 #ifdef SK_BUILD_FOR_IOS
 
-#include "include/gpu/ganesh/gl/ios/GrGLMakeIOSInterface.h"
 #include "include/gpu/ganesh/gl/GrGLAssembleInterface.h"
 #include "include/gpu/ganesh/gl/GrGLInterface.h"
+#include "include/gpu/ganesh/gl/ios/GrGLMakeIOSInterface.h"
 #include "include/private/base/SkTemplates.h"
 
 #include <dlfcn.h>

src/gpu/ganesh/gl/mac/GrGLMakeNativeInterface_mac.cpp

@@ -7,9 +7,9 @@
 #include "include/core/SkTypes.h"
 #ifdef SK_BUILD_FOR_MAC
 
-#include "include/gpu/ganesh/gl/mac/GrGLMakeMacInterface.h"
 #include "include/gpu/ganesh/gl/GrGLAssembleInterface.h"
 #include "include/gpu/ganesh/gl/GrGLInterface.h"
+#include "include/gpu/ganesh/gl/mac/GrGLMakeMacInterface.h"
 #include "include/private/base/SkTemplates.h"
 
 #include <dlfcn.h>

src/gpu/ganesh/gl/webgl/GrGLMakeNativeInterface_webgl.cpp

@@ -4,9 +4,9 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "include/gpu/ganesh/gl/GrGLMakeWebGLInterface.h"
 #include "include/gpu/ganesh/gl/GrGLAssembleInterface.h"
 #include "include/gpu/ganesh/gl/GrGLInterface.h"
+#include "include/gpu/ganesh/gl/GrGLMakeWebGLInterface.h"
 
 #include <GLES3/gl32.h>
 

src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp

@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 #include "include/core/SkTypes.h"
-#include "src/base/SkLeanWindows.h"
 #include "include/gpu/ganesh/gl/GrGLAssembleInterface.h"
 #include "include/gpu/ganesh/gl/GrGLInterface.h"
+#include "src/base/SkLeanWindows.h"
 #include "src/gpu/ganesh/gl/GrGLUtil.h"
 
 #include <memory>

src/gpu/ganesh/image/GrTextureGenerator.cpp

@@ -10,9 +10,9 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
 #include "include/gpu/ganesh/GrBackendSurface.h"
+#include "include/gpu/ganesh/GrExternalTextureGenerator.h"
 #include "include/gpu/ganesh/GrRecordingContext.h"
 #include "include/gpu/ganesh/GrTypes.h"
-#include "include/gpu/ganesh/GrExternalTextureGenerator.h"
 #include "include/private/base/SkAssert.h"
 #include "include/private/gpu/ganesh/GrTextureGenerator.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"

src/gpu/ganesh/image/SkImage_GaneshFactories.cpp

@@ -23,10 +23,10 @@
 #include "include/gpu/ganesh/GrBackendSurface.h"
 #include "include/gpu/ganesh/GrContextThreadSafeProxy.h"
 #include "include/gpu/ganesh/GrDirectContext.h"
+#include "include/gpu/ganesh/GrExternalTextureGenerator.h"
 #include "include/gpu/ganesh/GrRecordingContext.h"
 #include "include/gpu/ganesh/GrTypes.h"
 #include "include/gpu/ganesh/GrYUVABackendTextures.h"
-#include "include/gpu/ganesh/GrExternalTextureGenerator.h"
 #include "include/private/base/SkAssert.h"
 #include "include/private/chromium/SkImageChromium.h"
 #include "include/private/gpu/ganesh/GrImageContext.h"