diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 099b89af6e4..c3202547a29 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -76,8 +76,10 @@
         `AnalyticsListener.onVideoCodecError`). Use the new
         `TestPlayerRunHelper.run(player).ignoringNonFatalErrors().untilXXX()`
         method chain to disable this behavior.
-*   Remove deprecated symbols:
 *   Demo app:
+*   Remove deprecated symbols:
+    *   Remove `CronetDataSourceFactory`. Use `CronetDataSource.Factory`
+        instead.
 
 ## 1.3
 
diff --git a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java b/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java
index d030564688d..300fc2e2bab 100644
--- a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java
+++ b/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java
@@ -439,8 +439,7 @@ public OpenException(
   @UnstableApi public static final int DEFAULT_READ_TIMEOUT_MILLIS = 8 * 1000;
 
   // The size of read buffer passed to cronet UrlRequest.read().
-  // TODO: Make this private once CronetDataSourceFactory is deleted.
-  static final int DEFAULT_READ_BUFFER_SIZE_BYTES = 32 * 1024;
+  private static final int DEFAULT_READ_BUFFER_SIZE_BYTES = 32 * 1024;
 
   /* package */ final UrlRequest.Callback urlRequestCallback;
 
diff --git a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java b/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java
deleted file mode 100644
index 827225422d6..00000000000
--- a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.media3.datasource.cronet;
-
-import static org.chromium.net.UrlRequest.Builder.REQUEST_PRIORITY_MEDIUM;
-
-import androidx.annotation.Nullable;
-import androidx.media3.common.util.UnstableApi;
-import androidx.media3.datasource.DefaultHttpDataSource;
-import androidx.media3.datasource.HttpDataSource;
-import androidx.media3.datasource.HttpDataSource.BaseFactory;
-import androidx.media3.datasource.TransferListener;
-import java.util.concurrent.Executor;
-import org.chromium.net.CronetEngine;
-
-/**
- * @deprecated Use {@link CronetDataSource.Factory} instead.
- */
-@Deprecated
-@UnstableApi
-public final class CronetDataSourceFactory extends BaseFactory {
-
-  /** The default connection timeout, in milliseconds. */
-  public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS =
-      CronetDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS;
-
-  /** The default read timeout, in milliseconds. */
-  public static final int DEFAULT_READ_TIMEOUT_MILLIS =
-      CronetDataSource.DEFAULT_READ_TIMEOUT_MILLIS;
-
-  @SuppressWarnings("deprecation") // Intentionally using deprecated type
-  private final CronetEngineWrapper cronetEngineWrapper;
-
-  private final Executor executor;
-  @Nullable private final TransferListener transferListener;
-  private final int connectTimeoutMs;
-  private final int readTimeoutMs;
-  private final boolean resetTimeoutOnRedirects;
-  private final HttpDataSource.Factory fallbackFactory;
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, the provided
-   * fallback {@link HttpDataSource.Factory} will be used instead.
-   *
-   * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
-   * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   * @param fallbackFactory A {@link HttpDataSource.Factory} which is used as a fallback in case no
-   *     suitable CronetEngine can be build.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(
-      CronetEngineWrapper cronetEngineWrapper,
-      Executor executor,
-      HttpDataSource.Factory fallbackFactory) {
-    this(
-        cronetEngineWrapper,
-        executor,
-        /* transferListener= */ null,
-        DEFAULT_CONNECT_TIMEOUT_MILLIS,
-        DEFAULT_READ_TIMEOUT_MILLIS,
-        false,
-        fallbackFactory);
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
-   * DefaultHttpDataSource.Factory} will be used instead.
-   *
-   * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
-   * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(CronetEngineWrapper cronetEngineWrapper, Executor executor) {
-    this(cronetEngineWrapper, executor, /* userAgent= */ (String) null);
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
-   * DefaultHttpDataSource.Factory} will be used instead.
-   *
-   * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
-   * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   * @param userAgent The user agent that will be used by the fallback {@link HttpDataSource} if
-   *     needed, or {@code null} for the fallback to use the default user agent of the underlying
-   *     platform.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(
-      CronetEngineWrapper cronetEngineWrapper, Executor executor, @Nullable String userAgent) {
-    this(
-        cronetEngineWrapper,
-        executor,
-        /* transferListener= */ null,
-        DEFAULT_CONNECT_TIMEOUT_MILLIS,
-        DEFAULT_READ_TIMEOUT_MILLIS,
-        false,
-        new DefaultHttpDataSource.Factory().setUserAgent(userAgent));
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
-   * DefaultHttpDataSource.Factory} will be used instead.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   * @param connectTimeoutMs The connection timeout, in milliseconds.
-   * @param readTimeoutMs The read timeout, in milliseconds.
-   * @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
-   * @param userAgent The user agent that will be used by the fallback {@link HttpDataSource} if
-   *     needed, or {@code null} for the fallback to use the default user agent of the underlying
-   *     platform.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(
-      CronetEngineWrapper cronetEngineWrapper,
-      Executor executor,
-      int connectTimeoutMs,
-      int readTimeoutMs,
-      boolean resetTimeoutOnRedirects,
-      @Nullable String userAgent) {
-    this(
-        cronetEngineWrapper,
-        executor,
-        /* transferListener= */ null,
-        connectTimeoutMs,
-        readTimeoutMs,
-        resetTimeoutOnRedirects,
-        new DefaultHttpDataSource.Factory()
-            .setUserAgent(userAgent)
-            .setConnectTimeoutMs(connectTimeoutMs)
-            .setReadTimeoutMs(readTimeoutMs));
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, the provided
-   * fallback {@link HttpDataSource.Factory} will be used instead.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   * @param connectTimeoutMs The connection timeout, in milliseconds.
-   * @param readTimeoutMs The read timeout, in milliseconds.
-   * @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
-   * @param fallbackFactory A {@link HttpDataSource.Factory} which is used as a fallback in case no
-   *     suitable CronetEngine can be build.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(
-      CronetEngineWrapper cronetEngineWrapper,
-      Executor executor,
-      int connectTimeoutMs,
-      int readTimeoutMs,
-      boolean resetTimeoutOnRedirects,
-      HttpDataSource.Factory fallbackFactory) {
-    this(
-        cronetEngineWrapper,
-        executor,
-        /* transferListener= */ null,
-        connectTimeoutMs,
-        readTimeoutMs,
-        resetTimeoutOnRedirects,
-        fallbackFactory);
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, the provided
-   * fallback {@link HttpDataSource.Factory} will be used instead.
-   *
-   * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
-   * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   * @param transferListener An optional listener.
-   * @param fallbackFactory A {@link HttpDataSource.Factory} which is used as a fallback in case no
-   *     suitable CronetEngine can be build.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(
-      CronetEngineWrapper cronetEngineWrapper,
-      Executor executor,
-      @Nullable TransferListener transferListener,
-      HttpDataSource.Factory fallbackFactory) {
-    this(
-        cronetEngineWrapper,
-        executor,
-        transferListener,
-        DEFAULT_CONNECT_TIMEOUT_MILLIS,
-        DEFAULT_READ_TIMEOUT_MILLIS,
-        false,
-        fallbackFactory);
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
-   * DefaultHttpDataSource.Factory} will be used instead.
-   *
-   * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
-   * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   * @param transferListener An optional listener.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(
-      CronetEngineWrapper cronetEngineWrapper,
-      Executor executor,
-      @Nullable TransferListener transferListener) {
-    this(cronetEngineWrapper, executor, transferListener, /* userAgent= */ (String) null);
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
-   * DefaultHttpDataSource.Factory} will be used instead.
-   *
-   * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
-   * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   * @param transferListener An optional listener.
-   * @param userAgent The user agent that will be used by the fallback {@link HttpDataSource} if
-   *     needed, or {@code null} for the fallback to use the default user agent of the underlying
-   *     platform.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(
-      CronetEngineWrapper cronetEngineWrapper,
-      Executor executor,
-      @Nullable TransferListener transferListener,
-      @Nullable String userAgent) {
-    this(
-        cronetEngineWrapper,
-        executor,
-        transferListener,
-        DEFAULT_CONNECT_TIMEOUT_MILLIS,
-        DEFAULT_READ_TIMEOUT_MILLIS,
-        false,
-        new DefaultHttpDataSource.Factory()
-            .setUserAgent(userAgent)
-            .setTransferListener(transferListener));
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
-   * DefaultHttpDataSource.Factory} will be used instead.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   * @param transferListener An optional listener.
-   * @param connectTimeoutMs The connection timeout, in milliseconds.
-   * @param readTimeoutMs The read timeout, in milliseconds.
-   * @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
-   * @param userAgent The user agent that will be used by the fallback {@link HttpDataSource} if
-   *     needed, or {@code null} for the fallback to use the default user agent of the underlying
-   *     platform.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(
-      CronetEngineWrapper cronetEngineWrapper,
-      Executor executor,
-      @Nullable TransferListener transferListener,
-      int connectTimeoutMs,
-      int readTimeoutMs,
-      boolean resetTimeoutOnRedirects,
-      @Nullable String userAgent) {
-    this(
-        cronetEngineWrapper,
-        executor,
-        transferListener,
-        connectTimeoutMs,
-        readTimeoutMs,
-        resetTimeoutOnRedirects,
-        new DefaultHttpDataSource.Factory()
-            .setUserAgent(userAgent)
-            .setTransferListener(transferListener)
-            .setConnectTimeoutMs(connectTimeoutMs)
-            .setReadTimeoutMs(readTimeoutMs));
-  }
-
-  /**
-   * Creates an instance.
-   *
-   * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, the provided
-   * fallback {@link HttpDataSource.Factory} will be used instead.
-   *
-   * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
-   * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
-   * @param transferListener An optional listener.
-   * @param connectTimeoutMs The connection timeout, in milliseconds.
-   * @param readTimeoutMs The read timeout, in milliseconds.
-   * @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
-   * @param fallbackFactory A {@link HttpDataSource.Factory} which is used as a fallback in case no
-   *     suitable CronetEngine can be build.
-   */
-  @SuppressWarnings("deprecation") // Intentionally using deprecated parameter
-  public CronetDataSourceFactory(
-      CronetEngineWrapper cronetEngineWrapper,
-      Executor executor,
-      @Nullable TransferListener transferListener,
-      int connectTimeoutMs,
-      int readTimeoutMs,
-      boolean resetTimeoutOnRedirects,
-      HttpDataSource.Factory fallbackFactory) {
-    this.cronetEngineWrapper = cronetEngineWrapper;
-    this.executor = executor;
-    this.transferListener = transferListener;
-    this.connectTimeoutMs = connectTimeoutMs;
-    this.readTimeoutMs = readTimeoutMs;
-    this.resetTimeoutOnRedirects = resetTimeoutOnRedirects;
-    this.fallbackFactory = fallbackFactory;
-  }
-
-  @Override
-  protected HttpDataSource createDataSourceInternal(
-      HttpDataSource.RequestProperties defaultRequestProperties) {
-    @Nullable CronetEngine cronetEngine = cronetEngineWrapper.getCronetEngine();
-    if (cronetEngine == null) {
-      return fallbackFactory.createDataSource();
-    }
-    CronetDataSource dataSource =
-        new CronetDataSource(
-            cronetEngine,
-            executor,
-            REQUEST_PRIORITY_MEDIUM,
-            connectTimeoutMs,
-            readTimeoutMs,
-            resetTimeoutOnRedirects,
-            /* handleSetCookieRequests= */ false,
-            /* userAgent= */ null,
-            defaultRequestProperties,
-            /* contentTypePredicate= */ null,
-            /* keepPostFor302Redirects= */ false,
-            CronetDataSource.DEFAULT_READ_BUFFER_SIZE_BYTES);
-    if (transferListener != null) {
-      dataSource.addTransferListener(transferListener);
-    }
-    return dataSource;
-  }
-}