diff --git a/cobalt/media/base/pipeline.h b/cobalt/media/base/pipeline.h
index 265743ac2c27..8c8fe3d6cd66 100644
--- a/cobalt/media/base/pipeline.h
+++ b/cobalt/media/base/pipeline.h
@@ -30,7 +30,7 @@
 #include "third_party/chromium/media/base/media_log.h"
 #include "third_party/chromium/media/base/pipeline_status.h"
 #include "third_party/chromium/media/base/ranges.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {
diff --git a/cobalt/media/base/sbplayer_bridge.h b/cobalt/media/base/sbplayer_bridge.h
index 4f1c1406c1b5..f4d911f30130 100644
--- a/cobalt/media/base/sbplayer_bridge.h
+++ b/cobalt/media/base/sbplayer_bridge.h
@@ -35,7 +35,7 @@
 #include "third_party/chromium/media/base/decoder_buffer.h"
 #include "third_party/chromium/media/base/demuxer_stream.h"
 #include "third_party/chromium/media/base/video_decoder_config.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cobalt {
 namespace media {
diff --git a/cobalt/media/base/sbplayer_pipeline.h b/cobalt/media/base/sbplayer_pipeline.h
index facffc226c14..6e4931d146d5 100644
--- a/cobalt/media/base/sbplayer_pipeline.h
+++ b/cobalt/media/base/sbplayer_pipeline.h
@@ -42,8 +42,8 @@
 #include "third_party/chromium/media/base/pipeline_status.h"
 #include "third_party/chromium/media/base/ranges.h"
 #include "third_party/chromium/media/base/video_decoder_config.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {
diff --git a/cobalt/media/base/sbplayer_set_bounds_helper.h b/cobalt/media/base/sbplayer_set_bounds_helper.h
index c5f4b95b5151..907a8bc50aa2 100644
--- a/cobalt/media/base/sbplayer_set_bounds_helper.h
+++ b/cobalt/media/base/sbplayer_set_bounds_helper.h
@@ -18,7 +18,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/optional.h"
 #include "base/synchronization/lock.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cobalt {
 namespace media {
diff --git a/cobalt/media/player/web_media_player_impl.cc b/cobalt/media/player/web_media_player_impl.cc
index d388b820d3b9..d163bd7989a3 100644
--- a/cobalt/media/player/web_media_player_impl.cc
+++ b/cobalt/media/player/web_media_player_impl.cc
@@ -32,8 +32,8 @@
 #include "third_party/chromium/media/base/bind_to_current_loop.h"
 #include "third_party/chromium/media/base/limits.h"
 #include "third_party/chromium/media/base/timestamp_constants.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 #include "third_party/chromium/media/filters/chunk_demuxer.h"
 
 namespace cobalt {
diff --git a/cobalt/media/progressive/avc_parser.h b/cobalt/media/progressive/avc_parser.h
index b203dc7fd224..e4569b340426 100644
--- a/cobalt/media/progressive/avc_parser.h
+++ b/cobalt/media/progressive/avc_parser.h
@@ -19,8 +19,8 @@
 
 #include "cobalt/media/progressive/progressive_parser.h"
 #include "third_party/chromium/media/base/media_log.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {
diff --git a/cobalt/media/progressive/demuxer_extension_wrapper.cc b/cobalt/media/progressive/demuxer_extension_wrapper.cc
index a0de4ee4556b..faf6f70b753b 100644
--- a/cobalt/media/progressive/demuxer_extension_wrapper.cc
+++ b/cobalt/media/progressive/demuxer_extension_wrapper.cc
@@ -30,9 +30,9 @@
 #include "third_party/chromium/media/base/sample_format.h"
 #include "third_party/chromium/media/base/starboard_utils.h"
 #include "third_party/chromium/media/base/video_types.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/color_space.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/color_space.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 #include "third_party/chromium/media/filters/h264_to_annex_b_bitstream_converter.h"
 #include "third_party/chromium/media/formats/mp4/box_definitions.h"
 
diff --git a/cobalt/media/sandbox/format_guesstimator.cc b/cobalt/media/sandbox/format_guesstimator.cc
index dfe5e85cbbe0..d3652ce258d9 100644
--- a/cobalt/media/sandbox/format_guesstimator.cc
+++ b/cobalt/media/sandbox/format_guesstimator.cc
@@ -39,7 +39,7 @@
 #include "starboard/memory.h"
 #include "starboard/types.h"
 #include "third_party/chromium/media/base/timestamp_constants.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {
diff --git a/cobalt/media/sandbox/media_sandbox.cc b/cobalt/media/sandbox/media_sandbox.cc
index 92673ed95068..d02f55be5969 100644
--- a/cobalt/media/sandbox/media_sandbox.cc
+++ b/cobalt/media/sandbox/media_sandbox.cc
@@ -33,7 +33,7 @@
 #include "cobalt/storage/storage_manager.h"
 #include "cobalt/system_window/system_window.h"
 #include "cobalt/trace_event/scoped_trace_to_file.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {
diff --git a/cobalt/media/sandbox/media_sandbox.h b/cobalt/media/sandbox/media_sandbox.h
index 858fa77194b3..70c70a4ba79e 100644
--- a/cobalt/media/sandbox/media_sandbox.h
+++ b/cobalt/media/sandbox/media_sandbox.h
@@ -24,7 +24,7 @@
 #include "cobalt/media/media_module.h"
 #include "cobalt/render_tree/image.h"
 #include "cobalt/render_tree/resource_provider.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {
diff --git a/cobalt/media/sandbox/web_media_player_helper.cc b/cobalt/media/sandbox/web_media_player_helper.cc
index 170b0be6e1be..b7cb41b091d9 100644
--- a/cobalt/media/sandbox/web_media_player_helper.cc
+++ b/cobalt/media/sandbox/web_media_player_helper.cc
@@ -20,7 +20,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "cobalt/media/file_data_source.h"
 #include "cobalt/media/url_fetcher_data_source.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cobalt {
 namespace media {
diff --git a/cobalt/media/sandbox/web_media_player_helper.h b/cobalt/media/sandbox/web_media_player_helper.h
index 21a58770d6ae..3673364e461a 100644
--- a/cobalt/media/sandbox/web_media_player_helper.h
+++ b/cobalt/media/sandbox/web_media_player_helper.h
@@ -23,7 +23,7 @@
 #include "cobalt/media/base/decode_target_provider.h"
 #include "cobalt/media/media_module.h"
 #include "cobalt/media/player/web_media_player.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
 namespace cobalt {
diff --git a/third_party/chromium/media/BUILD.gn b/third_party/chromium/media/BUILD.gn
index 62acc411b9a8..b90b9ca62204 100644
--- a/third_party/chromium/media/BUILD.gn
+++ b/third_party/chromium/media/BUILD.gn
@@ -224,24 +224,24 @@ component("media") {
     "cobalt/net/cookies/site_for_cookies.h",
 
     #"cobalt/ui/gfx/hdr_metadata.cc",
-    "cobalt/ui/gfx/color_space.h",
-    "cobalt/ui/gfx/color_space_export.h",
-    "cobalt/ui/gfx/geometry/point.cc",
-    "cobalt/ui/gfx/geometry/point.h",
-    "cobalt/ui/gfx/geometry/point3_f.h",
-    "cobalt/ui/gfx/geometry/point_base.h",
-    "cobalt/ui/gfx/geometry/point_f.cc",
-    "cobalt/ui/gfx/geometry/point_f.h",
-    "cobalt/ui/gfx/geometry/rect.h",
-    "cobalt/ui/gfx/geometry/rect_base.h",
-    "cobalt/ui/gfx/geometry/rect_base_impl.h",
-    "cobalt/ui/gfx/geometry/size.h",
-    "cobalt/ui/gfx/geometry/size_base.h",
-    "cobalt/ui/gfx/geometry/size_f.h",
-    "cobalt/ui/gfx/geometry/vector2d.h",
-    "cobalt/ui/gfx/geometry/vector2d_f.h",
-    "cobalt/ui/gfx/hdr_metadata.h",
-    "cobalt/ui/gfx/native_pixmap_handle.h",
+    "//ui/gfx/color_space.h",
+    "//ui/gfx/color_space_export.h",
+    "//ui/gfx/geometry/point.cc",
+    "//ui/gfx/geometry/point.h",
+    "//ui/gfx/geometry/point3_f.h",
+    "//ui/gfx/geometry/point_base.h",
+    "//ui/gfx/geometry/point_f.cc",
+    "//ui/gfx/geometry/point_f.h",
+    "//ui/gfx/geometry/rect.h",
+    "//ui/gfx/geometry/rect_base.h",
+    "//ui/gfx/geometry/rect_base_impl.h",
+    "//ui/gfx/geometry/size.h",
+    "//ui/gfx/geometry/size_base.h",
+    "//ui/gfx/geometry/size_f.h",
+    "//ui/gfx/geometry/vector2d.h",
+    "//ui/gfx/geometry/vector2d_f.h",
+    "//ui/gfx/hdr_metadata.h",
+    "//ui/gfx/native_pixmap_handle.h",
   ]
 
   configs -= [ "//starboard/build/config:size" ]
diff --git a/ui/gfx/METADATA b/ui/gfx/METADATA
new file mode 100644
index 000000000000..6ed0bf49394e
--- /dev/null
+++ b/ui/gfx/METADATA
@@ -0,0 +1,15 @@
+third_party {
+  identifier {
+    type: "ChromiumVersion"
+    value: "96.0.4664.219"  # from https://chromereleases.googleblog.com/2022/08/long-term-support-channel-update-for_31.html
+  }
+  identifier {
+    type: "Git"
+    value: "https://chromium.googlesource.com/chromium/src.git"
+    version: "6a496db5ef7219101beacceca9566367c9cb1a09"
+  }
+  identifier {
+    type: "UpstreamSubdir"
+    value: "ui/gfx"
+  }
+}
diff --git a/third_party/chromium/media/cobalt/ui/gfx/color_space.h b/ui/gfx/color_space.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/color_space.h
rename to ui/gfx/color_space.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/color_space_export.h b/ui/gfx/color_space_export.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/color_space_export.h
rename to ui/gfx/color_space_export.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/point.cc b/ui/gfx/geometry/point.cc
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/point.cc
rename to ui/gfx/geometry/point.cc
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/point.h b/ui/gfx/geometry/point.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/point.h
rename to ui/gfx/geometry/point.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/point3_f.h b/ui/gfx/geometry/point3_f.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/point3_f.h
rename to ui/gfx/geometry/point3_f.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/point_base.h b/ui/gfx/geometry/point_base.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/point_base.h
rename to ui/gfx/geometry/point_base.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/point_f.cc b/ui/gfx/geometry/point_f.cc
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/point_f.cc
rename to ui/gfx/geometry/point_f.cc
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/point_f.h b/ui/gfx/geometry/point_f.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/point_f.h
rename to ui/gfx/geometry/point_f.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h b/ui/gfx/geometry/rect.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h
rename to ui/gfx/geometry/rect.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/rect_base.h b/ui/gfx/geometry/rect_base.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/rect_base.h
rename to ui/gfx/geometry/rect_base.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/rect_base_impl.h b/ui/gfx/geometry/rect_base_impl.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/rect_base_impl.h
rename to ui/gfx/geometry/rect_base_impl.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/size.h b/ui/gfx/geometry/size.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/size.h
rename to ui/gfx/geometry/size.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/size_base.h b/ui/gfx/geometry/size_base.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/size_base.h
rename to ui/gfx/geometry/size_base.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/size_f.h b/ui/gfx/geometry/size_f.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/size_f.h
rename to ui/gfx/geometry/size_f.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/vector2d.h b/ui/gfx/geometry/vector2d.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/vector2d.h
rename to ui/gfx/geometry/vector2d.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/geometry/vector2d_f.h b/ui/gfx/geometry/vector2d_f.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/geometry/vector2d_f.h
rename to ui/gfx/geometry/vector2d_f.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/hdr_metadata.h b/ui/gfx/hdr_metadata.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/hdr_metadata.h
rename to ui/gfx/hdr_metadata.h
diff --git a/third_party/chromium/media/cobalt/ui/gfx/native_pixmap_handle.h b/ui/gfx/native_pixmap_handle.h
similarity index 100%
rename from third_party/chromium/media/cobalt/ui/gfx/native_pixmap_handle.h
rename to ui/gfx/native_pixmap_handle.h