@@ -287,7 +287,6 @@ impeller_component("entity_unittests") {
 
   sources = [
     "clip_stack_unittests.cc",
-    "contents/content_context_unittests.cc",
     "contents/filters/blend_filter_contents_unittests.cc",
     "contents/filters/gaussian_blur_filter_contents_unittests.cc",
     "contents/filters/inputs/filter_input_unittests.cc",
 
@@ -129,26 +129,6 @@ class ContentContext {
 
   ~ContentContext();
 
-  //----------------------------------------------------------------------------
-  /// @brief      Requests the default pipelines that every `ContentContext`
-  ///             creates, without creating a `ContentContext`.
-  ///
-  ///             The pipelines are requested asynchronously from the pipeline
-  ///             library of `context`, which keeps them for the life of the
-  ///             context. `ContentContext`s created with `context` afterwards
-  ///             find them there, compiled or in flight, instead of compiling
-  ///             them again. This lets embedders start compiling pipelines as
-  ///             soon as a context is available, before there is a surface to
-  ///             render to.
-  ///
-  ///             This must be called on the thread that the `ContentContext`s
-  ///             for `context` are used on, since some pipeline libraries
-  ///             (OpenGL ES) are not thread-safe.
-  ///
-  /// @param[in]  context  The context whose pipeline library to warm.
-  ///
-  static void WarmDefaultPipelines(const Context& context);
-
   bool IsValid() const;
 
   Tessellator& GetTessellator() const;
@@ -382,14 +362,6 @@ class ContentContext {
   struct Pipelines;
   std::unique_ptr<Pipelines> pipelines_;
 
-  /// Requests the default variant of every pipeline from the pipeline library
-  /// of `context`.
-  ///
-  /// @return     The pipelines holding the default variants, or nullptr if a
-  ///             default pipeline descriptor could not be created.
-  static std::unique_ptr<Pipelines> CreateDefaultPipelines(
-      const Context& context);
-
   bool is_valid_ = false;
   std::shared_ptr<Tessellator> tessellator_;
   std::shared_ptr<RenderTargetAllocator> render_target_cache_;
 
@@ -19,8 +19,6 @@
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/render_target.h"
 #include "impeller/renderer/sampler_library.h"
-#include "impeller/renderer/shader_function.h"
-#include "impeller/renderer/shader_library.h"
 
 #define FLT_FORWARD(mock, real, method) \
   EXPECT_CALL(*mock, method())          \
@@ -345,25 +343,6 @@ class MockSampler : public Sampler {
   explicit MockSampler(const SamplerDescriptor& desc) : Sampler(desc) {}
 };
 
-class MockShaderFunction : public ShaderFunction {
- public:
-  MockShaderFunction(std::string name, ShaderStage stage)
-      : ShaderFunction(UniqueID{}, std::move(name), stage) {}
-};
-
-class MockShaderLibrary : public ShaderLibrary {
- public:
-  MOCK_METHOD(bool, IsValid, (), (const, override));
-  MOCK_METHOD(std::shared_ptr<const ShaderFunction>,
-              GetFunction,
-              (std::string_view name, ShaderStage stage),
-              (override));
-  MOCK_METHOD(void,
-              UnregisterFunction,
-              (std::string name, ShaderStage stage),
-              (override));
-};
-
 }  // namespace testing
 }  // namespace impeller
 
 
@@ -62,7 +62,6 @@ executable("flutter_shell_native_unittests") {
   deps = [
     ":flutter_shell_native_src",
     "//flutter/fml",
-    "//flutter/impeller/renderer/testing:mocks",
     "//flutter/shell/platform/android/jni:jni_mock",
     "//flutter/shell/platform/android/jni:mock_jni_env",
     "//flutter/third_party/googletest:gmock",
 
@@ -34,7 +34,6 @@
 
 #include "fml/logging.h"
 #include "impeller/display_list/aiks_context.h"
-#include "impeller/entity/contents/content_context.h"
 #if IMPELLER_ENABLE_VULKAN  // b/258506856 for why this is behind an if
 #include "flutter/shell/platform/android/android_surface_vk_impeller.h"
 #include "flutter/shell/platform/android/image_external_texture_vk_impeller.h"
@@ -436,34 +435,8 @@ std::unique_ptr<Surface> PlatformViewAndroid::CreateRenderingSurface() {
   if (!android_surface_) {
     return nullptr;
   }
-  std::unique_ptr<Surface> surface = android_surface_->CreateGPUSurface(
+  return android_surface_->CreateGPUSurface(
       android_context_->GetMainSkiaContext().get());
-  // Creating the GPU surface sets up the swapchain, which is what may change
-  // the context's default color format.
-  CheckWarmedColorFormat();
-  return surface;
-}
-
-void PlatformViewAndroid::CheckWarmedColorFormat() const {
-  if (!warmed_color_format_.has_value()) {
-    return;
-  }
-  std::shared_ptr<impeller::Context> impeller_context =
-      android_context_->GetImpellerContext();
-  if (!impeller_context) {
-    return;
-  }
-  // Only read by the DCHECK below, which compiles out of release builds.
-  [[maybe_unused]] const impeller::PixelFormat surface_color_format =
-      impeller_context->GetCapabilities()->GetDefaultColorFormat();
-  FML_DCHECK(surface_color_format == warmed_color_format_.value())
-      << "The default pipelines were warmed for "
-      << impeller::PixelFormatToString(warmed_color_format_.value())
-      << " but the surface renders to "
-      << impeller::PixelFormatToString(surface_color_format)
-      << ", so they will be compiled again. Reevaluate the call to "
-         "ContentContext::WarmDefaultPipelines in "
-         "PlatformViewAndroid::SetupImpellerContext.";
 }
 
 // |PlatformView|
@@ -602,23 +575,6 @@ bool PlatformViewAndroid::IsSurfaceControlEnabled() const {
 void PlatformViewAndroid::SetupImpellerContext() {
   android_context_->SetupImpellerContext();
   android_surface_->SetupImpellerSurface();
-
-  // Start compiling the default pipelines now, on the raster thread where the
-  // surface's ContentContext will later look them up, instead of waiting for
-  // the first surface to be created. Compilation happens off this thread (on
-  // the IO thread for OpenGL ES, on worker threads for Vulkan), so no rendering
-  // context needs to be current here.
-  //
-  // The pipelines are keyed on the context's default color format, which the
-  // Vulkan swapchain may change once a surface exists. On Android it is always
-  // R8G8B8A8, so the pipelines warmed here are the ones the surface uses.
-  // |CheckWarmedColorFormat| asserts that this stays true.
-  if (std::shared_ptr<impeller::Context> impeller_context =
-          android_context_->GetImpellerContext()) {
-    warmed_color_format_ =
-        impeller_context->GetCapabilities()->GetDefaultColorFormat();
-    impeller::ContentContext::WarmDefaultPipelines(*impeller_context);
-  }
 }
 
 }  // namespace flutter
@@ -6,13 +6,11 @@
 #define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
 
 #include <memory>
-#include <optional>
 #include <string>
 #include <vector>
 
 #include <android/hardware_buffer_jni.h>
 #include "flutter/fml/platform/android/scoped_java_ref.h"
-#include "flutter/impeller/core/formats.h"
 #include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/snapshot_surface_producer.h"
@@ -145,14 +143,6 @@ class PlatformViewAndroid final : public PlatformView {
   std::unique_ptr<AndroidSurface> android_surface_;
   std::shared_ptr<PlatformMessageHandlerAndroid> platform_message_handler_;
   bool android_meets_hcpp_criteria_ = false;
-  // The color format that |SetupImpellerContext| warmed the default pipelines
-  // for, if it warmed them. Raster thread only.
-  std::optional<impeller::PixelFormat> warmed_color_format_;
-
-  // Asserts that the surface renders to the color format that the default
-  // pipelines were warmed for. Otherwise the warm-up was wasted. Raster thread
-  // only.
-  void CheckWarmedColorFormat() const;
 
   // |PlatformView|
   void UpdateSemantics(