diff --git a/DEPS b/DEPS
index a13c5e5e..ced1a5f 100644
--- a/DEPS
+++ b/DEPS
@@ -312,15 +312,15 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'e3c3a52730f0994f6b3e81d87ad0f0d4aab38bf8',
+  'skia_revision': 'ef2511b0a6f21b4bb43414ac0571d755791ae22a',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': 'b5c3d32f28d7af9f527a5eddca570c11e14303c9',
+  'v8_revision': 'ea012d232c66229b2d4f3f2a268aa999d668972b',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '434a5b01707deca484b50a2a16c55f466b3d4a2b',
+  'angle_revision': 'a971e5b42e1e8e61ccb0d8e4b3f2245aaa4f2d4d',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -383,7 +383,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '43f9843685a94edea50b66b2ec1a41874f6cfd9f',
+  'catapult_revision': '2ee42b4fee621515571f90e0aac3098caad8e712',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling chromium_variations
   # and whatever else without interference from each other.
@@ -447,7 +447,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libavif
   # and whatever else without interference from each other.
-  'libavif_revision': 'e88a7535f890c710768cea89b68a1c092da32506',
+  'libavif_revision': 'cdb1c3df9f3e02b2bbe2686474440a081ebb9b6a',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libavifinfo
   # and whatever else without interference from each other.
@@ -827,7 +827,7 @@
 
   'src/clank': {
     'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' +
-    '6722cfca9cc136161f35d110d60e7f3ef184febf',
+    'ed4b774419588a1496c267e4b9ba422d20ea8552',
     'condition': 'checkout_android and checkout_src_internal',
   },
 
@@ -1199,7 +1199,7 @@
   },
 
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '50de666ba40a4808daf9791fece3d8a43228a1de',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '1ac3eb7b9844751478c7bdae4614f4d1e8b9b0f8',
 
   'src/third_party/devtools-frontend/src':
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
@@ -1850,7 +1850,7 @@
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '98673cc24786be6c10dd8908e0b0b4ed27625c6a',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + '3afa1b2ce8295e11d4f18b52050c01434772fb26',
+    Var('webrtc_git') + '/src.git' + '@' + 'c935bb2141e2e616e1f9e1df4568d976ad1828c0',
 
   # Wuffs' canonical repository is at github.com/google/wuffs, but we use
   # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file.
diff --git a/ash/accessibility/accessibility_controller.cc b/ash/accessibility/accessibility_controller.cc
index 91b9d49..e8d9756 100644
--- a/ash/accessibility/accessibility_controller.cc
+++ b/ash/accessibility/accessibility_controller.cc
@@ -1933,16 +1933,6 @@
     client_->SilenceSpokenFeedback();
 }
 
-void AccessibilityController::OnTwoFingerTouchStart() {
-  if (client_)
-    client_->OnTwoFingerTouchStart();
-}
-
-void AccessibilityController::OnTwoFingerTouchStop() {
-  if (client_)
-    client_->OnTwoFingerTouchStop();
-}
-
 bool AccessibilityController::ShouldToggleSpokenFeedbackViaTouch() const {
   return client_ && client_->ShouldToggleSpokenFeedbackViaTouch();
 }
diff --git a/ash/accessibility/accessibility_controller.h b/ash/accessibility/accessibility_controller.h
index 1ad35cf..292b639 100644
--- a/ash/accessibility/accessibility_controller.h
+++ b/ash/accessibility/accessibility_controller.h
@@ -383,14 +383,6 @@
   // Toggle dictation.
   void ToggleDictation();
 
-  // Called when we first detect two fingers are held down, which can be used to
-  // toggle spoken feedback on some touch-only devices.
-  void OnTwoFingerTouchStart();
-
-  // Called when the user is no longer holding down two fingers (including
-  // releasing one, holding down three, or moving them).
-  void OnTwoFingerTouchStop();
-
   // Whether or not to enable toggling spoken feedback via holding down two
   // fingers on the screen.
   bool ShouldToggleSpokenFeedbackViaTouch() const;
diff --git a/ash/accessibility/chromevox/touch_accessibility_enabler.cc b/ash/accessibility/chromevox/touch_accessibility_enabler.cc
index 406403e7..39889b34 100644
--- a/ash/accessibility/chromevox/touch_accessibility_enabler.cc
+++ b/ash/accessibility/chromevox/touch_accessibility_enabler.cc
@@ -24,14 +24,9 @@
 
 namespace {
 
-// Delay between timer callbacks. Each one plays a tick sound.
-constexpr auto kTimerDelay = base::Milliseconds(500);
-
-// The number of ticks of the timer before the first sound is generated.
-constexpr int kTimerTicksOfFirstSoundFeedback = 6;
-
-// The number of ticks of the timer before toggling spoken feedback.
-constexpr int kTimerTicksToToggleSpokenFeedback = 10;
+// Delay between timer callbacks which triggers toggling ChromeVox.
+// CFM expects 2 seconds.
+constexpr auto kTimerDelay = base::Seconds(2);
 
 }  // namespace
 
@@ -123,9 +118,7 @@
   } else if (state_ == ONE_FINGER_DOWN &&
              event.type() == ui::ET_TOUCH_PRESSED) {
     state_ = TWO_FINGERS_DOWN;
-    two_finger_start_time_ = Now();
     StartTimer();
-    delegate_->OnTwoFingerTouchStart();
   }
 }
 
@@ -144,8 +137,9 @@
 }
 
 void TouchAccessibilityEnabler::StartTimer() {
-  if (timer_.IsRunning())
+  if (timer_.IsRunning()) {
     return;
+  }
 
   timer_.Start(FROM_HERE, kTimerDelay, this,
                &TouchAccessibilityEnabler::OnTimer);
@@ -154,25 +148,12 @@
 void TouchAccessibilityEnabler::CancelTimer() {
   if (timer_.IsRunning()) {
     timer_.Stop();
-    delegate_->OnTwoFingerTouchStop();
   }
 }
 
 void TouchAccessibilityEnabler::OnTimer() {
-  const int tick_count =
-      base::ClampRound((Now() - two_finger_start_time_) / kTimerDelay);
-
-  if (tick_count == kTimerTicksOfFirstSoundFeedback) {
-    base::RecordAction(
-        base::UserMetricsAction("Accessibility.TwoFingersHeldDown"));
-  }
-
-  if (tick_count >= kTimerTicksOfFirstSoundFeedback &&
-      tick_count < kTimerTicksToToggleSpokenFeedback) {
-    delegate_->PlaySpokenFeedbackToggleCountdown(tick_count);
-  }
-  if (tick_count == kTimerTicksToToggleSpokenFeedback) {
-    delegate_->ToggleSpokenFeedback();
+  delegate_->ToggleSpokenFeedback();
+  if (state_ != NO_FINGERS_DOWN) {
     state_ = WAIT_FOR_NO_FINGERS;
   }
 }
diff --git a/ash/accessibility/chromevox/touch_accessibility_enabler.h b/ash/accessibility/chromevox/touch_accessibility_enabler.h
index 2292fc81..a7c964f 100644
--- a/ash/accessibility/chromevox/touch_accessibility_enabler.h
+++ b/ash/accessibility/chromevox/touch_accessibility_enabler.h
@@ -29,19 +29,6 @@
  public:
   virtual ~TouchAccessibilityEnablerDelegate() {}
 
-  // Called when we first detect two fingers are held down.
-  virtual void OnTwoFingerTouchStart() {}
-
-  // Called when the user is no longer holding down two fingers (including
-  // releasing one, holding down three, or moving them).
-  virtual void OnTwoFingerTouchStop() {}
-
-  // While the user holds down two fingers on a touch screen, which is the
-  // gesture to enable spoken feedback (if held down long enough), play a sound
-  // every "tick" (approximately every half-second) to warn the user something
-  // is about to happen.
-  virtual void PlaySpokenFeedbackToggleCountdown(int tick_count) {}
-
   // Toggles spoken feedback.
   virtual void ToggleSpokenFeedback() {}
 };
@@ -117,14 +104,11 @@
   // The current state.
   State state_;
 
-  // The time when we entered the two finger state.
-  base::TimeTicks two_finger_start_time_;
-
   // Map of touch ids to their initial locations.
   std::map<int, gfx::PointF> touch_locations_;
 
-  // A timer that triggers repeatedly while two fingers are held down.
-  base::RepeatingTimer timer_;
+  // A timer that triggers after two fingers are held down for a given duration.
+  base::RetainingOneShotTimer timer_;
 
   // A default gesture detector config, so we can share the same
   // timeout and pixel slop constants.
diff --git a/ash/accessibility/chromevox/touch_accessibility_enabler_unittest.cc b/ash/accessibility/chromevox/touch_accessibility_enabler_unittest.cc
index 59e5b0e..49d3dbd9 100644
--- a/ash/accessibility/chromevox/touch_accessibility_enabler_unittest.cc
+++ b/ash/accessibility/chromevox/touch_accessibility_enabler_unittest.cc
@@ -35,26 +35,10 @@
 
   ~MockTouchAccessibilityEnablerDelegate() override {}
 
-  void OnTwoFingerTouchStart() override { started_ = true; }
-
-  void OnTwoFingerTouchStop() override { stopped_ = true; }
-
-  void PlaySpokenFeedbackToggleCountdown(int tick_count) override {
-    ++feedback_progress_sound_count_;
-  }
   void ToggleSpokenFeedback() override { toggle_spoken_feedback_ = true; }
-
-  bool started() { return started_; }
-  bool stopped() { return stopped_; }
-  size_t feedback_progress_sound_count() const {
-    return feedback_progress_sound_count_;
-  }
   bool toggle_spoken_feedback() const { return toggle_spoken_feedback_; }
 
  private:
-  bool started_ = false;
-  bool stopped_ = false;
-  size_t feedback_progress_sound_count_ = 0;
   bool toggle_spoken_feedback_ = false;
 };
 
@@ -153,25 +137,6 @@
   EXPECT_TRUE(enabler_->IsInTwoFingersDownForTesting());
 }
 
-TEST_F(TouchAccessibilityEnablerTest, PlaysProgressSound) {
-  EXPECT_TRUE(enabler_->IsInNoFingersDownForTesting());
-  generator_->set_current_screen_location(gfx::Point(11, 12));
-  generator_->PressTouchId(1);
-
-  generator_->set_current_screen_location(gfx::Point(22, 34));
-  generator_->PressTouchId(2);
-
-  EXPECT_TRUE(enabler_->IsInTwoFingersDownForTesting());
-  EXPECT_EQ(0U, delegate_.feedback_progress_sound_count());
-
-  enabler_->TriggerOnTimerForTesting();
-  EXPECT_EQ(0U, delegate_.feedback_progress_sound_count());
-
-  simulated_clock_.Advance(base::Milliseconds(3000));
-  enabler_->TriggerOnTimerForTesting();
-  EXPECT_EQ(1U, delegate_.feedback_progress_sound_count());
-}
-
 TEST_F(TouchAccessibilityEnablerTest, TogglesSpokenFeedback) {
   EXPECT_TRUE(enabler_->IsInNoFingersDownForTesting());
   generator_->set_current_screen_location(gfx::Point(11, 12));
@@ -182,17 +147,10 @@
 
   EXPECT_TRUE(enabler_->IsInTwoFingersDownForTesting());
   EXPECT_FALSE(delegate_.toggle_spoken_feedback());
-  EXPECT_TRUE(delegate_.started());
-  EXPECT_FALSE(delegate_.stopped());
-
-  enabler_->TriggerOnTimerForTesting();
-  EXPECT_FALSE(delegate_.toggle_spoken_feedback());
 
   simulated_clock_.Advance(base::Milliseconds(5000));
   enabler_->TriggerOnTimerForTesting();
   EXPECT_TRUE(delegate_.toggle_spoken_feedback());
-  EXPECT_TRUE(delegate_.started());
-  EXPECT_FALSE(delegate_.stopped());
 }
 
 TEST_F(TouchAccessibilityEnablerTest, ThreeFingersCancelsDetection) {
@@ -204,15 +162,11 @@
   generator_->PressTouchId(2);
 
   EXPECT_TRUE(enabler_->IsInTwoFingersDownForTesting());
-  EXPECT_TRUE(delegate_.started());
-  EXPECT_FALSE(delegate_.stopped());
 
   generator_->set_current_screen_location(gfx::Point(33, 56));
   generator_->PressTouchId(3);
 
   EXPECT_TRUE(enabler_->IsInWaitForNoFingersForTesting());
-  EXPECT_TRUE(delegate_.started());
-  EXPECT_TRUE(delegate_.stopped());
 }
 
 TEST_F(TouchAccessibilityEnablerTest, MovingFingerPastSlopCancelsDetection) {
diff --git a/ash/accessibility/chromevox/touch_exploration_manager.cc b/ash/accessibility/chromevox/touch_exploration_manager.cc
index 6e2dc93..a359414b 100644
--- a/ash/accessibility/chromevox/touch_exploration_manager.cc
+++ b/ash/accessibility/chromevox/touch_exploration_manager.cc
@@ -148,23 +148,6 @@
     UpdateTouchExplorationState();
 }
 
-void TouchExplorationManager::OnTwoFingerTouchStart() {
-  GetA11yController()->OnTwoFingerTouchStart();
-}
-
-void TouchExplorationManager::OnTwoFingerTouchStop() {
-  // Can be null during shutdown.
-  if (AccessibilityController* controller = GetA11yController()) {
-    controller->OnTwoFingerTouchStop();
-  }
-}
-
-void TouchExplorationManager::PlaySpokenFeedbackToggleCountdown(
-    int tick_count) {
-  if (GetA11yController()->ShouldToggleSpokenFeedbackViaTouch())
-    GetA11yController()->PlaySpokenFeedbackToggleCountdown(tick_count);
-}
-
 void TouchExplorationManager::PlayTouchTypeEarcon() {
   GetA11yController()->PlayEarcon(Sound::kTouchType);
 }
diff --git a/ash/accessibility/chromevox/touch_exploration_manager.h b/ash/accessibility/chromevox/touch_exploration_manager.h
index 0f406e6..0d34b950 100644
--- a/ash/accessibility/chromevox/touch_exploration_manager.h
+++ b/ash/accessibility/chromevox/touch_exploration_manager.h
@@ -72,9 +72,6 @@
                                uint32_t changed_metrics) override;
 
   // TouchAccessibilityEnablerDelegate overrides:
-  void OnTwoFingerTouchStart() override;
-  void OnTwoFingerTouchStop() override;
-  void PlaySpokenFeedbackToggleCountdown(int tick_count) override;
   void PlayTouchTypeEarcon() override;
   void ToggleSpokenFeedback() override;
 
diff --git a/ash/accessibility/test_accessibility_controller_client.cc b/ash/accessibility/test_accessibility_controller_client.cc
index c8504253..dd3def9b 100644
--- a/ash/accessibility/test_accessibility_controller_client.cc
+++ b/ash/accessibility/test_accessibility_controller_client.cc
@@ -54,10 +54,6 @@
 
 void TestAccessibilityControllerClient::SilenceSpokenFeedback() {}
 
-void TestAccessibilityControllerClient::OnTwoFingerTouchStart() {}
-
-void TestAccessibilityControllerClient::OnTwoFingerTouchStop() {}
-
 bool TestAccessibilityControllerClient::ShouldToggleSpokenFeedbackViaTouch()
     const {
   return true;
diff --git a/ash/accessibility/test_accessibility_controller_client.h b/ash/accessibility/test_accessibility_controller_client.h
index 3751b86..825aaef 100644
--- a/ash/accessibility/test_accessibility_controller_client.h
+++ b/ash/accessibility/test_accessibility_controller_client.h
@@ -41,8 +41,6 @@
                                   gfx::PointF location) override;
   bool ToggleDictation() override;
   void SilenceSpokenFeedback() override;
-  void OnTwoFingerTouchStart() override;
-  void OnTwoFingerTouchStop() override;
   bool ShouldToggleSpokenFeedbackViaTouch() const override;
   void PlaySpokenFeedbackToggleCountdown(int tick_count) override;
   void RequestSelectToSpeakStateChange() override;
diff --git a/ash/picker/model/picker_search_results_section.cc b/ash/picker/model/picker_search_results_section.cc
index 8ad69eed6..590c738 100644
--- a/ash/picker/model/picker_search_results_section.cc
+++ b/ash/picker/model/picker_search_results_section.cc
@@ -4,6 +4,9 @@
 
 #include "ash/picker/model/picker_search_results_section.h"
 
+#include <utility>
+#include <vector>
+
 #include "ash/public/cpp/picker/picker_search_result.h"
 #include "base/containers/span.h"
 
@@ -11,8 +14,8 @@
 
 PickerSearchResultsSection::PickerSearchResultsSection(
     PickerSectionType type,
-    base::span<const PickerSearchResult> results)
-    : type_(type), results_(results.begin(), results.end()) {}
+    std::vector<PickerSearchResult> results)
+    : type_(type), results_(std::move(results)) {}
 
 PickerSearchResultsSection::PickerSearchResultsSection(
     const PickerSearchResultsSection& other) = default;
@@ -20,6 +23,12 @@
 PickerSearchResultsSection& PickerSearchResultsSection::operator=(
     const PickerSearchResultsSection& other) = default;
 
+PickerSearchResultsSection::PickerSearchResultsSection(
+    PickerSearchResultsSection&& other) = default;
+
+PickerSearchResultsSection& PickerSearchResultsSection::operator=(
+    PickerSearchResultsSection&& other) = default;
+
 PickerSearchResultsSection::~PickerSearchResultsSection() = default;
 
 PickerSectionType PickerSearchResultsSection::type() const {
diff --git a/ash/picker/model/picker_search_results_section.h b/ash/picker/model/picker_search_results_section.h
index 508d972..aa00b9b 100644
--- a/ash/picker/model/picker_search_results_section.h
+++ b/ash/picker/model/picker_search_results_section.h
@@ -27,12 +27,13 @@
 // Search results are divided into different sections.
 class ASH_EXPORT PickerSearchResultsSection {
  public:
-  explicit PickerSearchResultsSection(
-      PickerSectionType type,
-      base::span<const PickerSearchResult> results);
+  explicit PickerSearchResultsSection(PickerSectionType type,
+                                      std::vector<PickerSearchResult> results);
   PickerSearchResultsSection(const PickerSearchResultsSection& other);
   PickerSearchResultsSection& operator=(
       const PickerSearchResultsSection& other);
+  PickerSearchResultsSection(PickerSearchResultsSection&& other);
+  PickerSearchResultsSection& operator=(PickerSearchResultsSection&& other);
   ~PickerSearchResultsSection();
 
   PickerSectionType type() const;
diff --git a/ash/picker/picker_search_controller.cc b/ash/picker/picker_search_controller.cc
index 8bac265..43b8123 100644
--- a/ash/picker/picker_search_controller.cc
+++ b/ash/picker/picker_search_controller.cc
@@ -161,7 +161,7 @@
   std::vector<PickerSearchResultsSection> sections;
   if (!suggested_results_.empty()) {
     sections.push_back(PickerSearchResultsSection(
-        PickerSectionType::kSuggestions, suggested_results_));
+        PickerSectionType::kSuggestions, std::move(suggested_results_)));
   }
   if (!category_results_.empty()) {
     sections.push_back(PickerSearchResultsSection(
@@ -337,7 +337,7 @@
   }
 
   if (result.has_value()) {
-    suggested_results_.push_back(*result);
+    suggested_results_.push_back(*std::move(result));
   }
 }
 
diff --git a/ash/picker/views/picker_view.cc b/ash/picker/views/picker_view.cc
index 11fc9dd..96fe80b7 100644
--- a/ash/picker/views/picker_view.cc
+++ b/ash/picker/views/picker_view.cc
@@ -5,6 +5,7 @@
 #include "ash/picker/views/picker_view.h"
 
 #include <memory>
+#include <utility>
 
 #include "ash/ash_element_identifiers.h"
 #include "ash/picker/model/picker_search_results_section.h"
@@ -271,7 +272,7 @@
 
 void PickerView::PublishCategoryResults(
     std::vector<PickerSearchResultsSection> results) {
-  category_view_->SetResults(results);
+  category_view_->SetResults(std::move(results));
 }
 
 void PickerView::AddSearchFieldView() {
diff --git a/ash/public/cpp/accessibility_controller_client.h b/ash/public/cpp/accessibility_controller_client.h
index 54d1b1a..e06ffafb 100644
--- a/ash/public/cpp/accessibility_controller_client.h
+++ b/ash/public/cpp/accessibility_controller_client.h
@@ -61,14 +61,6 @@
   // Cancels all current and queued speech immediately.
   virtual void SilenceSpokenFeedback() = 0;
 
-  // Called when we first detect two fingers are held down, which can be used to
-  // toggle spoken feedback on some touch-only devices.
-  virtual void OnTwoFingerTouchStart() = 0;
-
-  // Called when the user is no longer holding down two fingers (including
-  // releasing one, holding down three, or moving them).
-  virtual void OnTwoFingerTouchStop() = 0;
-
   // Whether or not to enable toggling spoken feedback via holding down two
   // fingers on the screen.
   virtual bool ShouldToggleSpokenFeedbackViaTouch() const = 0;
diff --git a/ash/public/cpp/picker/picker_search_result.cc b/ash/public/cpp/picker/picker_search_result.cc
index 22769b7..cc8f1f87 100644
--- a/ash/public/cpp/picker/picker_search_result.cc
+++ b/ash/public/cpp/picker/picker_search_result.cc
@@ -63,6 +63,11 @@
 PickerSearchResult& PickerSearchResult::operator=(const PickerSearchResult&) =
     default;
 
+PickerSearchResult::PickerSearchResult(PickerSearchResult&&) = default;
+
+PickerSearchResult& PickerSearchResult::operator=(PickerSearchResult&&) =
+    default;
+
 PickerSearchResult PickerSearchResult::Text(std::u16string_view text) {
   return PickerSearchResult(TextData{.text = std::u16string(text)});
 }
diff --git a/ash/public/cpp/picker/picker_search_result.h b/ash/public/cpp/picker/picker_search_result.h
index 3ff9293..bff4b59 100644
--- a/ash/public/cpp/picker/picker_search_result.h
+++ b/ash/public/cpp/picker/picker_search_result.h
@@ -102,6 +102,8 @@
 
   PickerSearchResult(const PickerSearchResult&);
   PickerSearchResult& operator=(const PickerSearchResult&);
+  PickerSearchResult(PickerSearchResult&&);
+  PickerSearchResult& operator=(PickerSearchResult&&);
   ~PickerSearchResult();
 
   static PickerSearchResult BrowsingHistory(const GURL& url,
diff --git a/ash/wm/window_restore/pine_contents_view.cc b/ash/wm/window_restore/pine_contents_view.cc
index 11b9f348..e94c74c 100644
--- a/ash/wm/window_restore/pine_contents_view.cc
+++ b/ash/wm/window_restore/pine_contents_view.cc
@@ -108,6 +108,7 @@
                               PillButton::Type::kPrimaryWithoutIcon)
                           .SetText(u"Restore"),
                       views::Builder<PillButton>()
+                          .CopyAddressTo(&cancel_button_for_testing_)
                           .SetCallback(base::BindRepeating(
                               &PineContentsView::OnCancelButtonPressed,
                               weak_ptr_factory_.GetWeakPtr()))
diff --git a/ash/wm/window_restore/pine_contents_view.h b/ash/wm/window_restore/pine_contents_view.h
index d7f0d38..061a349 100644
--- a/ash/wm/window_restore/pine_contents_view.h
+++ b/ash/wm/window_restore/pine_contents_view.h
@@ -37,10 +37,13 @@
 
   static std::unique_ptr<views::Widget> Create(aura::Window* root);
 
-  // TODO(sammiequon): Move this to a test api.
+  // TODO(sammiequon): Move these to a test api.
   const PillButton* restore_button_for_testing() const {
     return restore_button_for_testing_;
   }
+  const PillButton* cancel_button_for_testing() const {
+    return cancel_button_for_testing_;
+  }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(PineContextMenuModelTest,
@@ -64,6 +67,7 @@
   std::unique_ptr<views::MenuRunner> menu_runner_;
 
   raw_ptr<PillButton> restore_button_for_testing_ = nullptr;
+  raw_ptr<PillButton> cancel_button_for_testing_ = nullptr;
 
   raw_ptr<PineItemsContainerView> container_view_ = nullptr;
 
diff --git a/build/sanitizers/tsan_suppressions.cc b/build/sanitizers/tsan_suppressions.cc
index 2f3b3826..e228610 100644
--- a/build/sanitizers/tsan_suppressions.cc
+++ b/build/sanitizers/tsan_suppressions.cc
@@ -42,9 +42,6 @@
     // http://crbug.com/476529
     "deadlock:cc::VideoLayerImpl::WillDraw\n"
 
-    // http://crbug.com/328826
-    "race:skia::(anonymous namespace)::g_pixel_geometry\n"
-
     // http://crbug.com/328868
     "race:PR_Lock\n"
 
diff --git a/chrome/VERSION b/chrome/VERSION
index 59a1b03..dbaf13a8 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
 MAJOR=124
 MINOR=0
-BUILD=6329
+BUILD=6330
 PATCH=0
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
index 36e8638..d776661a 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
@@ -345,6 +345,9 @@
         setupToolbarEditText();
 
         mModel.set(TabGridDialogProperties.MENU_CLICK_LISTENER, getMenuButtonClickListener());
+        mModel.set(
+                TabGridDialogProperties.SHARE_INVITE_CLICK_LISTENER,
+                getShareInviteButtonClickListener());
     }
 
     void hideDialog(boolean showAnimation) {
@@ -656,6 +659,13 @@
                 mToolbarMenuCallback);
     }
 
+    private View.OnClickListener getShareInviteButtonClickListener() {
+        return view -> {
+            // TODO(b/325082444): Ask data sharing service about if the tab group is shared.
+            mModel.set(TabGridDialogProperties.IS_TAB_GROUP_SHARED, true);
+        };
+    }
+
     private List<Tab> getRelatedTabs(int tabId) {
         return mCurrentTabModelFilterSupplier.get().getRelatedTabList(tabId);
     }
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogProperties.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogProperties.java
index b339724..a50a02fd 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogProperties.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogProperties.java
@@ -26,6 +26,8 @@
             COLLAPSE_CLICK_LISTENER = new PropertyModel.WritableObjectPropertyKey<>();
     public static final PropertyModel.WritableObjectPropertyKey<OnClickListener>
             ADD_CLICK_LISTENER = new PropertyModel.WritableObjectPropertyKey<>();
+    public static final PropertyModel.WritableObjectPropertyKey<OnClickListener>
+            SHARE_INVITE_CLICK_LISTENER = new PropertyModel.WritableObjectPropertyKey<>();
     public static final PropertyModel.WritableObjectPropertyKey<String> HEADER_TITLE =
             new PropertyModel.WritableObjectPropertyKey<>(true);
     public static final PropertyModel.WritableIntPropertyKey CONTENT_TOP_MARGIN =
@@ -40,6 +42,8 @@
             new PropertyModel.WritableBooleanPropertyKey();
     public static final PropertyModel.WritableBooleanPropertyKey SHOULD_SHOW_SHARE =
             new PropertyModel.WritableBooleanPropertyKey();
+    public static final PropertyModel.WritableBooleanPropertyKey IS_TAB_GROUP_SHARED =
+            new PropertyModel.WritableBooleanPropertyKey();
     public static final WritableObjectPropertyKey<TabGridDialogView.VisibilityListener>
             VISIBILITY_LISTENER = new WritableObjectPropertyKey<>();
     public static final PropertyModel.WritableObjectPropertyKey<Runnable> SCRIMVIEW_CLICK_RUNNABLE =
@@ -87,6 +91,7 @@
                 BROWSER_CONTROLS_STATE_PROVIDER,
                 COLLAPSE_CLICK_LISTENER,
                 ADD_CLICK_LISTENER,
+                SHARE_INVITE_CLICK_LISTENER,
                 HEADER_TITLE,
                 PRIMARY_COLOR,
                 DIALOG_BACKGROUND_COLOR,
@@ -108,6 +113,7 @@
                 COLLAPSE_BUTTON_CONTENT_DESCRIPTION,
                 IS_DIALOG_VISIBLE,
                 SHOULD_SHOW_SHARE,
+                IS_TAB_GROUP_SHARED,
                 CONTENT_TOP_MARGIN,
                 IS_MAIN_CONTENT_VISIBLE,
                 INITIAL_SCROLL_INDEX
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogView.java
index c8b1beb..7d61f08f 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogView.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogView.java
@@ -117,6 +117,7 @@
     @ColorInt private int mUngroupBarHoveredTextColor;
     private Integer mBindingToken;
     private boolean mShouldShowShare;
+    private boolean mIsTabGroupShared;
 
     public TabGridDialogView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -834,19 +835,9 @@
             // Add the data sharing bottom toolbar view.
             mDialogContainerView.addView(shareBar);
 
-            ViewGroup manageBar = shareBar.findViewById(R.id.dialog_data_sharing_manage);
-            ButtonCompat inviteButton = shareBar.findViewById(R.id.dialog_share_invite_button);
-
-            // TODO(b/325082444): Update |isTabGroupShared| by asking data sharing service about if
+            // TODO(b/325082444): Update |mIsTabGroupShared| by asking data sharing service about if
             // the tab group is shared.
-            boolean isTabGroupShared = false;
-            if (isTabGroupShared) {
-                manageBar.setVisibility(View.VISIBLE);
-                inviteButton.setVisibility(View.GONE);
-            } else {
-                manageBar.setVisibility(View.GONE);
-                inviteButton.setVisibility(View.VISIBLE);
-            }
+            refreshShareBar(mIsTabGroupShared);
         }
 
         // The snackbar need to be added last to appear on top of any bottom toolbar.
@@ -858,6 +849,31 @@
         recyclerView.setVisibility(View.VISIBLE);
     }
 
+    /**
+     * Refresh the share bar view without resetting the whole dialog.
+     *
+     * @param isTabGroupShared Whether the tab group is shared.
+     */
+    void refreshShareBar(boolean isTabGroupShared) {
+        mIsTabGroupShared = isTabGroupShared;
+        ViewGroup manageBar = mDialogContainerView.findViewById(R.id.dialog_data_sharing_manage);
+        ButtonCompat inviteButton =
+                mDialogContainerView.findViewById(R.id.dialog_share_invite_button);
+
+        // Check for conditions which the sharebar should not show.
+        if (manageBar == null || inviteButton == null || !mShouldShowShare) {
+            return;
+        }
+
+        if (mIsTabGroupShared) {
+            manageBar.setVisibility(View.VISIBLE);
+            inviteButton.setVisibility(View.GONE);
+        } else {
+            manageBar.setVisibility(View.GONE);
+            inviteButton.setVisibility(View.VISIBLE);
+        }
+    }
+
     /** Show {@link PopupWindow} for dialog with animation. */
     void showDialog() {
         if (mCurrentDialogAnimator != null && mCurrentDialogAnimator != mShowDialogAnimation) {
@@ -982,6 +998,19 @@
         mBindingToken = bindingToken;
     }
 
+    /**
+     * Set click listener for the share bar invite button.
+     *
+     * @param listener {@link android.view.View.OnClickListener} for the button.
+     */
+    void setShareInviteOnClickListener(OnClickListener listener) {
+        ButtonCompat inviteButton =
+                mDialogContainerView.findViewById(R.id.dialog_share_invite_button);
+        if (inviteButton != null) {
+            inviteButton.setOnClickListener(listener);
+        }
+    }
+
     Integer getBindingToken() {
         return mBindingToken;
     }
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogViewBinder.java
index 96a72ea..b6c3c85 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogViewBinder.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogViewBinder.java
@@ -21,10 +21,12 @@
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.IS_DIALOG_VISIBLE;
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.IS_KEYBOARD_VISIBLE;
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.IS_MAIN_CONTENT_VISIBLE;
+import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.IS_TAB_GROUP_SHARED;
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.IS_TITLE_TEXT_FOCUSED;
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.MENU_CLICK_LISTENER;
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.PRIMARY_COLOR;
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.SCRIMVIEW_CLICK_RUNNABLE;
+import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.SHARE_INVITE_CLICK_LISTENER;
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.SHOULD_SHOW_SHARE;
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.TINT;
 import static org.chromium.chrome.browser.tasks.tab_management.TabGridDialogProperties.TITLE_CURSOR_VISIBILITY;
@@ -212,6 +214,11 @@
                     model.get(COLLAPSE_BUTTON_CONTENT_DESCRIPTION));
         } else if (SHOULD_SHOW_SHARE == propertyKey) {
             viewHolder.dialogView.updateShouldShowShare(model.get(SHOULD_SHOW_SHARE));
+        } else if (SHARE_INVITE_CLICK_LISTENER == propertyKey) {
+            viewHolder.dialogView.setShareInviteOnClickListener(
+                    model.get(SHARE_INVITE_CLICK_LISTENER));
+        } else if (IS_TAB_GROUP_SHARED == propertyKey) {
+            viewHolder.dialogView.refreshShareBar(model.get(IS_TAB_GROUP_SHARED));
         }
     }
 
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditor.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditor.java
index 36b7fbf..ac0187c 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditor.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditor.java
@@ -6,14 +6,7 @@
 
 import android.content.Context;
 
-import org.chromium.base.ValueChangedCallback;
-import org.chromium.base.supplier.ObservableSupplier;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tabmodel.TabModelFilter;
-import org.chromium.chrome.browser.tabmodel.TabModelObserver;
-import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter;
-import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilterObserver;
 import org.chromium.chrome.tab_ui.R;
 import org.chromium.ui.modelutil.PropertyModel;
 
@@ -24,72 +17,9 @@
  */
 public abstract class TabGroupTitleEditor {
     private final Context mContext;
-    private final ObservableSupplier<TabModelFilter> mCurrentTabModelFilterSupplier;
-    private final TabModelObserver mTabModelObserver;
-    private final TabGroupModelFilterObserver mFilterObserver;
-    private final ValueChangedCallback<TabModelFilter> mCurrentTabModelFilterObserver =
-            new ValueChangedCallback<>(this::onTabModelFilterChanged);
 
-    public TabGroupTitleEditor(
-            Context context, ObservableSupplier<TabModelFilter> tabModelFilterSupplier) {
+    public TabGroupTitleEditor(Context context) {
         mContext = context;
-        mCurrentTabModelFilterSupplier = tabModelFilterSupplier;
-
-        mTabModelObserver =
-                new TabModelObserver() {
-                    @Override
-                    public void tabClosureCommitted(Tab tab) {
-                        var filter = (TabGroupModelFilter) mCurrentTabModelFilterSupplier.get();
-                        int rootId = tab.getRootId();
-                        Tab groupTab = filter.getGroupLastShownTab(rootId);
-                        if (groupTab == null || !filter.isTabInTabGroup(groupTab)) {
-                            deleteTabGroupTitle(rootId);
-                        }
-                    }
-                };
-
-        mFilterObserver =
-                new TabGroupModelFilterObserver() {
-                    @Override
-                    public void willMergeTabToGroup(Tab movedTab, int newRootId) {
-                        String sourceGroupTitle = getTabGroupTitle(movedTab.getRootId());
-                        String targetGroupTitle = getTabGroupTitle(newRootId);
-                        if (sourceGroupTitle == null) return;
-                        // If the target group has no title but the source group has a title,
-                        // handover the stored title to the group after merge.
-                        if (targetGroupTitle == null) {
-                            storeTabGroupTitle(newRootId, sourceGroupTitle);
-                        }
-                    }
-
-                    @Override
-                    public void willMoveTabOutOfGroup(Tab movedTab, int newRootId) {
-                        int rootId = movedTab.getRootId();
-                        String title = getTabGroupTitle(rootId);
-                        if (title == null) return;
-                        // If the group size is 2, i.e. the group becomes a single tab after
-                        // ungroup, delete the stored title. When tab groups of size 1 are supported
-                        // this behavior is no longer valid.
-                        var filter = (TabGroupModelFilter) mCurrentTabModelFilterSupplier.get();
-                        int sizeThreshold =
-                                ChromeFeatureList.sAndroidTabGroupStableIds.isEnabled() ? 1 : 2;
-                        boolean shouldDeleteTitle =
-                                filter.getRelatedTabCountForRootId(rootId) <= sizeThreshold;
-                        if (shouldDeleteTitle) {
-                            deleteTabGroupTitle(rootId);
-                            return;
-                        }
-                        // If the root tab in group is moved out, re-assign the title to the new
-                        // root tab in group.
-                        if (rootId != newRootId) {
-                            deleteTabGroupTitle(rootId);
-                            storeTabGroupTitle(newRootId, title);
-                        }
-                    }
-                };
-
-        mCurrentTabModelFilterObserver.onResult(
-                mCurrentTabModelFilterSupplier.addObserver(mCurrentTabModelFilterObserver));
     }
 
     /**
@@ -146,28 +76,4 @@
      * @return The stored title of the related group.
      */
     protected abstract String getTabGroupTitle(int tabRootId);
-
-    /** Destroy any members that needs clean up. */
-    public void destroy() {
-        removeTabModelFilterObservers(mCurrentTabModelFilterSupplier.get());
-        mCurrentTabModelFilterSupplier.removeObserver(mCurrentTabModelFilterObserver);
-    }
-
-    private void onTabModelFilterChanged(TabModelFilter newFilter, TabModelFilter oldFilter) {
-        removeTabModelFilterObservers(oldFilter);
-
-        if (newFilter != null) {
-            TabGroupModelFilter newGroupFilter = (TabGroupModelFilter) newFilter;
-            newGroupFilter.addObserver(mTabModelObserver);
-            newGroupFilter.addTabGroupObserver(mFilterObserver);
-        }
-    }
-
-    private void removeTabModelFilterObservers(TabModelFilter filter) {
-        if (filter != null) {
-            TabGroupModelFilter groupFilter = (TabGroupModelFilter) filter;
-            groupFilter.removeObserver(mTabModelObserver);
-            groupFilter.removeTabGroupObserver(mFilterObserver);
-        }
-    }
 }
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupVisualDataManager.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupVisualDataManager.java
new file mode 100644
index 0000000..731fd25
--- /dev/null
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupVisualDataManager.java
@@ -0,0 +1,165 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.tasks.tab_management;
+
+import androidx.annotation.NonNull;
+
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tabmodel.TabModelFilterProvider;
+import org.chromium.chrome.browser.tabmodel.TabModelObserver;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.tasks.tab_groups.TabGroupColorUtils;
+import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter;
+import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilterObserver;
+import org.chromium.chrome.browser.tasks.tab_groups.TabGroupTitleUtils;
+import org.chromium.components.tab_groups.TabGroupColorId;
+
+/**
+ * Manages observers that monitor for updates to tab group visual aspects such as colors and titles.
+ */
+public class TabGroupVisualDataManager {
+    private static final int INVALID_COLOR_ID = -1;
+
+    private final TabModelSelector mTabModelSelector;
+    private TabModelObserver mTabModelObserver;
+    private TabGroupModelFilterObserver mFilterObserver;
+
+    public TabGroupVisualDataManager(@NonNull TabModelSelector tabModelSelector) {
+        assert tabModelSelector.isTabStateInitialized();
+        mTabModelSelector = tabModelSelector;
+
+        TabModelFilterProvider tabModelFilterProvider =
+                mTabModelSelector.getTabModelFilterProvider();
+
+        mTabModelObserver =
+                new TabModelObserver() {
+                    @Override
+                    public void tabClosureCommitted(Tab tab) {
+                        TabGroupModelFilter filter =
+                                (TabGroupModelFilter)
+                                        tabModelFilterProvider.getTabModelFilter(tab.isIncognito());
+                        int rootId = tab.getRootId();
+                        Tab groupTab = filter.getGroupLastShownTab(rootId);
+                        if (groupTab == null || !filter.isTabInTabGroup(groupTab)) {
+                            TabGroupTitleUtils.deleteTabGroupTitle(rootId);
+
+                            if (ChromeFeatureList.sTabGroupParityAndroid.isEnabled()) {
+                                TabGroupColorUtils.deleteTabGroupColor(rootId);
+                            }
+                        }
+                    }
+                };
+
+        mFilterObserver =
+                new TabGroupModelFilterObserver() {
+                    @Override
+                    public void didCreateNewGroup(int newRootId, TabGroupModelFilter filter) {
+                        // TODO(b/41490324): Store a default color as none will exist, but this
+                        // should be enforced later on with the intro of TabGroupCreationDialog.
+                        if (ChromeFeatureList.sTabGroupParityAndroid.isEnabled()) {
+                            final @TabGroupColorId int colorId =
+                                    TabGroupColorUtils.getNextSuggestedColorId(filter);
+                            TabGroupColorUtils.storeTabGroupColor(newRootId, colorId);
+                        }
+                    }
+
+                    @Override
+                    public void willMergeTabToGroup(Tab movedTab, int newRootId) {
+                        String sourceGroupTitle =
+                                TabGroupTitleUtils.getTabGroupTitle(movedTab.getRootId());
+                        String targetGroupTitle = TabGroupTitleUtils.getTabGroupTitle(newRootId);
+                        // If the target group has no title but the source group has a title,
+                        // handover the stored title to the group after merge.
+                        if (sourceGroupTitle != null && targetGroupTitle == null) {
+                            TabGroupTitleUtils.storeTabGroupTitle(newRootId, sourceGroupTitle);
+                        }
+
+                        if (ChromeFeatureList.sTabGroupParityAndroid.isEnabled()) {
+                            int sourceGroupColor =
+                                    TabGroupColorUtils.getTabGroupColor(movedTab.getRootId());
+                            int targetGroupColor = TabGroupColorUtils.getTabGroupColor(newRootId);
+                            // If the target group has no color but the source group has a color,
+                            // handover the stored color to the group after merge.
+                            if (sourceGroupColor != INVALID_COLOR_ID
+                                    && targetGroupColor == INVALID_COLOR_ID) {
+                                TabGroupColorUtils.storeTabGroupColor(newRootId, sourceGroupColor);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void willMoveTabOutOfGroup(Tab movedTab, int newRootId) {
+                        int rootId = movedTab.getRootId();
+                        String title = TabGroupTitleUtils.getTabGroupTitle(rootId);
+
+                        // If the group size is 2, i.e. the group becomes a single tab after
+                        // ungroup, delete the stored visual data. When tab groups of size 1 are
+                        // supported this behavior is no longer valid.
+                        TabGroupModelFilter filter =
+                                (TabGroupModelFilter)
+                                        tabModelFilterProvider.getTabModelFilter(
+                                                movedTab.isIncognito());
+                        int sizeThreshold =
+                                ChromeFeatureList.sAndroidTabGroupStableIds.isEnabled() ? 1 : 2;
+                        boolean shouldDeleteVisualData =
+                                filter.getRelatedTabCountForRootId(rootId) <= sizeThreshold;
+                        if (shouldDeleteVisualData) {
+                            if (title != null) {
+                                TabGroupTitleUtils.deleteTabGroupTitle(rootId);
+                            }
+
+                            if (ChromeFeatureList.sTabGroupParityAndroid.isEnabled()) {
+                                TabGroupColorUtils.deleteTabGroupColor(rootId);
+                            }
+
+                            return;
+                        }
+                        // If the root tab in group is moved out, re-assign the visual data to the
+                        // new root tab in group.
+                        if (rootId != newRootId) {
+                            if (title != null) {
+                                TabGroupTitleUtils.deleteTabGroupTitle(rootId);
+                                TabGroupTitleUtils.storeTabGroupTitle(newRootId, title);
+                            }
+
+                            if (ChromeFeatureList.sTabGroupParityAndroid.isEnabled()) {
+                                int colorId = TabGroupColorUtils.getTabGroupColor(rootId);
+                                assert colorId != INVALID_COLOR_ID;
+
+                                TabGroupColorUtils.deleteTabGroupColor(rootId);
+                                TabGroupColorUtils.storeTabGroupColor(newRootId, colorId);
+                            }
+                        }
+                    }
+                };
+
+        tabModelFilterProvider.addTabModelFilterObserver(mTabModelObserver);
+
+        ((TabGroupModelFilter) tabModelFilterProvider.getTabModelFilter(false))
+                .addTabGroupObserver(mFilterObserver);
+        ((TabGroupModelFilter) tabModelFilterProvider.getTabModelFilter(true))
+                .addTabGroupObserver(mFilterObserver);
+    }
+
+    /** Destroy any members that need clean up. */
+    public void destroy() {
+        TabModelFilterProvider tabModelFilterProvider =
+                mTabModelSelector.getTabModelFilterProvider();
+
+        if (mTabModelObserver != null) {
+            tabModelFilterProvider.removeTabModelFilterObserver(mTabModelObserver);
+            mTabModelObserver = null;
+        }
+
+        if (mFilterObserver != null) {
+            ((TabGroupModelFilter) tabModelFilterProvider.getTabModelFilter(false))
+                    .removeTabGroupObserver(mFilterObserver);
+            ((TabGroupModelFilter) tabModelFilterProvider.getTabModelFilter(true))
+                    .removeTabGroupObserver(mFilterObserver);
+            mFilterObserver = null;
+        }
+    }
+}
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java
index b153c1d..41cd26d 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java
@@ -1132,7 +1132,7 @@
                 mCurrentTabModelFilterSupplier.addObserver(mOnTabModelFilterChanged));
 
         mTabGroupTitleEditor =
-                new TabGroupTitleEditor(mContext, mCurrentTabModelFilterSupplier) {
+                new TabGroupTitleEditor(mContext) {
                     @Override
                     protected void updateTabGroupTitle(Tab tab, String title) {
                         // Only update title in PropertyModel for tab switcher.
@@ -1679,9 +1679,6 @@
         if (mComponentCallbacks != null) {
             mContext.unregisterComponentCallbacks(mComponentCallbacks);
         }
-        if (mTabGroupTitleEditor != null) {
-            mTabGroupTitleEditor.destroy();
-        }
         unregisterOnScrolledListener();
     }
 
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java
index 6d5600b1..04150a53 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java
@@ -11,6 +11,7 @@
 
 import org.chromium.base.Token;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabCreationState;
 import org.chromium.chrome.browser.tab.TabLaunchType;
@@ -18,6 +19,7 @@
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabModelObserver;
+import org.chromium.chrome.browser.tasks.tab_groups.TabGroupColorUtils;
 import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter;
 import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilterObserver;
 import org.chromium.chrome.browser.tasks.tab_groups.TabGroupTitleUtils;
@@ -33,6 +35,8 @@
  * and shows a undo snackbar.
  */
 public class UndoGroupSnackbarController implements SnackbarManager.SnackbarController {
+    private static final int INVALID_COLOR_ID = -1;
+
     private final Context mContext;
     private final TabModelSelector mTabModelSelector;
     private final SnackbarManager mSnackbarManager;
@@ -46,18 +50,21 @@
         public final int tabOriginalRootId;
         public final @Nullable Token tabOriginalTabGroupId;
         public final String destinationGroupTitle;
+        public final int destinationGroupColorId;
 
         TabUndoInfo(
                 Tab tab,
                 int tabIndex,
                 int rootId,
                 @Nullable Token tabGroupId,
-                String destinationGroupTitle) {
+                String destinationGroupTitle,
+                int destinationGroupColorId) {
             this.tab = tab;
             this.tabOriginalIndex = tabIndex;
             this.tabOriginalRootId = rootId;
             this.tabOriginalTabGroupId = tabGroupId;
             this.destinationGroupTitle = destinationGroupTitle;
+            this.destinationGroupColorId = destinationGroupColorId;
         }
     }
 
@@ -81,7 +88,8 @@
                             List<Integer> tabOriginalIndex,
                             List<Integer> originalRootId,
                             List<Token> originalTabGroupId,
-                            String destinationGroupTitle) {
+                            String destinationGroupTitle,
+                            int destinationGroupColorId) {
                         assert tabs.size() == tabOriginalIndex.size();
 
                         List<TabUndoInfo> tabUndoInfo = new ArrayList<>();
@@ -93,7 +101,12 @@
 
                             tabUndoInfo.add(
                                     new TabUndoInfo(
-                                            tab, index, rootId, tabGroupId, destinationGroupTitle));
+                                            tab,
+                                            index,
+                                            rootId,
+                                            tabGroupId,
+                                            destinationGroupTitle,
+                                            destinationGroupColorId));
                         }
                         showUndoGroupSnackbar(tabUndoInfo);
                     }
@@ -183,11 +196,16 @@
 
     @Override
     public void onDismissNoAction(Object actionData) {
-        // Delete the original tab group titles of the merging tabs once the merge is committed.
+        // Delete the original tab group titles and colors of the merging tabs once the merge is
+        // committed.
         for (TabUndoInfo info : (List<TabUndoInfo>) actionData) {
             if (info.tab.getRootId() == info.tabOriginalRootId) continue;
 
             TabGroupTitleUtils.deleteTabGroupTitle(info.tabOriginalRootId);
+
+            if (ChromeFeatureList.sTabGroupParityAndroid.isEnabled()) {
+                TabGroupColorUtils.deleteTabGroupColor(info.tabOriginalRootId);
+            }
         }
     }
 
@@ -207,6 +225,17 @@
             TabGroupTitleUtils.deleteTabGroupTitle(data.get(0).tab.getRootId());
         }
 
+        if (ChromeFeatureList.sTabGroupParityAndroid.isEnabled()) {
+            // If the destination rootID previously did not have a color id associated with it since
+            // it was either created from a new tab group or was originally a single tab before
+            // merge, delete that color id on undo. This check deletes the group color for that
+            // destination rootID, as all tabs still currently share that ID before the undo
+            // operation is performed.
+            if (data.get(0).destinationGroupColorId == INVALID_COLOR_ID) {
+                TabGroupColorUtils.deleteTabGroupColor(data.get(0).tab.getRootId());
+            }
+        }
+
         for (int i = data.size() - 1; i >= 0; i--) {
             TabUndoInfo info = data.get(i);
             tabGroupModelFilter.undoGroupedTab(
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherAndStartSurfaceLayoutTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherAndStartSurfaceLayoutTest.java
index db6e90e..4194268 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherAndStartSurfaceLayoutTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherAndStartSurfaceLayoutTest.java
@@ -105,6 +105,7 @@
 import org.chromium.chrome.browser.tab.TabUtils;
 import org.chromium.chrome.browser.tabmodel.TabCreator;
 import org.chromium.chrome.browser.tabmodel.TabModel;
+import org.chromium.chrome.browser.tasks.tab_groups.TabGroupColorUtils;
 import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter;
 import org.chromium.chrome.browser.tasks.tab_groups.TabGroupTitleUtils;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -159,6 +160,8 @@
 
     private static final String TEST_URL = "/chrome/test/data/android/google.html";
 
+    private static final int INVALID_COLOR_ID = -1;
+
     // Tests need animation on.
     @ClassRule
     public static DisableAnimationsTestRule sEnableAnimationsRule =
@@ -1731,6 +1734,7 @@
 
     @Test
     @MediumTest
+    @EnableFeatures({ChromeFeatureList.TAB_GROUP_PARITY_ANDROID})
     public void testUndoGroupMergeInTabSwitcher_TabToTab() {
         final ChromeTabbedActivity cta = mActivityTestRule.getActivity();
         SnackbarManager snackbarManager = mActivityTestRule.getActivity().getSnackbarManager();
@@ -1738,21 +1742,39 @@
         enterTabSwitcher(cta);
         verifyTabSwitcherCardCount(cta, 2);
 
+        // Get the next suggested color id.
+        int nextSuggestedColorId =
+                TabGroupColorUtils.getNextSuggestedColorId(
+                        (TabGroupModelFilter)
+                                cta.getTabModelSelectorSupplier()
+                                        .get()
+                                        .getTabModelFilterProvider()
+                                        .getCurrentTabModelFilter());
+
         // Create a tab group.
         mergeAllNormalTabsToAGroup(cta);
         assertTrue(
                 snackbarManager.getCurrentSnackbarForTesting().getController()
                         instanceof UndoGroupSnackbarController);
 
+        // Assert that the suggested default color was set.
+        TabModel normalTabModel = cta.getTabModelSelectorSupplier().get().getModel(false);
+        int tabGroupRootId = normalTabModel.getTabAt(0).getRootId();
+        assertEquals(nextSuggestedColorId, TabGroupColorUtils.getTabGroupColor(tabGroupRootId));
+
         // Undo merge in tab switcher.
         verifyTabSwitcherCardCount(cta, 1);
         assertEquals("2", snackbarManager.getCurrentSnackbarForTesting().getTextForTesting());
         CriteriaHelper.pollInstrumentationThread(TabUiTestHelper::verifyUndoBarShowingAndClickUndo);
         verifyTabSwitcherCardCount(cta, 2);
+
+        // Assert the color is no longer set for that group.
+        assertEquals(INVALID_COLOR_ID, TabGroupColorUtils.getTabGroupColor(tabGroupRootId));
     }
 
     @Test
     @MediumTest
+    @EnableFeatures({ChromeFeatureList.TAB_GROUP_PARITY_ANDROID})
     public void testUndoGroupMergeInTabSwitcher_TabToGroupAdjacent() {
         final ChromeTabbedActivity cta = mActivityTestRule.getActivity();
         SnackbarManager snackbarManager = mActivityTestRule.getActivity().getSnackbarManager();
@@ -1760,6 +1782,15 @@
         enterTabSwitcher(cta);
         verifyTabSwitcherCardCount(cta, 3);
 
+        // Get the next suggested color id.
+        int nextSuggestedColorId =
+                TabGroupColorUtils.getNextSuggestedColorId(
+                        (TabGroupModelFilter)
+                                cta.getTabModelSelectorSupplier()
+                                        .get()
+                                        .getTabModelFilterProvider()
+                                        .getCurrentTabModelFilter());
+
         // Merge first two tabs into a group.
         TabModel normalTabModel = cta.getTabModelSelector().getModel(false);
         List<Tab> tabGroup =
@@ -1777,12 +1808,22 @@
                         instanceof UndoGroupSnackbarController);
         assertEquals("2", snackbarManager.getCurrentSnackbarForTesting().getTextForTesting());
 
+        // Assert default color was set properly.
+        assertEquals(
+                nextSuggestedColorId,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(0).getRootId()));
+
         // Merge tab group of 2 at first index with the 3rd tab.
         mergeAllNormalTabsToAGroup(cta);
         assertTrue(
                 snackbarManager.getCurrentSnackbarForTesting().getController()
                         instanceof UndoGroupSnackbarController);
 
+        // Assert the default color is still the tab group color
+        assertEquals(
+                nextSuggestedColorId,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(0).getRootId()));
+
         // Undo merge in tab switcher.
         verifyTabSwitcherCardCount(cta, 1);
         assertEquals("3", snackbarManager.getCurrentSnackbarForTesting().getTextForTesting());
@@ -1797,11 +1838,20 @@
                     assertNull(
                             TabGroupTitleUtils.getTabGroupTitle(
                                     normalTabModel.getTabAt(2).getRootId()));
+                    assertEquals(
+                            nextSuggestedColorId,
+                            TabGroupColorUtils.getTabGroupColor(
+                                    normalTabModel.getTabAt(1).getRootId()));
+                    assertEquals(
+                            INVALID_COLOR_ID,
+                            TabGroupColorUtils.getTabGroupColor(
+                                    normalTabModel.getTabAt(2).getRootId()));
                 });
     }
 
     @Test
     @MediumTest
+    @EnableFeatures({ChromeFeatureList.TAB_GROUP_PARITY_ANDROID})
     public void testUndoGroupMergeInTabSwitcher_GroupToGroupNonAdjacent() {
         final ChromeTabbedActivity cta = mActivityTestRule.getActivity();
         SnackbarManager snackbarManager = mActivityTestRule.getActivity().getSnackbarManager();
@@ -1809,6 +1859,15 @@
         enterTabSwitcher(cta);
         verifyTabSwitcherCardCount(cta, 5);
 
+        // Get the next suggested color id.
+        int nextSuggestedColorId1 =
+                TabGroupColorUtils.getNextSuggestedColorId(
+                        (TabGroupModelFilter)
+                                cta.getTabModelSelectorSupplier()
+                                        .get()
+                                        .getTabModelFilterProvider()
+                                        .getCurrentTabModelFilter());
+
         // Merge last two tabs into a group.
         TabModel normalTabModel = cta.getTabModelSelector().getModel(false);
         List<Tab> tabGroup =
@@ -1821,6 +1880,20 @@
                         instanceof UndoGroupSnackbarController);
         assertEquals("2", snackbarManager.getCurrentSnackbarForTesting().getTextForTesting());
 
+        // Assert default color 1 was set properly.
+        assertEquals(
+                nextSuggestedColorId1,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(4).getRootId()));
+
+        // Get the next suggested color id.
+        int nextSuggestedColorId2 =
+                TabGroupColorUtils.getNextSuggestedColorId(
+                        (TabGroupModelFilter)
+                                cta.getTabModelSelectorSupplier()
+                                        .get()
+                                        .getTabModelFilterProvider()
+                                        .getCurrentTabModelFilter());
+
         // Merge first two tabs into a group.
         List<Tab> tabGroup2 =
                 new ArrayList<>(
@@ -1839,6 +1912,11 @@
                         instanceof UndoGroupSnackbarController);
         assertEquals("2", snackbarManager.getCurrentSnackbarForTesting().getTextForTesting());
 
+        // Assert default color 2 was set properly.
+        assertEquals(
+                nextSuggestedColorId2,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(1).getRootId()));
+
         // Merge the two tab groups into a group.
         List<Tab> tabGroup3 =
                 new ArrayList<>(
@@ -1848,6 +1926,11 @@
                 snackbarManager.getCurrentSnackbarForTesting().getController()
                         instanceof UndoGroupSnackbarController);
 
+        // Assert default color 2 was set as the overall merged group color.
+        assertEquals(
+                nextSuggestedColorId2,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(3).getRootId()));
+
         // Undo merge in tab switcher.
         verifyTabSwitcherCardCount(cta, 2);
         assertEquals("4", snackbarManager.getCurrentSnackbarForTesting().getTextForTesting());
@@ -1863,11 +1946,20 @@
                             "Bar",
                             TabGroupTitleUtils.getTabGroupTitle(
                                     normalTabModel.getTabAt(0).getRootId()));
+                    assertEquals(
+                            nextSuggestedColorId1,
+                            TabGroupColorUtils.getTabGroupColor(
+                                    normalTabModel.getTabAt(4).getRootId()));
+                    assertEquals(
+                            nextSuggestedColorId2,
+                            TabGroupColorUtils.getTabGroupColor(
+                                    normalTabModel.getTabAt(0).getRootId()));
                 });
     }
 
     @Test
     @MediumTest
+    @EnableFeatures({ChromeFeatureList.TAB_GROUP_PARITY_ANDROID})
     public void testUndoGroupMergeInTabSwitcher_PostMergeGroupTitleCommit() {
         final ChromeTabbedActivity cta = mActivityTestRule.getActivity();
         SnackbarManager snackbarManager = mActivityTestRule.getActivity().getSnackbarManager();
@@ -1875,6 +1967,15 @@
         enterTabSwitcher(cta);
         verifyTabSwitcherCardCount(cta, 3);
 
+        // Get the next suggested color id.
+        int nextSuggestedColorId =
+                TabGroupColorUtils.getNextSuggestedColorId(
+                        (TabGroupModelFilter)
+                                cta.getTabModelSelectorSupplier()
+                                        .get()
+                                        .getTabModelFilterProvider()
+                                        .getCurrentTabModelFilter());
+
         // Merge first two tabs into a group.
         TabModel normalTabModel = cta.getTabModelSelector().getModel(false);
         List<Tab> tabGroup =
@@ -1895,12 +1996,22 @@
                         instanceof UndoGroupSnackbarController);
         assertEquals("2", snackbarManager.getCurrentSnackbarForTesting().getTextForTesting());
 
+        // Assert default color was set properly.
+        assertEquals(
+                nextSuggestedColorId,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(1).getRootId()));
+
         // Merge tab group of 2 at first index with the 3rd tab.
         mergeAllNormalTabsToAGroup(cta);
         assertTrue(
                 snackbarManager.getCurrentSnackbarForTesting().getController()
                         instanceof UndoGroupSnackbarController);
 
+        // Assert default color was set properly for the overall merged group.
+        assertEquals(
+                nextSuggestedColorId,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(2).getRootId()));
+
         // Check that the old group title was handed over when the group merge is committed
         // and no longer exists.
         TestThreadUtils.runOnUiThreadBlocking(() -> snackbarManager.dismissAllSnackbars());
@@ -1912,6 +2023,128 @@
                             TabGroupTitleUtils.getTabGroupTitle(
                                     normalTabModel.getTabAt(0).getRootId()));
                 });
+
+        // Assert color still exists post snackbar dismissal.
+        assertEquals(
+                nextSuggestedColorId,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(1).getRootId()));
+    }
+
+    @Test
+    @MediumTest
+    @EnableFeatures({ChromeFeatureList.TAB_GROUP_PARITY_ANDROID})
+    public void testUndoClosure_UndoGroupClosure() {
+        ChromeTabbedActivity cta = mActivityTestRule.getActivity();
+        SnackbarManager snackbarManager = mActivityTestRule.getActivity().getSnackbarManager();
+        createTabs(cta, false, 2);
+
+        enterTabSwitcher(cta);
+        verifyTabSwitcherCardCount(cta, 2);
+        assertNull(snackbarManager.getCurrentSnackbarForTesting());
+
+        // Get the next suggested color id.
+        int nextSuggestedColorId =
+                TabGroupColorUtils.getNextSuggestedColorId(
+                        (TabGroupModelFilter)
+                                cta.getTabModelSelectorSupplier()
+                                        .get()
+                                        .getTabModelFilterProvider()
+                                        .getCurrentTabModelFilter());
+
+        // Merge first two tabs into a group.
+        TabModel normalTabModel = cta.getTabModelSelector().getModel(false);
+        List<Tab> tabGroup =
+                new ArrayList<>(
+                        Arrays.asList(normalTabModel.getTabAt(0), normalTabModel.getTabAt(1)));
+        createTabGroup(cta, false, tabGroup);
+        verifyTabSwitcherCardCount(cta, 1);
+        assertTrue(
+                snackbarManager.getCurrentSnackbarForTesting().getController()
+                        instanceof UndoGroupSnackbarController);
+        assertEquals("2", snackbarManager.getCurrentSnackbarForTesting().getTextForTesting());
+
+        // Assert default color was set properly.
+        assertEquals(
+                nextSuggestedColorId,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(1).getRootId()));
+        TestThreadUtils.runOnUiThreadBlocking(() -> snackbarManager.dismissAllSnackbars());
+
+        // Temporarily save the rootID to check during closure.
+        int groupRootId = normalTabModel.getTabAt(1).getRootId();
+
+        closeFirstTabInTabSwitcher(cta);
+        assertTrue(
+                snackbarManager.getCurrentSnackbarForTesting().getController()
+                        instanceof UndoBarController);
+        verifyTabSwitcherCardCount(cta, 0);
+
+        // Assert default color still persists.
+        assertEquals(nextSuggestedColorId, TabGroupColorUtils.getTabGroupColor(groupRootId));
+
+        CriteriaHelper.pollInstrumentationThread(TabUiTestHelper::verifyUndoBarShowingAndClickUndo);
+        verifyTabSwitcherCardCount(cta, 1);
+
+        // Assert default color still persists.
+        assertEquals(
+                nextSuggestedColorId,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(1).getRootId()));
+    }
+
+    @Test
+    @MediumTest
+    @EnableFeatures({ChromeFeatureList.TAB_GROUP_PARITY_ANDROID})
+    public void testUndoClosure_AcceptGroupClosure() {
+        ChromeTabbedActivity cta = mActivityTestRule.getActivity();
+        SnackbarManager snackbarManager = mActivityTestRule.getActivity().getSnackbarManager();
+        createTabs(cta, false, 2);
+
+        enterTabSwitcher(cta);
+        verifyTabSwitcherCardCount(cta, 2);
+        assertNull(snackbarManager.getCurrentSnackbarForTesting());
+
+        // Get the next suggested color id.
+        int nextSuggestedColorId =
+                TabGroupColorUtils.getNextSuggestedColorId(
+                        (TabGroupModelFilter)
+                                cta.getTabModelSelectorSupplier()
+                                        .get()
+                                        .getTabModelFilterProvider()
+                                        .getCurrentTabModelFilter());
+
+        // Merge first two tabs into a group.
+        TabModel normalTabModel = cta.getTabModelSelector().getModel(false);
+        List<Tab> tabGroup =
+                new ArrayList<>(
+                        Arrays.asList(normalTabModel.getTabAt(0), normalTabModel.getTabAt(1)));
+        createTabGroup(cta, false, tabGroup);
+        verifyTabSwitcherCardCount(cta, 1);
+        assertTrue(
+                snackbarManager.getCurrentSnackbarForTesting().getController()
+                        instanceof UndoGroupSnackbarController);
+        assertEquals("2", snackbarManager.getCurrentSnackbarForTesting().getTextForTesting());
+
+        // Assert default color was set properly.
+        assertEquals(
+                nextSuggestedColorId,
+                TabGroupColorUtils.getTabGroupColor(normalTabModel.getTabAt(1).getRootId()));
+        TestThreadUtils.runOnUiThreadBlocking(() -> snackbarManager.dismissAllSnackbars());
+
+        // Temporarily save the rootID to check during closure.
+        int groupRootId = normalTabModel.getTabAt(1).getRootId();
+
+        closeFirstTabInTabSwitcher(cta);
+        assertTrue(
+                snackbarManager.getCurrentSnackbarForTesting().getController()
+                        instanceof UndoBarController);
+        verifyTabSwitcherCardCount(cta, 0);
+
+        // Assert default color still persists.
+        assertEquals(nextSuggestedColorId, TabGroupColorUtils.getTabGroupColor(groupRootId));
+
+        TestThreadUtils.runOnUiThreadBlocking(() -> snackbarManager.dismissAllSnackbars());
+
+        // Assert default color is cleared.
+        assertEquals(INVALID_COLOR_ID, TabGroupColorUtils.getTabGroupColor(groupRootId));
     }
 
     @Test
diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java
index 77f61d2e..f77e09c58 100644
--- a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java
+++ b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java
@@ -4,108 +4,42 @@
 
 package org.chromium.chrome.browser.tasks.tab_management;
 
-import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
 
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
-import androidx.annotation.Nullable;
-
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 
-import org.chromium.base.Token;
-import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.Features;
-import org.chromium.base.test.util.Features.DisableFeatures;
-import org.chromium.base.test.util.Features.EnableFeatures;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tabmodel.TabModel;
-import org.chromium.chrome.browser.tabmodel.TabModelFilter;
-import org.chromium.chrome.browser.tabmodel.TabModelObserver;
-import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter;
-import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilterObserver;
 import org.chromium.chrome.tab_ui.R;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /** Tests for {@link TabGroupTitleEditor}. */
 @SuppressWarnings({"ArraysAsListWithZeroOrOneArgument", "ResultOfMethodCallIgnored"})
 @RunWith(BaseRobolectricTestRunner.class)
-@EnableFeatures(ChromeFeatureList.ANDROID_TAB_GROUP_STABLE_IDS)
 public class TabGroupTitleEditorUnitTest {
     @Rule public TestRule mProcessor = new Features.JUnitProcessor();
 
-    private static final String TAB1_TITLE = "Tab1";
-    private static final String TAB2_TITLE = "Tab2";
-    private static final String TAB3_TITLE = "Tab3";
-    private static final String TAB4_TITLE = "Tab4";
-    private static final String CUSTOMIZED_TITLE1 = "Some cool tabs";
-    private static final String CUSTOMIZED_TITLE2 = "Other cool tabs";
-    private static final int TAB1_ID = 456;
-    private static final int TAB2_ID = 789;
-    private static final int TAB3_ID = 123;
-    private static final int TAB4_ID = 357;
-    private static final Token GROUP_1_ID = new Token(1L, 2L);
-    private static final Token GROUP_2_ID = new Token(2L, 3L);
-
-    @Mock TabModel mTabModel;
-    @Mock TabGroupModelFilter mTabGroupModelFilter;
-    @Mock TabModel mIncognitoTabModel;
-    @Mock TabGroupModelFilter mIncognitoTabGroupModelFilter;
-    @Captor ArgumentCaptor<TabModelObserver> mTabModelObserverCaptor;
-    @Captor ArgumentCaptor<TabGroupModelFilterObserver> mTabGroupModelFilterObserverCaptor;
-
-    private final ObservableSupplierImpl<TabModelFilter> mTabModelFilterSupplier =
-            new ObservableSupplierImpl<>();
-    private Tab mTab1;
-    private Tab mTab2;
-    private Tab mTab3;
-    private Tab mTab4;
     private Map<String, String> mStorage;
     private TabGroupTitleEditor mTabGroupTitleEditor;
 
     @Before
     public void setUp() {
-
         MockitoAnnotations.initMocks(this);
 
-        mTab1 = TabUiUnitTestUtils.prepareTab(TAB1_ID, TAB1_TITLE);
-        mTab2 = TabUiUnitTestUtils.prepareTab(TAB2_ID, TAB2_TITLE);
-        mTab3 = TabUiUnitTestUtils.prepareTab(TAB3_ID, TAB3_TITLE);
-        mTab4 = TabUiUnitTestUtils.prepareTab(TAB4_ID, TAB4_TITLE);
-        doReturn(mTabModel).when(mTabGroupModelFilter).getTabModel();
-        doReturn(mIncognitoTabModel).when(mIncognitoTabGroupModelFilter).getTabModel();
-        mTabModelFilterSupplier.set(mTabGroupModelFilter);
-        doNothing().when(mTabGroupModelFilter).addObserver(mTabModelObserverCaptor.capture());
-        doNothing()
-                .when(mTabGroupModelFilter)
-                .addTabGroupObserver(mTabGroupModelFilterObserverCaptor.capture());
-
         mTabGroupTitleEditor =
-                new TabGroupTitleEditor(RuntimeEnvironment.application, mTabModelFilterSupplier) {
+                new TabGroupTitleEditor(RuntimeEnvironment.application) {
                     @Override
                     protected void updateTabGroupTitle(Tab tab, String title) {}
 
@@ -125,226 +59,6 @@
                     }
                 };
         mStorage = new HashMap<>();
-        assertTrue(mTabModelFilterSupplier.hasObservers());
-    }
-
-    @After
-    public void tearDown() {
-        mTabGroupTitleEditor.destroy();
-        assertFalse(mTabModelFilterSupplier.hasObservers());
-    }
-
-    @Test
-    public void testChangeModels() {
-        verify(mTabGroupModelFilter).addObserver(any());
-        verify(mTabGroupModelFilter).addTabGroupObserver(any());
-        mTabModelFilterSupplier.set(mIncognitoTabGroupModelFilter);
-        verify(mIncognitoTabGroupModelFilter).addObserver(any());
-        verify(mIncognitoTabGroupModelFilter).addTabGroupObserver(any());
-        verify(mTabGroupModelFilter).removeObserver(any());
-        verify(mTabGroupModelFilter).removeTabGroupObserver(any());
-    }
-
-    @Test
-    public void tabClosureCommitted_RootTab_NotDeleteStoredTitle() {
-        // Mock that we have a stored title stored with reference to root ID of tab1.
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB1_ID, CUSTOMIZED_TITLE1);
-        assertThat(mStorage.size(), equalTo(1));
-
-        // Mock that tab1, tab2, new tab are in the same group and group root id is TAB1_ID.
-        Tab newTab = TabUiUnitTestUtils.prepareTab(TAB3_ID, TAB3_TITLE);
-        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2, newTab));
-        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
-
-        // Mock that the root tab of the group, tab1, is closed.
-        List<Tab> groupAfterClosure = new ArrayList<>(Arrays.asList(mTab2, newTab));
-        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB1_ID))
-                .thenReturn(groupAfterClosure.size());
-        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab1);
-
-        assertThat(mStorage.size(), equalTo(1));
-        assertThat(mTabGroupTitleEditor.getTabGroupTitle(TAB1_ID), equalTo(CUSTOMIZED_TITLE1));
-    }
-
-    @Test
-    public void tabClosureCommitted_NotRootTab_NotDeleteStoredTitle() {
-        // Mock that we have a stored title stored with reference to root ID of tab1.
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB1_ID, CUSTOMIZED_TITLE1);
-
-        // Mock that tab1, tab2, new tab are in the same group and group root id is TAB1_ID.
-        Tab newTab = TabUiUnitTestUtils.prepareTab(TAB3_ID, TAB3_TITLE);
-        List<Tab> groupBeforeClosure = new ArrayList<>(Arrays.asList(mTab1, mTab2, newTab));
-        createTabGroup(groupBeforeClosure, TAB1_ID, GROUP_1_ID);
-
-        // Mock that tab2 is closed and tab2 is not the root tab.
-        List<Tab> groupAfterClosure = new ArrayList<>(Arrays.asList(mTab1, newTab));
-        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB1_ID))
-                .thenReturn(groupAfterClosure.size());
-        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab2);
-
-        assertThat(mStorage.size(), equalTo(1));
-        assertThat(mTabGroupTitleEditor.getTabGroupTitle(TAB1_ID), equalTo(CUSTOMIZED_TITLE1));
-    }
-
-    @Test
-    @DisableFeatures(ChromeFeatureList.ANDROID_TAB_GROUP_STABLE_IDS)
-    public void tabClosureCommitted_DeleteStoredTitle_GroupSize1NotSupported() {
-        // Mock that we have a stored title stored with reference to root ID of tab1.
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB1_ID, CUSTOMIZED_TITLE1);
-        assertThat(mStorage.size(), equalTo(1));
-
-        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID.
-        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2));
-        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
-
-        // Mock that tab1 is closed and the group becomes a single tab.
-        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB1_ID)).thenReturn(1);
-        when(mTabGroupModelFilter.isTabInTabGroup(mTab1)).thenReturn(false);
-        when(mTabGroupModelFilter.isTabInTabGroup(mTab2)).thenReturn(false);
-        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab2);
-
-        // The stored title should be deleted.
-        assertThat(mStorage.size(), equalTo(0));
-    }
-
-    @Test
-    public void tabClosureCommitted_DeleteStoredTitle_GroupSize1Supported() {
-        // Mock that we have a stored title stored with reference to root ID of tab1.
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB1_ID, CUSTOMIZED_TITLE1);
-        assertThat(mStorage.size(), equalTo(1));
-
-        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID.
-        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2));
-        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
-
-        // Mock that tab1 is closed and the group becomes a single tab.
-        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB1_ID)).thenReturn(1);
-        when(mTabGroupModelFilter.isTabInTabGroup(mTab1)).thenReturn(true);
-        when(mTabGroupModelFilter.isTabInTabGroup(mTab2)).thenReturn(false);
-        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab2);
-
-        // The stored title should not be deleted.
-        assertThat(mStorage.size(), equalTo(1));
-
-        when(mTabGroupModelFilter.isTabInTabGroup(mTab1)).thenReturn(false);
-        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab1);
-
-        // The stored title should be deleted.
-        assertThat(mStorage.size(), equalTo(0));
-    }
-
-    @Test
-    public void tabMergeIntoGroup_NotDeleteStoredTitle() {
-        // Mock that we have two stored titles with reference to root ID of tab1 and tab3.
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB1_ID, CUSTOMIZED_TITLE1);
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB3_ID, CUSTOMIZED_TITLE2);
-        assertThat(mStorage.size(), equalTo(2));
-
-        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID; tab3 and tab4
-        // are in the same group and group root id is TAB3_ID.
-        List<Tab> group1 = new ArrayList<>(Arrays.asList(mTab1, mTab2));
-        createTabGroup(group1, TAB1_ID, GROUP_1_ID);
-        List<Tab> group2 = new ArrayList<>(Arrays.asList(mTab3, mTab4));
-        createTabGroup(group2, TAB3_ID, GROUP_2_ID);
-
-        mTabGroupModelFilterObserverCaptor.getValue().willMergeTabToGroup(mTab1, TAB3_ID);
-
-        // The title of the source group will not be deleted until the merge is committed, after
-        // SnackbarController#onDismissNoAction is called for the UndoGroupSnackbarController.
-        assertThat(mStorage.size(), equalTo(2));
-        assertThat(mTabGroupTitleEditor.getTabGroupTitle(TAB1_ID), equalTo(CUSTOMIZED_TITLE1));
-        assertThat(mTabGroupTitleEditor.getTabGroupTitle(TAB3_ID), equalTo(CUSTOMIZED_TITLE2));
-    }
-
-    @Test
-    public void tabMergeIntoGroup_HandOverStoredTitle() {
-        // Mock that we have a stored title stored with reference to root ID of tab1.
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB1_ID, CUSTOMIZED_TITLE1);
-        assertThat(mStorage.size(), equalTo(1));
-
-        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID; tab3 and tab4
-        // are in the same group and group root id is TAB3_ID.
-        List<Tab> group1 = new ArrayList<>(Arrays.asList(mTab1, mTab2));
-        createTabGroup(group1, TAB1_ID, GROUP_1_ID);
-        List<Tab> group2 = new ArrayList<>(Arrays.asList(mTab3, mTab4));
-        createTabGroup(group2, TAB3_ID, GROUP_2_ID);
-
-        mTabGroupModelFilterObserverCaptor.getValue().willMergeTabToGroup(mTab1, TAB3_ID);
-
-        // The stored title should be assigned to the new root id. The title of the source group
-        // will not be deleted until the merge is committed, after
-        // SnackbarController#onDismissNoAction is called for the UndoGroupSnackbarController.
-        assertThat(mStorage.size(), equalTo(2));
-        assertThat(mTabGroupTitleEditor.getTabGroupTitle(TAB1_ID), equalTo(CUSTOMIZED_TITLE1));
-        assertThat(mTabGroupTitleEditor.getTabGroupTitle(TAB3_ID), equalTo(CUSTOMIZED_TITLE1));
-    }
-
-    @Test
-    @DisableFeatures(ChromeFeatureList.ANDROID_TAB_GROUP_STABLE_IDS)
-    public void tabMoveOutOfGroup_DeleteStoredTitle_GroupSize1NotSupported() {
-        // Mock that we have a stored title stored with reference to root ID of tab1.
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB1_ID, CUSTOMIZED_TITLE1);
-        assertThat(mStorage.size(), equalTo(1));
-
-        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID.
-        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2));
-        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
-
-        // Mock that we are going to ungroup tab1, and the group becomes a single tab after ungroup.
-        mTabGroupModelFilterObserverCaptor.getValue().willMoveTabOutOfGroup(mTab1, TAB2_ID);
-
-        // The stored title should be deleted.
-        assertThat(mStorage.size(), equalTo(0));
-    }
-
-    @Test
-    public void tabMoveOutOfGroup_DeleteStoredTitle_GroupSize1Supported() {
-        // Mock that we have a stored title stored with reference to root ID of tab1.
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB1_ID, CUSTOMIZED_TITLE1);
-        assertThat(mStorage.size(), equalTo(1));
-
-        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID.
-        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2));
-        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
-
-        // Mock that we are going to ungroup tab1, and the group becomes a single tab after ungroup.
-        mTabGroupModelFilterObserverCaptor.getValue().willMoveTabOutOfGroup(mTab1, TAB2_ID);
-        when(mTabGroupModelFilter.getGroupLastShownTab(TAB1_ID)).thenReturn(mTab1);
-        when(mTabGroupModelFilter.getGroupLastShownTab(TAB2_ID)).thenReturn(mTab2);
-        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB1_ID)).thenReturn(1);
-        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB2_ID)).thenReturn(1);
-        when(mTab1.getRootId()).thenReturn(TAB1_ID);
-        when(mTab1.getTabGroupId()).thenReturn(null);
-        when(mTabGroupModelFilter.isTabInTabGroup(mTab1)).thenReturn(false);
-        when(mTab2.getRootId()).thenReturn(TAB2_ID);
-
-        // The stored title should not be deleted.
-        assertThat(mStorage.size(), equalTo(1));
-
-        mTabGroupModelFilterObserverCaptor.getValue().willMoveTabOutOfGroup(mTab2, TAB2_ID);
-
-        // The stored title should be deleted.
-        assertThat(mStorage.size(), equalTo(0));
-    }
-
-    @Test
-    public void tabMoveOutOfGroup_HandOverStoredTitle() {
-        // Mock that we have a stored title stored with reference to root ID of tab1.
-        mTabGroupTitleEditor.storeTabGroupTitle(TAB1_ID, CUSTOMIZED_TITLE1);
-
-        // Mock that tab1, tab2 and newTab are in the same group and group root id is TAB1_ID.
-        Tab newTab = TabUiUnitTestUtils.prepareTab(TAB3_ID, TAB3_TITLE);
-        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2, newTab));
-        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
-
-        // Mock that we are going to ungroup tab1, and the group is still a group after ungroup with
-        // root id become TAB2_ID.
-        mTabGroupModelFilterObserverCaptor.getValue().willMoveTabOutOfGroup(mTab1, TAB2_ID);
-
-        // The stored title should be assigned to the new root id.
-        assertThat(mStorage.size(), equalTo(1));
-        assertThat(mTabGroupTitleEditor.getTabGroupTitle(TAB1_ID), equalTo(null));
-        assertThat(mTabGroupTitleEditor.getTabGroupTitle(TAB2_ID), equalTo(CUSTOMIZED_TITLE1));
     }
 
     @Test
@@ -373,15 +87,4 @@
         assertFalse(mTabGroupTitleEditor.isDefaultTitle(fourTabsTitle, 3));
         assertFalse(mTabGroupTitleEditor.isDefaultTitle("Foo", fourTabsCount));
     }
-
-    private void createTabGroup(List<Tab> tabs, int rootId, @Nullable Token groupId) {
-        Tab lastTab = tabs.isEmpty() ? null : tabs.get(0);
-        when(mTabGroupModelFilter.getGroupLastShownTab(rootId)).thenReturn(lastTab);
-        when(mTabGroupModelFilter.getRelatedTabCountForRootId(rootId)).thenReturn(tabs.size());
-        for (Tab tab : tabs) {
-            when(mTabGroupModelFilter.isTabInTabGroup(tab)).thenReturn(tabs.size() != 1);
-            when(tab.getRootId()).thenReturn(rootId);
-            when(tab.getTabGroupId()).thenReturn(groupId);
-        }
-    }
 }
diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupVisualDataManagerUnitTest.java b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupVisualDataManagerUnitTest.java
new file mode 100644
index 0000000..91095c4e
--- /dev/null
+++ b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupVisualDataManagerUnitTest.java
@@ -0,0 +1,440 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.tasks.tab_management;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.Nullable;
+import androidx.collection.ArraySet;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import org.chromium.base.ContextUtils;
+import org.chromium.base.Token;
+import org.chromium.base.test.BaseRobolectricTestRunner;
+import org.chromium.base.test.util.Features;
+import org.chromium.base.test.util.Features.DisableFeatures;
+import org.chromium.base.test.util.Features.EnableFeatures;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tabmodel.TabModelFilterProvider;
+import org.chromium.chrome.browser.tabmodel.TabModelObserver;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter;
+import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilterObserver;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+/** Tests for {@link TabGroupVisualDataManager}. */
+@SuppressWarnings({"ArraysAsListWithZeroOrOneArgument", "ResultOfMethodCallIgnored"})
+@RunWith(BaseRobolectricTestRunner.class)
+@EnableFeatures({
+    ChromeFeatureList.ANDROID_TAB_GROUP_STABLE_IDS,
+    ChromeFeatureList.TAB_GROUP_PARITY_ANDROID
+})
+public class TabGroupVisualDataManagerUnitTest {
+    @Rule public TestRule mProcessor = new Features.JUnitProcessor();
+
+    private static final String TAB_GROUP_TITLES_FILE_NAME = "tab_group_titles";
+    private static final String TAB_GROUP_COLORS_FILE_NAME = "tab_group_colors";
+
+    private static final String TAB1_TITLE = "Tab1";
+    private static final String TAB2_TITLE = "Tab2";
+    private static final String TAB3_TITLE = "Tab3";
+    private static final String TAB4_TITLE = "Tab4";
+    private static final String CUSTOMIZED_TITLE1 = "Some cool tabs";
+    private static final String CUSTOMIZED_TITLE2 = "Other cool tabs";
+    private static final int COLOR1_ID = 0;
+    private static final int COLOR2_ID = 1;
+    private static final int INVALID_COLOR_ID = -1;
+    private static final int TAB1_ID = 456;
+    private static final int TAB2_ID = 789;
+    private static final int TAB3_ID = 123;
+    private static final int TAB4_ID = 357;
+    private static final Token GROUP_1_ID = new Token(1L, 2L);
+    private static final Token GROUP_2_ID = new Token(2L, 3L);
+
+    @Mock private Context mContext;
+    @Mock private TabGroupModelFilter mTabGroupModelFilter;
+    @Mock private TabGroupModelFilter mIncognitoTabGroupModelFilter;
+    @Mock private TabModelSelector mTabModelSelector;
+    @Mock private TabModelFilterProvider mTabModelFilterProvider;
+    @Mock private SharedPreferences mSharedPreferencesTitle;
+    @Mock private SharedPreferences.Editor mEditorTitle;
+    @Mock private SharedPreferences.Editor mPutStringEditorTitle;
+    @Mock private SharedPreferences.Editor mRemoveEditorTitle;
+    @Mock private SharedPreferences mSharedPreferencesColor;
+    @Mock private SharedPreferences.Editor mEditorColor;
+    @Mock private SharedPreferences.Editor mPutIntEditorColor;
+    @Mock private SharedPreferences.Editor mRemoveEditorColor;
+    @Captor private ArgumentCaptor<TabModelObserver> mTabModelObserverCaptor;
+    @Captor private ArgumentCaptor<TabGroupModelFilterObserver> mTabGroupModelFilterObserverCaptor;
+
+    @Captor
+    private ArgumentCaptor<TabGroupModelFilterObserver> mIncognitoTabGroupModelFilterObserverCaptor;
+
+    private Tab mTab1;
+    private Tab mTab2;
+    private Tab mTab3;
+    private Tab mTab4;
+    private TabGroupVisualDataManager mTabGroupVisualDataManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mTab1 = TabUiUnitTestUtils.prepareTab(TAB1_ID, TAB1_TITLE);
+        mTab2 = TabUiUnitTestUtils.prepareTab(TAB2_ID, TAB2_TITLE);
+        mTab3 = TabUiUnitTestUtils.prepareTab(TAB3_ID, TAB3_TITLE);
+        mTab4 = TabUiUnitTestUtils.prepareTab(TAB4_ID, TAB4_TITLE);
+
+        doReturn(true).when(mTabModelSelector).isTabStateInitialized();
+        doReturn(mTabModelFilterProvider).when(mTabModelSelector).getTabModelFilterProvider();
+        doReturn(mTabGroupModelFilter).when(mTabModelFilterProvider).getCurrentTabModelFilter();
+        doReturn(mTabGroupModelFilter).when(mTabModelFilterProvider).getTabModelFilter(false);
+        doReturn(mIncognitoTabGroupModelFilter)
+                .when(mTabModelFilterProvider)
+                .getTabModelFilter(true);
+
+        doNothing()
+                .when(mTabModelFilterProvider)
+                .addTabModelFilterObserver(mTabModelObserverCaptor.capture());
+        doNothing()
+                .when(mTabGroupModelFilter)
+                .addTabGroupObserver(mTabGroupModelFilterObserverCaptor.capture());
+        doNothing()
+                .when(mIncognitoTabGroupModelFilter)
+                .addTabGroupObserver(mIncognitoTabGroupModelFilterObserverCaptor.capture());
+
+        mTabGroupVisualDataManager = new TabGroupVisualDataManager(mTabModelSelector);
+
+        doReturn(mSharedPreferencesTitle)
+                .when(mContext)
+                .getSharedPreferences(TAB_GROUP_TITLES_FILE_NAME, Context.MODE_PRIVATE);
+        doReturn(mEditorTitle).when(mSharedPreferencesTitle).edit();
+        doReturn(mRemoveEditorTitle).when(mEditorTitle).remove(any(String.class));
+        doReturn(mPutStringEditorTitle)
+                .when(mEditorTitle)
+                .putString(any(String.class), any(String.class));
+
+        doReturn(mSharedPreferencesColor)
+                .when(mContext)
+                .getSharedPreferences(TAB_GROUP_COLORS_FILE_NAME, Context.MODE_PRIVATE);
+        doReturn(mEditorColor).when(mSharedPreferencesColor).edit();
+        doReturn(mRemoveEditorColor).when(mEditorColor).remove(any(String.class));
+        doReturn(mPutIntEditorColor)
+                .when(mEditorColor)
+                .putInt(any(String.class), any(Integer.class));
+
+        ContextUtils.initApplicationContextForTests(mContext);
+    }
+
+    @After
+    public void tearDown() {
+        mTabGroupVisualDataManager.destroy();
+    }
+
+    @Test
+    public void tabClosureCommitted_RootTab_NotDeleteStoredTitle() {
+        // Assume that CUSTOMIZED_TITLE1 and COLOR1_ID are associated with the tab group.
+        // Mock that tab1, tab2, new tab are in the same group and group root id is TAB1_ID.
+        Tab newTab = TabUiUnitTestUtils.prepareTab(TAB3_ID, TAB3_TITLE);
+        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2, newTab));
+        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
+
+        // Mock that the root tab of the group, tab1, is closed.
+        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab1);
+
+        // Verify that the title and color were not deleted.
+        verify(mEditorTitle, never()).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorTitle, never()).apply();
+        verify(mEditorColor, never()).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorColor, never()).apply();
+    }
+
+    @Test
+    public void tabClosureCommitted_NotRootTab_NotDeleteStoredTitle() {
+        // Assume that CUSTOMIZED_TITLE1 and COLOR1_ID are associated with the tab group.
+        // Mock that tab1, tab2, new tab are in the same group and group root id is TAB1_ID.
+        Tab newTab = TabUiUnitTestUtils.prepareTab(TAB3_ID, TAB3_TITLE);
+        List<Tab> groupBeforeClosure = new ArrayList<>(Arrays.asList(mTab1, mTab2, newTab));
+        createTabGroup(groupBeforeClosure, TAB1_ID, GROUP_1_ID);
+
+        // Mock that tab2 is closed and tab2 is not the root tab.
+        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab2);
+
+        // Verify that the title and color were not deleted.
+        verify(mEditorTitle, never()).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorTitle, never()).apply();
+        verify(mEditorColor, never()).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorColor, never()).apply();
+    }
+
+    @Test
+    @DisableFeatures(ChromeFeatureList.ANDROID_TAB_GROUP_STABLE_IDS)
+    public void tabClosureCommitted_DeleteStoredTitle_GroupSize1NotSupported() {
+        // Assume that CUSTOMIZED_TITLE1 and COLOR1_ID are associated with the tab group.
+        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID.
+        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2));
+        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
+
+        // Mock that tab1 is closed and the group becomes a single tab.
+        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB1_ID)).thenReturn(1);
+        when(mTabGroupModelFilter.isTabInTabGroup(mTab1)).thenReturn(false);
+        when(mTabGroupModelFilter.isTabInTabGroup(mTab2)).thenReturn(false);
+        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab2);
+
+        // Verify that the title and color were deleted.
+        verify(mEditorTitle).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorTitle).apply();
+        verify(mEditorColor).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorColor).apply();
+    }
+
+    @Test
+    public void tabClosureCommitted_DeleteStoredTitle_GroupSize1Supported() {
+        // Assume that CUSTOMIZED_TITLE1 and COLOR1_ID are associated with the tab group.
+        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID.
+        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2));
+        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
+
+        // Mock that tab1 is closed and the group becomes a single tab.
+        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB1_ID)).thenReturn(1);
+        when(mTabGroupModelFilter.isTabInTabGroup(mTab1)).thenReturn(true);
+        when(mTabGroupModelFilter.isTabInTabGroup(mTab2)).thenReturn(false);
+        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab2);
+
+        // Verify that the title and color were not deleted.
+        verify(mEditorTitle, never()).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorTitle, never()).apply();
+        verify(mEditorColor, never()).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorColor, never()).apply();
+
+        when(mTabGroupModelFilter.isTabInTabGroup(mTab1)).thenReturn(false);
+        mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab1);
+
+        // Verify that the title and color were deleted.
+        verify(mEditorTitle).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorTitle).apply();
+        verify(mEditorColor).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorColor).apply();
+    }
+
+    // TODO(b/41490324): Remove this test when introducing TabGroupCreationDialog logic.
+    @Test
+    public void didCreateNewGroup_StoreColor() {
+        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID.
+        // None of the tab groups have colors associated with them.
+        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2));
+        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
+
+        // Create roodId set and mock that it has no color stored.
+        Set<Integer> rootIdsSet = new ArraySet<>();
+        rootIdsSet.add(TAB1_ID);
+        when(mTabGroupModelFilter.getAllTabGroupRootIds()).thenReturn(rootIdsSet);
+        when(mSharedPreferencesColor.getInt(String.valueOf(TAB1_ID), INVALID_COLOR_ID))
+                .thenReturn(INVALID_COLOR_ID);
+
+        mTabGroupModelFilterObserverCaptor
+                .getValue()
+                .didCreateNewGroup(TAB1_ID, mTabGroupModelFilter);
+
+        // Verify that a default color was stored.
+        verify(mEditorColor).putInt(eq(String.valueOf(TAB1_ID)), eq(COLOR1_ID));
+        verify(mPutIntEditorColor).apply();
+    }
+
+    @Test
+    public void tabMergeIntoGroup_NotDeleteStoredTitle() {
+        // Mock that TITLE1, TITLE2 and COLOR1_ID, COLOR2_ID are associated with the groups.
+        when(mSharedPreferencesTitle.getString(String.valueOf(TAB1_ID), null))
+                .thenReturn(CUSTOMIZED_TITLE1);
+        when(mSharedPreferencesTitle.getString(String.valueOf(TAB3_ID), null))
+                .thenReturn(CUSTOMIZED_TITLE2);
+        when(mSharedPreferencesColor.getInt(String.valueOf(TAB1_ID), INVALID_COLOR_ID))
+                .thenReturn(COLOR1_ID);
+        when(mSharedPreferencesColor.getInt(String.valueOf(TAB3_ID), INVALID_COLOR_ID))
+                .thenReturn(COLOR2_ID);
+
+        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID; tab3 and tab4
+        // are in the same group and group root id is TAB3_ID.
+        List<Tab> group1 = new ArrayList<>(Arrays.asList(mTab1, mTab2));
+        createTabGroup(group1, TAB1_ID, GROUP_1_ID);
+        List<Tab> group2 = new ArrayList<>(Arrays.asList(mTab3, mTab4));
+        createTabGroup(group2, TAB3_ID, GROUP_2_ID);
+
+        mTabGroupModelFilterObserverCaptor.getValue().willMergeTabToGroup(mTab1, TAB3_ID);
+
+        // The title of the source group will not be deleted until the merge is committed, after
+        // SnackbarController#onDismissNoAction is called for the UndoGroupSnackbarController.
+        verify(mEditorTitle, never()).putString(eq(String.valueOf(TAB3_ID)), eq(CUSTOMIZED_TITLE1));
+        verify(mRemoveEditorTitle, never()).apply();
+        verify(mEditorColor, never()).putInt(eq(String.valueOf(TAB3_ID)), eq(COLOR1_ID));
+        verify(mRemoveEditorColor, never()).apply();
+    }
+
+    @Test
+    public void tabMergeIntoGroup_HandOverStoredTitle() {
+        // Mock that TITLE1 and COLOR1_ID are associated with the group of TAB1_ID.
+        when(mSharedPreferencesTitle.getString(String.valueOf(TAB1_ID), null))
+                .thenReturn(CUSTOMIZED_TITLE1);
+        when(mSharedPreferencesTitle.getString(String.valueOf(TAB3_ID), null)).thenReturn(null);
+        when(mSharedPreferencesColor.getInt(String.valueOf(TAB1_ID), INVALID_COLOR_ID))
+                .thenReturn(COLOR1_ID);
+        when(mSharedPreferencesColor.getInt(String.valueOf(TAB3_ID), INVALID_COLOR_ID))
+                .thenReturn(INVALID_COLOR_ID);
+
+        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID; tab3 and tab4
+        // are in the same group and group root id is TAB3_ID.
+        List<Tab> group1 = new ArrayList<>(Arrays.asList(mTab1, mTab2));
+        createTabGroup(group1, TAB1_ID, GROUP_1_ID);
+        List<Tab> group2 = new ArrayList<>(Arrays.asList(mTab3, mTab4));
+        createTabGroup(group2, TAB3_ID, GROUP_2_ID);
+
+        mTabGroupModelFilterObserverCaptor.getValue().willMergeTabToGroup(mTab1, TAB3_ID);
+
+        // The stored title should be assigned to the new root id. The title of the source group
+        // will not be deleted until the merge is committed, after
+        // SnackbarController#onDismissNoAction is called for the UndoGroupSnackbarController.
+        verify(mEditorTitle).putString(eq(String.valueOf(TAB3_ID)), eq(CUSTOMIZED_TITLE1));
+        verify(mPutStringEditorTitle).apply();
+        verify(mEditorColor).putInt(eq(String.valueOf(TAB3_ID)), eq(COLOR1_ID));
+        verify(mPutIntEditorColor).apply();
+    }
+
+    @Test
+    @DisableFeatures(ChromeFeatureList.ANDROID_TAB_GROUP_STABLE_IDS)
+    public void tabMoveOutOfGroup_DeleteStoredTitle_GroupSize1NotSupported() {
+        // Mock that TITLE1 and COLOR1_ID are associated with the group of TAB1_ID.
+        when(mSharedPreferencesTitle.getString(String.valueOf(TAB1_ID), null))
+                .thenReturn(CUSTOMIZED_TITLE1);
+        when(mSharedPreferencesColor.getInt(String.valueOf(TAB1_ID), INVALID_COLOR_ID))
+                .thenReturn(COLOR1_ID);
+
+        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID.
+        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2));
+        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
+
+        // Mock that we are going to ungroup tab1, and the group becomes a single tab after ungroup.
+        mTabGroupModelFilterObserverCaptor.getValue().willMoveTabOutOfGroup(mTab1, TAB2_ID);
+
+        // Verify that the title and color were deleted.
+        verify(mEditorTitle).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorTitle).apply();
+        verify(mEditorColor).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorColor).apply();
+    }
+
+    @Test
+    public void tabMoveOutOfGroup_DeleteStoredTitle_GroupSize1Supported() {
+        // Mock that TITLE1 and COLOR1_ID are associated with the group of TAB1_ID.
+        when(mSharedPreferencesTitle.getString(String.valueOf(TAB1_ID), null))
+                .thenReturn(CUSTOMIZED_TITLE1);
+        when(mSharedPreferencesColor.getInt(String.valueOf(TAB1_ID), INVALID_COLOR_ID))
+                .thenReturn(COLOR1_ID);
+
+        // Mock that tab1 and tab2 are in the same group and group root id is TAB1_ID.
+        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2));
+        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
+
+        // Mock that we are going to ungroup tab1, and the group becomes a single tab after ungroup.
+        when(mTabGroupModelFilter.getGroupLastShownTab(TAB1_ID)).thenReturn(mTab1);
+        when(mTabGroupModelFilter.getGroupLastShownTab(TAB2_ID)).thenReturn(mTab2);
+        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB1_ID)).thenReturn(2);
+        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB2_ID)).thenReturn(2);
+        when(mTab1.getRootId()).thenReturn(TAB1_ID);
+        when(mTab1.getTabGroupId()).thenReturn(null);
+        when(mTabGroupModelFilter.isTabInTabGroup(mTab1)).thenReturn(false);
+        when(mTab2.getRootId()).thenReturn(TAB2_ID);
+
+        // Mock the situation that the root tab is not the tab being moved out.
+        mTabGroupModelFilterObserverCaptor.getValue().willMoveTabOutOfGroup(mTab1, TAB1_ID);
+
+        // Verify that the title and color were not deleted.
+        verify(mEditorTitle, never()).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorTitle, never()).apply();
+        verify(mEditorColor, never()).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorColor, never()).apply();
+
+        // Mock that TITLE1 and COLOR1_ID are associated with the group of TAB1_ID.
+        when(mSharedPreferencesTitle.getString(String.valueOf(TAB2_ID), null))
+                .thenReturn(CUSTOMIZED_TITLE1);
+        when(mSharedPreferencesColor.getInt(String.valueOf(TAB2_ID), INVALID_COLOR_ID))
+                .thenReturn(COLOR1_ID);
+
+        // Mock that we are going to ungroup the last tab in a size 1 tab group, and it is the root
+        // tab.
+        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB1_ID)).thenReturn(1);
+        when(mTabGroupModelFilter.getRelatedTabCountForRootId(TAB2_ID)).thenReturn(1);
+
+        mTabGroupModelFilterObserverCaptor.getValue().willMoveTabOutOfGroup(mTab2, TAB1_ID);
+
+        // Verify that the title and color were deleted.
+        verify(mEditorTitle).remove(eq(String.valueOf(TAB2_ID)));
+        verify(mRemoveEditorTitle).apply();
+        verify(mEditorColor).remove(eq(String.valueOf(TAB2_ID)));
+        verify(mRemoveEditorColor).apply();
+    }
+
+    @Test
+    public void tabMoveOutOfGroup_HandOverStoredTitle() {
+        // Mock that TITLE1 and COLOR1_ID are associated with the group of TAB1_ID.
+        when(mSharedPreferencesTitle.getString(String.valueOf(TAB1_ID), null))
+                .thenReturn(CUSTOMIZED_TITLE1);
+        when(mSharedPreferencesColor.getInt(String.valueOf(TAB1_ID), INVALID_COLOR_ID))
+                .thenReturn(COLOR1_ID);
+
+        // Mock that tab1, tab2 and newTab are in the same group and group root id is TAB1_ID.
+        Tab newTab = TabUiUnitTestUtils.prepareTab(TAB3_ID, TAB3_TITLE);
+        List<Tab> tabs = new ArrayList<>(Arrays.asList(mTab1, mTab2, newTab));
+        createTabGroup(tabs, TAB1_ID, GROUP_1_ID);
+
+        // Mock that we are going to ungroup tab1, and the group is still a group after ungroup with
+        // root id become TAB2_ID.
+        mTabGroupModelFilterObserverCaptor.getValue().willMoveTabOutOfGroup(mTab1, TAB2_ID);
+
+        // The stored title should be assigned to the new root id.
+        verify(mEditorTitle).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorTitle).apply();
+        verify(mEditorTitle).putString(eq(String.valueOf(TAB2_ID)), eq(CUSTOMIZED_TITLE1));
+        verify(mPutStringEditorTitle).apply();
+        verify(mEditorColor).remove(eq(String.valueOf(TAB1_ID)));
+        verify(mRemoveEditorColor).apply();
+        verify(mEditorColor).putInt(eq(String.valueOf(TAB2_ID)), eq(COLOR1_ID));
+        verify(mPutIntEditorColor).apply();
+    }
+
+    private void createTabGroup(List<Tab> tabs, int rootId, @Nullable Token groupId) {
+        Tab lastTab = tabs.isEmpty() ? null : tabs.get(0);
+        when(mTabGroupModelFilter.getGroupLastShownTab(rootId)).thenReturn(lastTab);
+        when(mTabGroupModelFilter.getRelatedTabCountForRootId(rootId)).thenReturn(tabs.size());
+        for (Tab tab : tabs) {
+            when(mTabGroupModelFilter.isTabInTabGroup(tab)).thenReturn(tabs.size() != 1);
+            when(tab.getRootId()).thenReturn(rootId);
+            when(tab.getTabGroupId()).thenReturn(groupId);
+        }
+    }
+}
diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java
index 286ab17..2072fa2 100644
--- a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java
+++ b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java
@@ -1130,7 +1130,7 @@
         mMediator.initWithNative(mProfile);
 
         // mTabModelObserverCaptor captures on every initWithNative call.
-        verify(mTabGroupModelFilter, times(4)).addObserver(mTabModelObserverCaptor.capture());
+        verify(mTabGroupModelFilter, times(2)).addObserver(mTabModelObserverCaptor.capture());
         initAndAssertAllProperties();
 
         ThumbnailFetcher tab1Fetcher = mModel.get(0).model.get(TabProperties.THUMBNAIL_FETCHER);
@@ -3204,11 +3204,11 @@
     @Test
     public void testChangingTabModelFilters() {
         mCurrentTabModelFilterSupplier.set(mIncognitoTabGroupModelFilter);
-        // Once for the Mediator and once for the TabGroupTitleEditor.
-        verify(mTabGroupModelFilter, times(2)).removeObserver(any());
-        verify(mTabGroupModelFilter, times(2)).removeTabGroupObserver(any());
-        verify(mIncognitoTabGroupModelFilter, times(2)).addObserver(any());
-        verify(mIncognitoTabGroupModelFilter, times(2)).addTabGroupObserver(any());
+        // Once for the Mediator.
+        verify(mTabGroupModelFilter).removeObserver(any());
+        verify(mTabGroupModelFilter).removeTabGroupObserver(any());
+        verify(mIncognitoTabGroupModelFilter).addObserver(any());
+        verify(mIncognitoTabGroupModelFilter).addTabGroupObserver(any());
     }
 
     @Test
@@ -3558,10 +3558,10 @@
         mMediator.initWithNative(mProfile);
 
         assertThat(
-                mTabModelObserverCaptor.getAllValues().size(), equalTo(tabModelObserverCount + 2));
+                mTabModelObserverCaptor.getAllValues().size(), equalTo(tabModelObserverCount + 1));
         assertThat(
                 mTabGroupModelFilterObserverCaptor.getAllValues().size(),
-                equalTo(tabGroupModelFilterObserverCount + 2));
+                equalTo(tabGroupModelFilterObserverCount + 1));
 
         mMediatorTabModelObserver =
                 mTabModelObserverCaptor.getAllValues().get(tabModelObserverCount);
diff --git a/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chrome/android/features/tab_ui/tab_management_java_sources.gni
index 33102dd..28472d07 100644
--- a/chrome/android/features/tab_ui/tab_management_java_sources.gni
+++ b/chrome/android/features/tab_ui/tab_management_java_sources.gni
@@ -14,6 +14,7 @@
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/ColorPickerUtils.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/RecyclerViewPosition.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUi.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupVisualDataManager.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListFaviconProvider.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementDelegate.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcher.java",
@@ -203,6 +204,7 @@
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupCreationTextInputLayoutTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediatorUnitTest.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupVisualDataManagerUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListEditorActionUnitTestHelper.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListEditorBookmarkActionUnitTest.java",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
index bb7f4b6..2099134 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
@@ -410,8 +410,7 @@
             super.setContentView(AutomotiveUtils.getAutomotiveLayoutWithBackButtonToolbar(this));
             setAutomotiveToolbarBackButtonAction();
             LinearLayout linearLayout = findViewById(R.id.automotive_base_linear_layout);
-            linearLayout.addView(
-                    view, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+            linearLayout.addView(view, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         } else {
             super.setContentView(view);
         }
@@ -426,8 +425,7 @@
             setAutomotiveToolbarBackButtonAction();
             LinearLayout linearLayout = findViewById(R.id.automotive_base_linear_layout);
             linearLayout.setLayoutParams(params);
-            linearLayout.addView(
-                    view, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+            linearLayout.addView(view, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         } else {
             super.setContentView(view, params);
         }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 6253701..b1d5548 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -215,6 +215,7 @@
 import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter;
 import org.chromium.chrome.browser.tasks.tab_management.CloseAllTabsDialog;
 import org.chromium.chrome.browser.tasks.tab_management.TabGroupUi;
+import org.chromium.chrome.browser.tasks.tab_management.TabGroupVisualDataManager;
 import org.chromium.chrome.browser.tasks.tab_management.TabManagementDelegateProvider;
 import org.chromium.chrome.browser.tasks.tab_management.TabSwitcher;
 import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
@@ -502,6 +503,9 @@
                 RecordUserAction.record("MobileNewTabOpened");
             };
 
+    // Manager for tab group visual data lifecycle updates.
+    private TabGroupVisualDataManager mTabGroupVisualDataManager;
+
     /**
      * This class is used to warm up the chrome split ClassLoader. See SplitChromeApplication for
      * more info
@@ -678,6 +682,14 @@
 
             mTabModelOrchestrator.onNativeLibraryReady(getTabContentManager());
 
+            TabModelUtils.runOnTabStateInitialized(
+                    mTabModelSelector,
+                    (tabModelSelector) -> {
+                        assert tabModelSelector != null;
+                        mTabGroupVisualDataManager =
+                                new TabGroupVisualDataManager(tabModelSelector);
+                    });
+
             // For saving non-incognito tab closures for Recent Tabs.
             mHistoricalTabModelObserver =
                     new HistoricalTabModelObserver(mTabModelSelector.getModel(false));
@@ -3611,6 +3623,11 @@
 
         if (mHubProvider != null) mHubProvider.destroy();
 
+        if (mTabGroupVisualDataManager != null) {
+            mTabGroupVisualDataManager.destroy();
+            mTabGroupVisualDataManager = null;
+        }
+
         super.onDestroyInternal();
     }
 
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 4665d71..e9296dae 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -10885,6 +10885,9 @@
       <message name="IDS_TAB_ORGANIZATION_CREATE_GROUP" desc="The label for the button that creates a tab group in the tab organization UI">
         Create group
       </message>
+      <message name="IDS_TAB_ORGANIZATION_CREATE_GROUPS" desc="The label for the button that creates multiple tab groups in the tab organization UI">
+        Create groups
+      </message>
       <message name="IDS_TAB_ORGANIZATION_DISMISS" desc="The label for the button that dismisses the tab organization UI">
         Dismiss
       </message>
@@ -16876,6 +16879,15 @@
     <message name="IDS_IWA_INSTALLER_ALREADY_INSTALLED_SUBTITLE" desc="Subtitle of an error dialog shown when the bundle trying to be installed is already installed.">
       <ph name="APP_NAME">$1<ex>Google Maps</ex></ph> version <ph name="APP_VERSION">$2<ex>1.0</ex></ph> is already installed on this device
     </message>
+    <message name="IDS_IWA_INSTALLER_BODY_SCREENREADER_NAME" desc="Name that screen readers should call the body (top) section of the IWA installer UI.">
+      Body
+    </message>
+    <message name="IDS_IWA_INSTALLER_DETAILS_SCREENREADER_NAME" desc="Name that screen readers should call the details section of the IWA installer UI.">
+      Details
+    </message>
+    <message name="IDS_IWA_INSTALLER_PROGRESS_SCREENREADER_NAME" desc="Name that screen readers should call the progress bar section of the IWA installer UI.">
+      Progress
+    </message>
     <message name="IDS_IWA_INSTALLER_INSTALL_SUBTITLE" desc="Subtitle of the installing screen of the IWA installer.">
       Please wait while installation is in progress
     </message>
diff --git a/chrome/app/generated_resources_grd/IDS_IWA_INSTALLER_BODY_SCREENREADER_NAME.png.sha1 b/chrome/app/generated_resources_grd/IDS_IWA_INSTALLER_BODY_SCREENREADER_NAME.png.sha1
new file mode 100644
index 0000000..68fd5b1
--- /dev/null
+++ b/chrome/app/generated_resources_grd/IDS_IWA_INSTALLER_BODY_SCREENREADER_NAME.png.sha1
@@ -0,0 +1 @@
+32a8307c64d0fc98e4b852790c533d758ba3c0d0
\ No newline at end of file
diff --git a/chrome/app/generated_resources_grd/IDS_IWA_INSTALLER_DETAILS_SCREENREADER_NAME.png.sha1 b/chrome/app/generated_resources_grd/IDS_IWA_INSTALLER_DETAILS_SCREENREADER_NAME.png.sha1
new file mode 100644
index 0000000..6f82912e
--- /dev/null
+++ b/chrome/app/generated_resources_grd/IDS_IWA_INSTALLER_DETAILS_SCREENREADER_NAME.png.sha1
@@ -0,0 +1 @@
+74b8820081169a4f721cf3350c2ef078e262c4d3
\ No newline at end of file
diff --git a/chrome/app/generated_resources_grd/IDS_IWA_INSTALLER_PROGRESS_SCREENREADER_NAME.png.sha1 b/chrome/app/generated_resources_grd/IDS_IWA_INSTALLER_PROGRESS_SCREENREADER_NAME.png.sha1
new file mode 100644
index 0000000..cd401b97
--- /dev/null
+++ b/chrome/app/generated_resources_grd/IDS_IWA_INSTALLER_PROGRESS_SCREENREADER_NAME.png.sha1
@@ -0,0 +1 @@
+17f88e294ab23548a162bed659c38cb5eed2c05c
\ No newline at end of file
diff --git a/chrome/app/generated_resources_grd/IDS_TAB_ORGANIZATION_CREATE_GROUPS.png.sha1 b/chrome/app/generated_resources_grd/IDS_TAB_ORGANIZATION_CREATE_GROUPS.png.sha1
new file mode 100644
index 0000000..f66f474
--- /dev/null
+++ b/chrome/app/generated_resources_grd/IDS_TAB_ORGANIZATION_CREATE_GROUPS.png.sha1
@@ -0,0 +1 @@
+8b74f09b73cd823fedeb6dd01d0d186aaca52f1d
\ No newline at end of file
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 1408c39..78087b87 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4644,6 +4644,7 @@
       "//components/soda:constants",
       "//components/trusted_vault/proto",
       "//components/ukm/content",
+      "//components/unexportable_keys:unexportable_keys",
       "//components/user_notes:features",
       "//components/user_notes:user_notes_prefs",
       "//components/user_notes/browser",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index f1038635..8d0a157d 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3156,30 +3156,6 @@
          std::size(kServiceWorkerSkipIgnorableFetchHandler_SkipEmpty), nullptr},
 };
 
-const FeatureEntry::FeatureParam
-    kServiceWorkerBypassFetchHandler_MainResource[] = {
-        {"bypass_for", "main_resource"},
-        {"strategy", "optin"}};
-const FeatureEntry::FeatureParam
-    kServiceWorkerBypassFetchHandler_RaceNetworkRequest[] = {
-        {"bypass_for", "all_with_race_network_request"},
-        {"strategy", "optin"}};
-const FeatureEntry::FeatureParam
-    kServiceWorkerBypassFetchHandler_Subresource[] = {
-        {"bypass_for", "sub_resource"},
-        {"strategy", "optin"}};
-const FeatureEntry::FeatureVariation
-    kServiceWorkerBypassFetchHandlerVariations[] = {
-        {"Main Resource", kServiceWorkerBypassFetchHandler_MainResource,
-         std::size(kServiceWorkerBypassFetchHandler_MainResource), nullptr},
-        {"Subesource", kServiceWorkerBypassFetchHandler_Subresource,
-         std::size(kServiceWorkerBypassFetchHandler_Subresource), nullptr},
-        {"Race Network Request and Fetch Handler",
-         kServiceWorkerBypassFetchHandler_RaceNetworkRequest,
-         std::size(kServiceWorkerBypassFetchHandler_RaceNetworkRequest),
-         nullptr},
-};
-
 #if !BUILDFLAG(IS_ANDROID)
 
 const FeatureEntry::FeatureParam
@@ -9912,23 +9888,6 @@
      MULTI_VALUE_TYPE(kPrintingPpdChannelChoices)},
 #endif
 
-    {"storage-buckets", flag_descriptions::kStorageBucketsName,
-     flag_descriptions::kStorageBucketsDescription, kOsAll,
-     FEATURE_VALUE_TYPE(blink::features::kStorageBuckets)},
-
-    {"service-worker-bypass-fetch-handler",
-     flag_descriptions::kServiceWorkerBypassFetchHandlerName,
-     flag_descriptions::kServiceWorkerBypassFetchHandlerDescription, kOsAll,
-     FEATURE_WITH_PARAMS_VALUE_TYPE(features::kServiceWorkerBypassFetchHandler,
-                                    kServiceWorkerBypassFetchHandlerVariations,
-                                    "ServiceWorkerBypassFetchHandler")},
-
-    {"service-worker-bypass-fetch-handler-for-main-resource",
-     flag_descriptions::kServiceWorkerBypassFetchHandlerForMainResourceName,
-     flag_descriptions::
-         kServiceWorkerBypassFetchHandlerForMainResourceDescription,
-     kOsAll, FEATURE_VALUE_TYPE(features::kServiceWorkerBypassFetchHandler)},
-
     {"service-worker-static-router",
      flag_descriptions::kServiceWorkerStaticRouterName,
      flag_descriptions::kServiceWorkerStaticRouterDescription, kOsAll,
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.cc b/chrome/browser/ash/accessibility/accessibility_manager.cc
index 2500d149..b75ce9c 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager.cc
+++ b/chrome/browser/ash/accessibility/accessibility_manager.cc
@@ -818,36 +818,8 @@
   return audio::SoundsManager::Get()->Play(static_cast<int>(sound_key));
 }
 
-void AccessibilityManager::OnTwoFingerTouchStart() {
-  if (!profile_)
-    return;
-
-  extensions::EventRouter* event_router =
-      extensions::EventRouter::Get(profile_);
-
-  auto event = std::make_unique<extensions::Event>(
-      extensions::events::ACCESSIBILITY_PRIVATE_ON_TWO_FINGER_TOUCH_START,
-      extensions::api::accessibility_private::OnTwoFingerTouchStart::kEventName,
-      base::Value::List());
-  event_router->BroadcastEvent(std::move(event));
-}
-
-void AccessibilityManager::OnTwoFingerTouchStop() {
-  if (!profile_)
-    return;
-
-  extensions::EventRouter* event_router =
-      extensions::EventRouter::Get(profile_);
-
-  auto event = std::make_unique<extensions::Event>(
-      extensions::events::ACCESSIBILITY_PRIVATE_ON_TWO_FINGER_TOUCH_STOP,
-      extensions::api::accessibility_private::OnTwoFingerTouchStop::kEventName,
-      base::Value::List());
-  event_router->BroadcastEvent(std::move(event));
-}
-
 bool AccessibilityManager::ShouldToggleSpokenFeedbackViaTouch() {
-  return false;
+  return policy::EnrollmentRequisitionManager::IsMeetDevice();
 }
 
 bool AccessibilityManager::PlaySpokenFeedbackToggleCountdown(int tick_count) {
@@ -1955,8 +1927,9 @@
 
   // Force volume slide gesture to be on for Chromebox for Meetings provisioned
   // devices.
-  if (policy::EnrollmentRequisitionManager::IsRemoraRequisition())
+  if (policy::EnrollmentRequisitionManager::IsMeetDevice()) {
     AccessibilityController::Get()->EnableChromeVoxVolumeSlideGesture();
+  }
 
   if (start_chromevox_with_tutorial_) {
     ShowChromeVoxTutorial();
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.h b/chrome/browser/ash/accessibility/accessibility_manager.h
index c380710..afad0220 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager.h
+++ b/chrome/browser/ash/accessibility/accessibility_manager.h
@@ -310,14 +310,6 @@
   // Notify accessibility when locale changes occur.
   void OnLocaleChanged();
 
-  // Called when we first detect two fingers are held down, which can be
-  // used to toggle spoken feedback on some touch-only devices.
-  void OnTwoFingerTouchStart();
-
-  // Called when the user is no longer holding down two fingers (including
-  // releasing one, holding down three, or moving them).
-  void OnTwoFingerTouchStop();
-
   // Whether or not to enable toggling spoken feedback via holding down
   // two fingers on the screen.
   bool ShouldToggleSpokenFeedbackViaTouch();
diff --git a/chrome/browser/ash/app_restore/full_restore_service_unittest.cc b/chrome/browser/ash/app_restore/full_restore_service_unittest.cc
index ab1987a..e0445295a 100644
--- a/chrome/browser/ash/app_restore/full_restore_service_unittest.cc
+++ b/chrome/browser/ash/app_restore/full_restore_service_unittest.cc
@@ -229,6 +229,7 @@
     test_helper_ = std::make_unique<FullRestoreTestHelper>(
         "usertest@gmail.com", "1234567890", fake_user_manager_.Get(),
         profile_manager_.get(), testing_pref_service_.get());
+    scoped_feature_list_.InitAndDisableFeature(features::kForestFeature);
   }
   FullRestoreServiceTest(const FullRestoreServiceTest&) = delete;
   FullRestoreServiceTest& operator=(const FullRestoreServiceTest&) = delete;
@@ -355,6 +356,7 @@
       testing_pref_service_;
   std::unique_ptr<FullRestoreTestHelper> test_helper_;
   base::HistogramTester histogram_tester_;
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 // If the system is crash, and there is no FullRestore file, don't show the
@@ -826,6 +828,12 @@
     test_helper2_->CreateFullRestoreServiceForTesting(nullptr);
   }
 
+  void CreateFullRestoreService2ForTesting(
+      std::unique_ptr<MockFullRestoreServiceDelegate> mock_delegate) {
+    test_helper2_->CreateFullRestoreServiceForTesting(std::move(mock_delegate));
+    content::RunAllTasksUntilIdle();
+  }
+
   RestoreOption GetRestoreOptionForProfile2() const {
     return test_helper2_->GetRestoreOption();
   }
@@ -1007,7 +1015,10 @@
 
 class ForestFullRestoreServiceTest : public FullRestoreServiceTest {
  protected:
-  ForestFullRestoreServiceTest() = default;
+  ForestFullRestoreServiceTest() {
+    scoped_feature_list_.Reset();
+    scoped_feature_list_.InitAndEnableFeature(features::kForestFeature);
+  }
   ForestFullRestoreServiceTest(const ForestFullRestoreServiceTest&) = delete;
   ForestFullRestoreServiceTest& operator=(const ForestFullRestoreServiceTest&) =
       delete;
@@ -1022,9 +1033,6 @@
     switches::SetIgnoreForestSecretKeyForTest(false);
     FullRestoreServiceTest::TearDown();
   }
-
- private:
-  base::test::ScopedFeatureList scoped_feature_list_{features::kForestFeature};
 };
 
 // If the system is crash, and there is no full restore file, don't show the
@@ -1192,7 +1200,10 @@
 class ForestFullRestoreServiceTestHavingFullRestoreFile
     : public FullRestoreServiceTestHavingFullRestoreFile {
  protected:
-  ForestFullRestoreServiceTestHavingFullRestoreFile() = default;
+  ForestFullRestoreServiceTestHavingFullRestoreFile() {
+    scoped_feature_list_.Reset();
+    scoped_feature_list_.InitAndEnableFeature(features::kForestFeature);
+  }
   ForestFullRestoreServiceTestHavingFullRestoreFile(
       const ForestFullRestoreServiceTestHavingFullRestoreFile&) = delete;
   ForestFullRestoreServiceTestHavingFullRestoreFile& operator=(
@@ -1208,13 +1219,10 @@
     switches::SetIgnoreForestSecretKeyForTest(false);
     FullRestoreServiceTestHavingFullRestoreFile::TearDown();
   }
-
- private:
-  base::test::ScopedFeatureList scoped_feature_list_{features::kForestFeature};
 };
 
 // If the system is crash, the delegate is notified.
-TEST_F(ForestFullRestoreServiceTestHavingFullRestoreFile, CrashAndRestore) {
+TEST_F(ForestFullRestoreServiceTestHavingFullRestoreFile, Crash) {
   ExitTypeService::GetInstanceForProfile(profile())
       ->SetLastSessionExitTypeForTest(ExitType::kCrashed);
 
@@ -1256,4 +1264,186 @@
   EXPECT_TRUE(allow_save());
 }
 
+// Test tha for an existing user, if re-image, do not show the pine dialog for
+// the first run.
+TEST_F(ForestFullRestoreServiceTestHavingFullRestoreFile, ExistingUserReImage) {
+  // Set the restore pref setting to simulate sync for the first time.
+  SetRestoreOption(RestoreOption::kAskEveryTime);
+  first_run::ResetCachedSentinelDataForTesting();
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      ::switches::kForceFirstRun);
+
+  auto mock_delegate = std::make_unique<MockFullRestoreServiceDelegate>();
+  EXPECT_CALL(*mock_delegate, MaybeStartPineOverviewSession(testing::_))
+      .Times(0);
+  CreateFullRestoreServiceForTesting(std::move(mock_delegate));
+
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 1);
+  EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption());
+  EXPECT_TRUE(allow_save());
+
+  base::CommandLine::ForCurrentProcess()->RemoveSwitch(
+      ::switches::kForceFirstRun);
+  first_run::ResetCachedSentinelDataForTesting();
+}
+
+class ForestFullRestoreServiceMultipleUsersTest
+    : public FullRestoreServiceMultipleUsersTest {
+ protected:
+  ForestFullRestoreServiceMultipleUsersTest() {
+    scoped_feature_list_.Reset();
+    scoped_feature_list_.InitAndEnableFeature(features::kForestFeature);
+  }
+  ForestFullRestoreServiceMultipleUsersTest(
+      const ForestFullRestoreServiceMultipleUsersTest&) = delete;
+  ForestFullRestoreServiceMultipleUsersTest& operator=(
+      const ForestFullRestoreServiceMultipleUsersTest&) = delete;
+  ~ForestFullRestoreServiceMultipleUsersTest() override = default;
+
+  void SetUp() override {
+    switches::SetIgnoreForestSecretKeyForTest(true);
+    FullRestoreServiceMultipleUsersTest::SetUp();
+  }
+
+  void TearDown() override {
+    switches::SetIgnoreForestSecretKeyForTest(false);
+    FullRestoreServiceMultipleUsersTest::TearDown();
+  }
+};
+
+// Verify the full restore init process when 2 users login at the same time,
+// e.g. after the system restart or upgrading.
+TEST_F(ForestFullRestoreServiceMultipleUsersTest, TwoUsersLoginAtTheSameTime) {
+  // Add `switches::kLoginUser` to the command line to simulate the system
+  // restart.
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kLoginUser, account_id().GetUserEmail());
+  // Set the first user as the last session active user.
+  fake_user_manager()->set_last_session_active_account_id(account_id());
+
+  SetRestoreOption(RestoreOption::kAskEveryTime);
+  SetRestoreOptionForProfile2(RestoreOption::kAskEveryTime);
+
+  // The pine dialog is only shown for the first user.
+  auto mock_delegate = std::make_unique<MockFullRestoreServiceDelegate>();
+  EXPECT_CALL(*mock_delegate, MaybeStartPineOverviewSession(testing::_))
+      .Times(1);
+  CreateFullRestoreServiceForTesting(std::move(mock_delegate));
+
+  auto mock_delegate_2 = std::make_unique<MockFullRestoreServiceDelegate>();
+  auto* mock_delegate_2_ptr = mock_delegate_2.get();
+  EXPECT_CALL(*mock_delegate_2, MaybeStartPineOverviewSession(testing::_))
+      .Times(0);
+  CreateFullRestoreService2ForTesting(std::move(mock_delegate_2));
+
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 1);
+  EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption());
+  EXPECT_TRUE(CanPerformRestore(account_id()));
+  EXPECT_TRUE(allow_save());
+
+  // Simulate switch to the second user. The pine dialog should be shown for
+  // them.
+  auto* full_restore_service2 = FullRestoreService::GetForProfile(profile2());
+  EXPECT_CALL(*mock_delegate_2_ptr, MaybeStartPineOverviewSession(testing::_))
+      .Times(1);
+  full_restore_service2->OnTransitionedToNewActiveUser(profile2());
+
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 2);
+  EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOptionForProfile2());
+  EXPECT_TRUE(CanPerformRestore(account_id2()));
+  EXPECT_TRUE(allow_save());
+}
+
+// Verify the full restore init process when 2 users login one by one.
+TEST_F(ForestFullRestoreServiceMultipleUsersTest, TwoUsersLoginOneByOne) {
+  SetRestoreOption(RestoreOption::kAskEveryTime);
+  auto mock_delegate = std::make_unique<MockFullRestoreServiceDelegate>();
+  EXPECT_CALL(*mock_delegate, MaybeStartPineOverviewSession(testing::_))
+      .Times(1);
+  CreateFullRestoreServiceForTesting(std::move(mock_delegate));
+
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 1);
+  EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption());
+  EXPECT_TRUE(CanPerformRestore(account_id()));
+  EXPECT_TRUE(allow_save());
+
+  SetRestoreOptionForProfile2(RestoreOption::kAskEveryTime);
+  auto mock_delegate_2 = std::make_unique<MockFullRestoreServiceDelegate>();
+  auto* mock_delegate_2_ptr = mock_delegate_2.get();
+  EXPECT_CALL(*mock_delegate_2, MaybeStartPineOverviewSession(testing::_))
+      .Times(0);
+  CreateFullRestoreService2ForTesting(std::move(mock_delegate_2));
+
+  // Simulate switch to the second user. The pine dialog should be shown for
+  // them.
+  auto* full_restore_service2 = FullRestoreService::GetForProfile(profile2());
+  EXPECT_CALL(*mock_delegate_2_ptr, MaybeStartPineOverviewSession(testing::_))
+      .Times(1);
+  full_restore_service2->OnTransitionedToNewActiveUser(profile2());
+
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 2);
+  EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOptionForProfile2());
+  EXPECT_TRUE(CanPerformRestore(account_id()));
+  EXPECT_TRUE(allow_save());
+}
+
+// Verify the full restore init process when the system restarts.
+TEST_F(ForestFullRestoreServiceMultipleUsersTest,
+       TwoUsersLoginWithActiveUserLogin) {
+  // Add `switches::kLoginUser` to the command line to simulate the system
+  // restart.
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kLoginUser, account_id().GetUserEmail());
+  // Set the second user as the last session active user.
+  fake_user_manager()->set_last_session_active_account_id(account_id2());
+
+  SetRestoreOption(RestoreOption::kAskEveryTime);
+  SetRestoreOptionForProfile2(RestoreOption::kAskEveryTime);
+
+  // The pine dialog shouldn't be shown for neither user yet.
+  auto mock_delegate = std::make_unique<MockFullRestoreServiceDelegate>();
+  auto* mock_delegate_ptr = mock_delegate.get();
+  EXPECT_CALL(*mock_delegate, MaybeStartPineOverviewSession(testing::_))
+      .Times(0);
+  CreateFullRestoreServiceForTesting(std::move(mock_delegate));
+
+  auto mock_delegate_2 = std::make_unique<MockFullRestoreServiceDelegate>();
+  auto* mock_delegate_2_ptr = mock_delegate_2.get();
+  EXPECT_CALL(*mock_delegate_2, MaybeStartPineOverviewSession(testing::_))
+      .Times(0);
+  CreateFullRestoreService2ForTesting(std::move(mock_delegate_2));
+
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 0);
+
+  // Simulate switch to the second user. The pine dialog should be shown for
+  // them.
+  auto* full_restore_service2 = FullRestoreService::GetForProfile(profile2());
+  EXPECT_CALL(*mock_delegate_2_ptr, MaybeStartPineOverviewSession(testing::_))
+      .Times(1);
+  full_restore_service2->OnTransitionedToNewActiveUser(profile2());
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 1);
+  EXPECT_TRUE(CanPerformRestore(account_id2()));
+
+  // Simulate switch to the first user. The pine dialog should be shown for
+  // them.
+  auto* full_restore_service = FullRestoreService::GetForProfile(profile());
+  EXPECT_CALL(*mock_delegate_ptr, MaybeStartPineOverviewSession(testing::_))
+      .Times(1);
+  full_restore_service->OnTransitionedToNewActiveUser(profile());
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 2);
+  EXPECT_TRUE(CanPerformRestore(account_id()));
+
+  // Simulate switch to the second user, and verify no more init processes.
+  EXPECT_CALL(*mock_delegate_2_ptr, MaybeStartPineOverviewSession(testing::_))
+      .Times(0);
+  full_restore_service2->OnTransitionedToNewActiveUser(profile2());
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 2);
+
+  // Simulate switch to the first user, and verify no more init processes.
+  EXPECT_CALL(*mock_delegate_ptr, MaybeStartPineOverviewSession(testing::_))
+      .Times(0);
+  full_restore_service->OnTransitionedToNewActiveUser(profile());
+  VerifyRestoreInitSettingHistogram(RestoreOption::kAskEveryTime, 2);
+}
+
 }  // namespace ash::full_restore
diff --git a/chrome/browser/ash/app_restore/pine_browsertest.cc b/chrome/browser/ash/app_restore/pine_browsertest.cc
index f37abf7e..00488710 100644
--- a/chrome/browser/ash/app_restore/pine_browsertest.cc
+++ b/chrome/browser/ash/app_restore/pine_browsertest.cc
@@ -31,25 +31,33 @@
 
 namespace {
 
-// Retrieve the "Restore" button from the pine dialog, if we are in a overview
-// pine session.
-const PillButton* GetPineDialogRestoreButton() {
+PineContentsView* GetPineContentsView() {
   OverviewGrid* overview_grid =
       GetOverviewGridForRoot(Shell::GetPrimaryRootWindow());
   if (!overview_grid) {
     return nullptr;
   }
 
-  // Retrieve the "Restore" button from the pine dialog.
   views::Widget* pine_widget = OverviewGridTestApi(overview_grid).pine_widget();
   if (!pine_widget) {
     return nullptr;
   }
 
-  PineContentsView* pine_contents_view =
-      views::AsViewClass<PineContentsView>(pine_widget->GetContentsView());
-  CHECK(pine_contents_view);
-  return pine_contents_view->restore_button_for_testing();
+  return views::AsViewClass<PineContentsView>(pine_widget->GetContentsView());
+}
+
+// Retrieve the "Restore" button from the pine dialog, if we are in a overview
+// pine session.
+const PillButton* GetPineDialogRestoreButton() {
+  PineContentsView* pine_contents_view = GetPineContentsView();
+  return pine_contents_view ? pine_contents_view->restore_button_for_testing()
+                            : nullptr;
+}
+
+const PillButton* GetPineDialogCancelButton() {
+  PineContentsView* pine_contents_view = GetPineContentsView();
+  return pine_contents_view ? pine_contents_view->cancel_button_for_testing()
+                            : nullptr;
 }
 
 }  // namespace
@@ -341,4 +349,34 @@
   EXPECT_TRUE(window_state->IsMaximized());
 }
 
+IN_PROC_BROWSER_TEST_F(PineBrowserTest, PRE_ClickCancelButton) {
+  EXPECT_TRUE(BrowserList::GetInstance()->empty());
+
+  Profile* profile = ProfileManager::GetActiveUserProfile();
+  CreateBrowser(profile);
+  CreateBrowser(profile);
+  EXPECT_EQ(2u, BrowserList::GetInstance()->size());
+
+  // Immediate save to full restore file to bypass the 2.5 second throttle.
+  AppLaunchInfoSaveWaiter::Wait();
+}
+
+// Verify that with two elements in the full restore file, if we click cancel no
+// browsers are launched.
+IN_PROC_BROWSER_TEST_F(PineBrowserTest, ClickCancelButton) {
+  EXPECT_TRUE(BrowserList::GetInstance()->empty());
+
+  // Verify we have entered overview. The cancel button will be null if we
+  // failed to enter overview.
+  WaitForOverviewEnterAnimation();
+  const PillButton* cancel_button = GetPineDialogCancelButton();
+  ASSERT_TRUE(cancel_button);
+
+  // Click the cancel button. We spin the run loop because launching browsers is
+  // async. Verify that no browsers are launched.
+  test::Click(cancel_button, /*flag=*/0);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(BrowserList::GetInstance()->empty());
+}
+
 }  // namespace ash::full_restore
diff --git a/chrome/browser/ash/crosapi/browser_launcher.cc b/chrome/browser/ash/crosapi/browser_launcher.cc
index b4a5a72..c331e81 100644
--- a/chrome/browser/ash/crosapi/browser_launcher.cc
+++ b/chrome/browser/ash/crosapi/browser_launcher.cc
@@ -12,7 +12,9 @@
 
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_switches.h"
+#include "base/barrier_closure.h"
 #include "base/base_switches.h"
+#include "base/check_is_test.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/feature_list.h"
@@ -36,7 +38,10 @@
 #include "chrome/browser/ash/crosapi/crosapi_id.h"
 #include "chrome/browser/ash/crosapi/crosapi_manager.h"
 #include "chrome/browser/ash/crosapi/crosapi_util.h"
+#include "chrome/browser/ash/crosapi/device_ownership_waiter.h"
+#include "chrome/browser/ash/crosapi/device_ownership_waiter_impl.h"
 #include "chrome/browser/ash/crosapi/environment_provider.h"
+#include "chrome/browser/ash/crosapi/primary_profile_creation_waiter.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
@@ -71,6 +76,10 @@
 using LaunchParams = BrowserLauncher::LaunchParams;
 using LaunchResults = BrowserLauncher::LaunchResults;
 
+// Global flag to skip the device ownership fetch. Global because some tests
+// need to set this value before BrowserManager is constructed.
+bool g_skip_device_ownership_wait_for_testing = false;
+
 base::FilePath LacrosPostLoginLogPath() {
   return browser_util::GetUserDataDir().Append("lacros.log");
 }
@@ -377,7 +386,9 @@
   }
 };
 
-BrowserLauncher::BrowserLauncher() = default;
+BrowserLauncher::BrowserLauncher()
+    : device_ownership_waiter_(std::make_unique<DeviceOwnershipWaiterImpl>()) {}
+
 BrowserLauncher::~BrowserLauncher() = default;
 
 // static
@@ -420,68 +431,39 @@
 LaunchResults& LaunchResults::operator=(LaunchResults&&) = default;
 LaunchResults::~LaunchResults() = default;
 
-std::optional<LaunchResults> BrowserLauncher::LaunchProcess(
-    const base::FilePath& chrome_path,
-    const LaunchParamsFromBackground& params,
-    bool launching_at_login_screen,
-    browser_util::LacrosSelection lacros_selection,
-    base::OnceClosure mojo_disconnection_cb,
-    bool is_keep_alive_enabled) {
-  LOG(WARNING) << "Starting lacros-chrome launching at "
-               << chrome_path.MaybeAsASCII();
-  // Creates FD for startup.
-  // For backward compatibility, we want to pass all the parameters at
-  // startup if we're not launching at login screen.
-  // Vice versa, if we're launching at login screen, we want to split
-  // the parameters in pre-login and post-login.
-  base::ScopedFD startup_fd = browser_util::CreateStartupData(
-      &environment_provider_,
-      browser_util::InitialBrowserAction(
-          mojom::InitialBrowserAction::kDoNotOpenWindow),
-      !is_keep_alive_enabled, lacros_selection, !launching_at_login_screen);
+void BrowserLauncher::Launch(const base::FilePath& chrome_path,
+                             LaunchParamsFromBackground params,
+                             bool launching_at_login_screen,
+                             browser_util::LacrosSelection lacros_selection,
+                             base::OnceClosure mojo_disconnection_cb,
+                             bool is_keep_alive_enabled,
+                             LaunchCompletionCallback callback) {
+  base::OnceClosure on_prepared = base::BindOnce(
+      &BrowserLauncher::LaunchProcess, weak_factory_.GetWeakPtr(), chrome_path,
+      std::move(params), launching_at_login_screen, lacros_selection,
+      std::move(mojo_disconnection_cb), is_keep_alive_enabled,
+      std::move(callback));
 
-  LaunchResults launch_results;
-  // Creates a pipe between FDs when Lacros is launching at login screen.
-  base::ScopedFD read_pipe_fd;
+  // If Lacros is launching at login screen, device owner and profile is not yet
+  // ready, so immediately proceed with launching.
   if (launching_at_login_screen) {
-    CHECK(base::CreatePipe(&read_pipe_fd, &postlogin_pipe_fd_));
+    std::move(on_prepared).Run();
+    return;
   }
 
-  // Sets up Mojo channel.
-  // Uses new Crosapi mojo connection to detect process termination always.
-  mojo::PlatformChannel channel;
-  launch_results.crosapi_id = CrosapiManager::Get()->SendInvitation(
-      channel.TakeLocalEndpoint(), std::move(mojo_disconnection_cb));
-
-  // Initialize command line and options for launching Lacros.
-  // Do NOT include any codes with side effects because we just set up command
-  // line and options in this function. Do NOT modify LaunchParams outside of
-  // `CreateLaunchParams`.
-  LaunchParams parameters = CreateLaunchParams(
-      chrome_path, params, launching_at_login_screen,
-      startup_fd.is_valid() ? std::optional(startup_fd.get()) : std::nullopt,
-      read_pipe_fd.is_valid() ? std::optional(read_pipe_fd.get())
-                              : std::nullopt,
-      channel, lacros_selection);
-
-  base::RecordAction(base::UserMetricsAction("Lacros.Launch"));
-  launch_results.lacros_launch_time = base::TimeTicks::Now();
-
-  bool success = LaunchProcessWithParameters(parameters);
-  channel.RemoteProcessLaunchAttempted();
-
-  return success ? std::make_optional(std::move(launch_results)) : std::nullopt;
+  WaitForDeviceOwnerFetchedAndProfileAddedAndThen(std::move(on_prepared));
 }
 
-void BrowserLauncher::ResumeLaunch() {
+void BrowserLauncher::ResumeLaunch(
+    base::OnceCallback<
+        void(base::expected<base::TimeTicks, LaunchFailureReason>)> callback) {
+  // ResumeLaunch should be called only when the postlogin data is not yet ready
+  // on Lacros process.
   CHECK(postlogin_pipe_fd_.is_valid());
-  // Write post-login parameters into the anonymous pipe.
-  bool write_success = browser_util::WritePostLoginData(
-      postlogin_pipe_fd_.get(), &environment_provider_,
-      browser_util::InitialBrowserAction(
-          mojom::InitialBrowserAction::kDoNotOpenWindow));
-  PCHECK(write_success);
-  postlogin_pipe_fd_.reset();
+
+  WaitForDeviceOwnerFetchedAndProfileAddedAndThen(
+      base::BindOnce(&BrowserLauncher::WritePostLoginData,
+                     weak_factory_.GetWeakPtr(), std::move(callback)));
 }
 
 void BrowserLauncher::SetLastPolicyFetchAttemptTimestamp(
@@ -531,6 +513,116 @@
   SetUpLacrosAdditionalParameters(params, parameters);
 }
 
+void BrowserLauncher::WaitForDeviceOwnerFetchedAndProfileAddedAndThenForTesting(
+    base::OnceClosure cb) {
+  WaitForDeviceOwnerFetchedAndProfileAddedAndThen(std::move(cb));
+}
+
+void BrowserLauncher::set_device_ownership_waiter_for_testing(
+    std::unique_ptr<DeviceOwnershipWaiter> device_ownership_waiter) {
+  CHECK(!device_ownership_waiter_called_);
+  device_ownership_waiter_ = std::move(device_ownership_waiter);
+}
+
+// static
+void BrowserLauncher::SkipDeviceOwnershipWaitForTesting(bool skip) {
+  CHECK_IS_TEST();
+  g_skip_device_ownership_wait_for_testing = skip;
+}
+
+void BrowserLauncher::WaitForDeviceOwnerFetchedAndProfileAddedAndThen(
+    base::OnceClosure cb) {
+  LOG(WARNING) << "Waiting for device owner and primary profile to be ready "
+               << "before start launching lacros-chrome.";
+
+  // Number of the data we should wait here. The device ownership and the
+  // primary profile.
+  constexpr int kNumData = 2;
+  auto barrier_closure = base::BarrierClosure(kNumData, std::move(cb));
+
+  // Wait for the device ownership to be fetched.
+  if (g_skip_device_ownership_wait_for_testing) {
+    CHECK_IS_TEST();
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(FROM_HERE,
+                                                             barrier_closure);
+  } else {
+    device_ownership_waiter_called_ = true;
+    device_ownership_waiter_->WaitForOwnershipFetched(barrier_closure);
+  }
+
+  // Wait for the primary profile to be created.
+  CHECK(!primary_profile_creation_waiter_);
+  primary_profile_creation_waiter_ = PrimaryProfileCreationWaiter::WaitOrRun(
+      g_browser_process->profile_manager(), barrier_closure);
+}
+
+void BrowserLauncher::LaunchProcess(
+    const base::FilePath& chrome_path,
+    LaunchParamsFromBackground params,
+    bool launching_at_login_screen,
+    browser_util::LacrosSelection lacros_selection,
+    base::OnceClosure mojo_disconnection_cb,
+    bool is_keep_alive_enabled,
+    LaunchCompletionCallback callback) {
+  if (shutdown_requested_) {
+    std::move(callback).Run(
+        base::unexpected(LaunchFailureReason::kShutdownRequested));
+    return;
+  }
+
+  LOG(WARNING) << "Starting lacros-chrome launching at "
+               << chrome_path.MaybeAsASCII();
+
+  // Creates FD for startup.
+  // For backward compatibility, we want to pass all the parameters at
+  // startup if we're not launching at login screen.
+  // Vice versa, if we're launching at login screen, we want to split
+  // the parameters in pre-login and post-login.
+  base::ScopedFD startup_fd = browser_util::CreateStartupData(
+      &environment_provider_,
+      browser_util::InitialBrowserAction(
+          mojom::InitialBrowserAction::kDoNotOpenWindow),
+      !is_keep_alive_enabled, lacros_selection, !launching_at_login_screen);
+
+  // Creates a pipe between FDs when Lacros is launching at login screen.
+  base::ScopedFD read_pipe_fd;
+  if (launching_at_login_screen) {
+    CHECK(base::CreatePipe(&read_pipe_fd, &postlogin_pipe_fd_));
+  }
+
+  // Sets up Mojo channel.
+  // Uses new Crosapi mojo connection to detect process termination always.
+  LaunchResults launch_results;
+  mojo::PlatformChannel channel;
+  launch_results.crosapi_id = CrosapiManager::Get()->SendInvitation(
+      channel.TakeLocalEndpoint(), std::move(mojo_disconnection_cb));
+
+  // Initialize command line and options for launching Lacros.
+  // Do NOT include any codes with side effects because we just set up command
+  // line and options in this function. Do NOT modify LaunchParams outside of
+  // `CreateLaunchParams`.
+  LaunchParams parameters = CreateLaunchParams(
+      chrome_path, params, launching_at_login_screen,
+      startup_fd.is_valid() ? std::optional(startup_fd.get()) : std::nullopt,
+      read_pipe_fd.is_valid() ? std::optional(read_pipe_fd.get())
+                              : std::nullopt,
+      channel, lacros_selection);
+
+  base::RecordAction(base::UserMetricsAction("Lacros.Launch"));
+  launch_results.lacros_launch_time = base::TimeTicks::Now();
+
+  bool success = LaunchProcessWithParameters(parameters);
+  channel.RemoteProcessLaunchAttempted();
+
+  // If Lacros failed to launch, it's most likely a permanent problem.
+  if (!success) {
+    std::move(callback).Run(base::unexpected(LaunchFailureReason::kUnknown));
+    return;
+  }
+
+  std::move(callback).Run(base::ok(std::move(launch_results)));
+}
+
 LaunchParams BrowserLauncher::CreateLaunchParams(
     const base::FilePath& chrome_path,
     const LaunchParamsFromBackground& params,
@@ -594,4 +686,28 @@
   return true;
 }
 
+void BrowserLauncher::WritePostLoginData(
+    base::OnceCallback<
+        void(base::expected<base::TimeTicks, LaunchFailureReason>)> callback) {
+  if (shutdown_requested_) {
+    std::move(callback).Run(
+        base::unexpected(LaunchFailureReason::kShutdownRequested));
+    return;
+  }
+
+  LOG(WARNING) << "Resume launching lacros with postlogin data.";
+
+  auto lacros_resume_time = base::TimeTicks::Now();
+
+  // Write post-login parameters into the anonymous pipe.
+  bool write_success = browser_util::WritePostLoginData(
+      postlogin_pipe_fd_.get(), &environment_provider_,
+      browser_util::InitialBrowserAction(
+          mojom::InitialBrowserAction::kDoNotOpenWindow));
+  PCHECK(write_success);
+  postlogin_pipe_fd_.reset();
+
+  std::move(callback).Run(base::ok(lacros_resume_time));
+}
+
 }  // namespace crosapi
diff --git a/chrome/browser/ash/crosapi/browser_launcher.h b/chrome/browser/ash/crosapi/browser_launcher.h
index 031e19c..7dc7109 100644
--- a/chrome/browser/ash/crosapi/browser_launcher.h
+++ b/chrome/browser/ash/crosapi/browser_launcher.h
@@ -14,8 +14,10 @@
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
 #include "base/functional/callback_forward.h"
+#include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "base/time/time.h"
+#include "base/types/expected.h"
 #include "chrome/browser/ash/crosapi/browser_util.h"
 #include "chrome/browser/ash/crosapi/crosapi_id.h"
 #include "chrome/browser/ash/crosapi/environment_provider.h"
@@ -29,6 +31,8 @@
 }  // namespace base
 
 namespace crosapi {
+class DeviceOwnershipWaiter;
+class PrimaryProfileCreationWaiter;
 
 // Manages launching and terminating Lacros process.
 // TODO(crbug.com/1495590): Extract launching logic from BrowserManager to
@@ -108,6 +112,18 @@
     base::TimeTicks lacros_launch_time;
   };
 
+  // Reason of Lacros not being able to launch.
+  enum class LaunchFailureReason {
+    // Failed to launch due to unknown error.
+    kUnknown,
+
+    // Shutdown is requested from BrowserManager during the process launch.
+    kShutdownRequested,
+  };
+
+  using LaunchCompletionCallback = base::OnceCallback<void(
+      base::expected<LaunchResults, LaunchFailureReason>)>;
+
   // Launches a process of the given options, which are expected to be Lacros's
   // ones.
   // Following is explanation for Arguments.
@@ -121,17 +137,21 @@
   // `mojo_disconnection_cb`: Callback function setting up mojo connection.
   // `BrowserManager::OnMojoDisconnected` is called.
   // `is_keep_alive_enabled`: Whether `keep_alive_features` is empty.
-  std::optional<LaunchResults> LaunchProcess(
-      const base::FilePath& chrome_path,
-      const LaunchParamsFromBackground& params,
-      bool launching_at_login_screen,
-      browser_util::LacrosSelection lacros_selection,
-      base::OnceClosure mojo_disconnection_cb,
-      bool is_keep_alive_enabled);
+  // `callback`: Callback function that will be called on launch process
+  // completion.
+  void Launch(const base::FilePath& chrome_path,
+              LaunchParamsFromBackground params,
+              bool launching_at_login_screen,
+              browser_util::LacrosSelection lacros_selection,
+              base::OnceClosure mojo_disconnection_cb,
+              bool is_keep_alive_enabled,
+              LaunchCompletionCallback callback);
 
-  // Writes post login data to the Lacros process. After that,
-  // `postlogin_pipe_fd` is reset.
-  void ResumeLaunch();
+  // Writes post login data to the Lacros process, resets `postlogin_pipe_fd`
+  // and then executes a callback.
+  void ResumeLaunch(
+      base::OnceCallback<
+          void(base::expected<base::TimeTicks, LaunchFailureReason>)> callback);
 
   void SetLastPolicyFetchAttemptTimestamp(base::Time last_refresh);
 
@@ -155,6 +175,9 @@
   void EnsureProcessTerminated(base::OnceClosure callback,
                                base::TimeDelta timeout);
 
+  // Records Shutdown() request from BrowserManager.
+  void Shutdown() { shutdown_requested_ = true; }
+
   // Returns reference to `process_` for testing.
   const base::Process& GetProcessForTesting();
 
@@ -166,7 +189,39 @@
   void SetUpAdditionalParametersForTesting(LaunchParamsFromBackground& params,
                                            LaunchParams& parameters);
 
+  // Provides public API to call WaitForDeviceOwnerFetchedAndProfileAddedAndThen
+  // for testing.
+  void WaitForDeviceOwnerFetchedAndProfileAddedAndThenForTesting(
+      base::OnceClosure cb);
+
+  // TODO(crbug.com/1463883): Remove this once we refactored to use the
+  // constructor.
+  void set_device_ownership_waiter_for_testing(
+      std::unique_ptr<DeviceOwnershipWaiter> device_ownership_waiter);
+
+  // Skips device ownership fetch. Use set_device_ownership_waiter_for_testing()
+  // above if possible. Use this method only if your test must set up the
+  // behavior before BrowserManager is initialized.
+  // TODO(crbug.com/1463883): Remove this and set it from constructor.
+  static void SkipDeviceOwnershipWaitForTesting(bool skip);
+
  private:
+  // Waits for the device owner being fetched from `UserManager` and the primary
+  // user profile being fully created and then executes a callback. Should NOT
+  // be called if Lacros is launching at the login screen since the device owner
+  // nor the profile is not available until login.
+  void WaitForDeviceOwnerFetchedAndProfileAddedAndThen(base::OnceClosure cb);
+
+  // Launches lacros-chrome process after device owner and primary profile
+  // become ready.
+  void LaunchProcess(const base::FilePath& chrome_path,
+                     LaunchParamsFromBackground params,
+                     bool launching_at_login_screen,
+                     browser_util::LacrosSelection lacros_selection,
+                     base::OnceClosure mojo_disconnection_cb,
+                     bool is_keep_alive_enabled,
+                     LaunchCompletionCallback callback);
+
   LaunchParams CreateLaunchParams(
       const base::FilePath& chrome_path,
       const LaunchParamsFromBackground& params,
@@ -180,14 +235,36 @@
   // This is also used for unittest.
   bool LaunchProcessWithParameters(const LaunchParams& parameters);
 
+  // Writes post login data after waiting for device owner and profile to be
+  // ready.
+  void WritePostLoginData(
+      base::OnceCallback<
+          void(base::expected<base::TimeTicks, LaunchFailureReason>)> callback);
+
   // Process handle for the lacros_chrome process.
   base::Process process_;
 
   // Pipe FDs through which Ash and Lacros exchange post-login parameters.
   base::ScopedFD postlogin_pipe_fd_;
 
+  // Used to delay an action until the definitive device owner is fetched.
+  std::unique_ptr<DeviceOwnershipWaiter> device_ownership_waiter_;
+
+  // Used to wait for the primary user profile to be fully created.
+  std::unique_ptr<PrimaryProfileCreationWaiter>
+      primary_profile_creation_waiter_;
+
   // Used to pass ash-chrome specific flags/configurations to lacros-chrome.
   EnvironmentProvider environment_provider_;
+
+  // Tracks whether Shutdown() has been signalled by ash. This flag ensures any
+  // new or existing lacros startup tasks are not executed during shutdown.
+  bool shutdown_requested_ = false;
+
+  // Indicates whether the delegate has been used.
+  bool device_ownership_waiter_called_{false};
+
+  base::WeakPtrFactory<BrowserLauncher> weak_factory_{this};
 };
 
 }  // namespace crosapi
diff --git a/chrome/browser/ash/crosapi/browser_launcher_unittest.cc b/chrome/browser/ash/crosapi/browser_launcher_unittest.cc
index 15fd5abb..6bc3fb2 100644
--- a/chrome/browser/ash/crosapi/browser_launcher_unittest.cc
+++ b/chrome/browser/ash/crosapi/browser_launcher_unittest.cc
@@ -16,27 +16,60 @@
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/scoped_command_line.h"
-#include "base/test/task_environment.h"
 #include "base/test/test_future.h"
 #include "base/time/time.h"
 #include "chrome/browser/ash/crosapi/browser_util.h"
+#include "chrome/browser/ash/crosapi/fake_device_ownership_waiter.h"
+#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
+#include "chrome/test/base/testing_browser_process.h"
+#include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/crosapi/cpp/crosapi_constants.h"
 #include "chromeos/startup/startup_switches.h"
+#include "components/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace crosapi {
 
+namespace {
+const char kPrimaryProfileEmail[] = "user@test";
+}  // namespace
+
 class BrowserLauncherTest : public testing::Test {
  public:
   BrowserLauncherTest() = default;
 
+  void SetUp() override {
+    fake_user_manager_.Reset(std::make_unique<ash::FakeChromeUserManager>());
+
+    profile_manager_ = std::make_unique<TestingProfileManager>(
+        TestingBrowserProcess::GetGlobal());
+    CHECK(profile_manager_->SetUp());
+
+    browser_launcher_.set_device_ownership_waiter_for_testing(
+        std::make_unique<FakeDeviceOwnershipWaiter>());
+  }
+
  protected:
   BrowserLauncher* browser_launcher() { return &browser_launcher_; }
 
- private:
-  base::test::TaskEnvironment task_environment_;
+  void CreatePrimaryProfile() {
+    const AccountId account_id(AccountId::FromUserEmail(kPrimaryProfileEmail));
+    fake_user_manager_->AddUser(account_id);
+    fake_user_manager_->LoginUser(account_id,
+                                  /*set_profile_created_flag=*/false);
+    profile_manager_->CreateTestingProfile(account_id.GetUserEmail());
+    fake_user_manager_->SimulateUserProfileLoad(account_id);
+  }
 
+ private:
+  content::BrowserTaskEnvironment task_environment_;
+
+  user_manager::TypedScopedUserManager<ash::FakeChromeUserManager>
+      fake_user_manager_;
+  std::unique_ptr<TestingProfileManager> profile_manager_;
   BrowserLauncher browser_launcher_;
 };
 
@@ -111,4 +144,51 @@
                                               base::Seconds(5));
   EXPECT_FALSE(browser_launcher()->IsProcessValid());
 }
+
+TEST_F(BrowserLauncherTest, WaitForDeviceOwnerFetchedAndProfileAdded) {
+  base::test::TestFuture<void> future;
+
+  browser_launcher()->WaitForDeviceOwnerFetchedAndProfileAddedAndThenForTesting(
+      future.GetCallback());
+
+  // Before adding primary profile, the callback should not be called.
+  EXPECT_FALSE(user_manager::UserManager::Get()->GetPrimaryUser());
+  EXPECT_FALSE(future.IsReady());
+
+  // Create primary profile.
+  CreatePrimaryProfile();
+  EXPECT_TRUE(future.Wait());
+
+  // Check primary profile user exists.
+  EXPECT_TRUE(user_manager::UserManager::Get()->GetPrimaryUser());
+}
+
+// TODO(elkurin): Add unit test to check all Launch steps.
+
+TEST_F(BrowserLauncherTest, ShutdownRequestedDuringLaunch) {
+  base::test::TestFuture<base::expected<BrowserLauncher::LaunchResults,
+                                        BrowserLauncher::LaunchFailureReason>>
+      future;
+
+  // To test asynchronous behavior, we assume it's not launching at login
+  // screen.
+  constexpr bool launching_at_login_screen = false;
+  browser_launcher()->Launch(
+      base::FilePath(), /*params=*/{}, launching_at_login_screen,
+      browser_util::LacrosSelection::kRootfs,
+      /*mojo_disconneciton_cb=*/{},
+      /*is_keep_alive_enabled=*/false, future.GetCallback());
+  // Shutdown is synchronous while Launch preparation is asynchronously waiting,
+  // for primary profiel to be ready so Shutdown request runs earlier.
+  browser_launcher()->Shutdown();
+
+  // Create primary profile and proceed Launch.
+  CreatePrimaryProfile();
+
+  // Launch should fail due to shutdown requested.
+  EXPECT_FALSE(future.Get<0>().has_value());
+  EXPECT_EQ(BrowserLauncher::LaunchFailureReason::kShutdownRequested,
+            future.Get<0>().error());
+}
+
 }  // namespace crosapi
diff --git a/chrome/browser/ash/crosapi/browser_manager.cc b/chrome/browser/ash/crosapi/browser_manager.cc
index 17dc7ca..b548845 100644
--- a/chrome/browser/ash/crosapi/browser_manager.cc
+++ b/chrome/browser/ash/crosapi/browser_manager.cc
@@ -20,7 +20,6 @@
 #include "ash/public/cpp/notification_utils.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/wm/desks/desks_util.h"
-#include "base/barrier_closure.h"
 #include "base/base_switches.h"
 #include "base/check.h"
 #include "base/check_is_test.h"
@@ -69,9 +68,7 @@
 #include "chrome/browser/ash/crosapi/crosapi_util.h"
 #include "chrome/browser/ash/crosapi/desk_template_ash.h"
 #include "chrome/browser/ash/crosapi/device_ownership_waiter.h"
-#include "chrome/browser/ash/crosapi/device_ownership_waiter_impl.h"
 #include "chrome/browser/ash/crosapi/files_app_launcher.h"
-#include "chrome/browser/ash/crosapi/primary_profile_creation_waiter.h"
 #include "chrome/browser/ash/crosapi/test_mojo_connection_manager.h"
 #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
 #include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
@@ -149,10 +146,6 @@
 // Read by the BrowserManager constructor.
 bool g_disabled_for_testing = false;
 
-// Global flag to skip the device ownership fetch. Global because some tests
-// need to set this value before BrowserManager is constructed.
-bool g_skip_device_ownership_wait_for_testing = false;
-
 constexpr char kLacrosCannotLaunchNotificationID[] =
     "lacros_cannot_launch_notification_id";
 constexpr char kLacrosLauncherNotifierID[] = "lacros_launcher";
@@ -234,7 +227,7 @@
       lacros_dir.Append(base::StringPrintf("locales/%s.pak", locale.c_str()));
   PreloadFile(locale_path);
 
-  // Preload Widevine for the right architecture.
+// Preload Widevine for the right architecture.
 #if BUILDFLAG(ENABLE_WIDEVINE)
 #if defined(ARCH_CPU_ARM_FAMILY)
 #if defined(ARCH_CPU_ARM64)
@@ -583,8 +576,7 @@
     component_updater::ComponentUpdateService* update_service)
     : browser_loader_(std::move(browser_loader)),
       launch_at_login_screen_(ShouldPrelaunchLacrosAtLoginScreen()),
-      disabled_for_testing_(g_disabled_for_testing),
-      device_ownership_waiter_(std::make_unique<DeviceOwnershipWaiterImpl>()) {
+      disabled_for_testing_(g_disabled_for_testing) {
   DCHECK(!g_instance);
   g_instance = this;
   version_service_delegate_ =
@@ -653,8 +645,7 @@
 
 bool BrowserManager::IsRunningOrWillRun() const {
   return state_ == State::RUNNING || state_ == State::STARTING ||
-         state_ == State::PREPARING_FOR_LAUNCH ||
-         state_ == State::WAITING_OWNER_FETCH || state_ == State::TERMINATING;
+         state_ == State::PREPARING_FOR_LAUNCH || state_ == State::TERMINATING;
 }
 
 bool BrowserManager::IsInitialized() const {
@@ -794,7 +785,6 @@
 
     case State::MOUNTING:
     case State::PREPARING_FOR_LAUNCH:
-    case State::WAITING_OWNER_FETCH:
     case State::STARTING:
       LOG(WARNING)
           << "Ensuring Lacros launch: already in the process of starting";
@@ -939,6 +929,7 @@
   shutdown_requested_ = true;
   shutdown_requested_while_prelaunched_ = (state_ == State::PRE_LAUNCHED);
   pending_actions_.Clear();
+  browser_launcher_.Shutdown();
 
   // The lacros-chrome process may have already been terminated as the result of
   // a previous mojo pipe disconnection in `OnMojoDisconnected()` and not yet
@@ -958,8 +949,8 @@
 
 void BrowserManager::set_device_ownership_waiter_for_testing(
     std::unique_ptr<DeviceOwnershipWaiter> device_ownership_waiter) {
-  CHECK(!device_ownership_waiter_called_);
-  device_ownership_waiter_ = std::move(device_ownership_waiter);
+  browser_launcher_.set_device_ownership_waiter_for_testing(  // IN-TEST
+      std::move(device_ownership_waiter));
 }
 
 void BrowserManager::set_relaunch_requested_for_testing(
@@ -1053,48 +1044,6 @@
   is_initial_lacros_launch_after_reboot_ = false;
 }
 
-void BrowserManager::StartWithLogFile(
-    bool launching_at_login_screen,
-    BrowserLauncher::LaunchParamsFromBackground params) {
-  CHECK((!launching_at_login_screen && state_ == State::WAITING_OWNER_FETCH) ||
-        (launching_at_login_screen && state_ == State::PREPARING_FOR_LAUNCH));
-
-  // Shutdown() might have been called after Start() posted the StartWithLogFile
-  // task, so we need to check `shutdown_requested_` again.
-  if (shutdown_requested_) {
-    LOG(ERROR) << "Start attempted after Shutdown() called.";
-    SetState(State::STOPPED);
-    return;
-  }
-
-  // Ensures that this is the first time to initialize `crosapi_id` before
-  // calling `browser_launcher_.LaunchProcess`.
-  CHECK(!crosapi_id_.has_value());
-  CHECK(lacros_selection_.has_value());
-
-  // Lacros-chrome starts with kNormal type
-  // TODO(crbug.com/1289736): When `LacrosThreadTypeDelegate` becomes usable,
-  // `options.pre_exec_delegate` should be assigned a `LacrosThreadTypeDelegate`
-  // object.
-  std::optional<BrowserLauncher::LaunchResults> launch_results =
-      browser_launcher_.LaunchProcess(
-          lacros_path_, params, launching_at_login_screen,
-          lacros_selection_.value(),
-          base::BindOnce(&BrowserManager::OnMojoDisconnected,
-                         weak_factory_.GetWeakPtr()),
-          keep_alive_features_.empty());
-  if (!launch_results) {
-    // We give up, as this is most likely a permanent problem.
-    SetState(State::UNAVAILABLE);
-    return;
-  }
-
-  crosapi_id_ = launch_results->crosapi_id;
-  lacros_launch_time_ = launch_results->lacros_launch_time;
-
-  SetState(launching_at_login_screen ? State::PRE_LAUNCHED : State::STARTING);
-}
-
 void BrowserManager::EmitLoginPromptVisibleCalled() {
   OnLoginPromptVisible();
 }
@@ -1479,67 +1428,36 @@
   // the following action will be executed.
   pending_actions_.Push(BrowserAction::GetActionForSessionStart());
 
-  WaitForDeviceOwnerFetchedAndProfileAddedAndThen(
-      base::BindOnce(&BrowserManager::ResumeLaunchAfterProfileAdded,
-                     weak_factory_.GetWeakPtr()));
+  browser_launcher_.ResumeLaunch(base::BindOnce(
+      &BrowserManager::OnResumeLaunchComplete, weak_factory_.GetWeakPtr()));
 }
 
-void BrowserManager::WaitForDeviceOwnerFetchedAndProfileAddedAndThen(
-    base::OnceClosure cb) {
-  CHECK(state_ == State::PRE_LAUNCHED || state_ == State::PREPARING_FOR_LAUNCH);
-  SetState(State::WAITING_OWNER_FETCH);
+void BrowserManager::OnResumeLaunchComplete(
+    base::expected<base::TimeTicks, BrowserLauncher::LaunchFailureReason>
+        resume_time) {
+  CHECK_EQ(state_, State::PRE_LAUNCHED);
 
-  // Number of the data we should wait here. The device ownership and the
-  // primary profile.
-  constexpr int kNumData = 2;
-  auto barrier_closure = base::BarrierClosure(kNumData, std::move(cb));
-
-  // Wait for the device ownership to be fetched.
-  if (g_skip_device_ownership_wait_for_testing) {
-    CHECK_IS_TEST();
-    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(FROM_HERE,
-                                                             barrier_closure);
-  } else {
-    device_ownership_waiter_called_ = true;
-    device_ownership_waiter_->WaitForOwnershipFetched(barrier_closure);
+  if (!resume_time.has_value()) {
+    switch (resume_time.error()) {
+      case BrowserLauncher::LaunchFailureReason::kShutdownRequested:
+        LOG(ERROR) << "Shutdown() called during resuming launch.";
+        SetState(State::STOPPED);
+        return;
+      case BrowserLauncher::LaunchFailureReason::kUnknown:
+        NOTREACHED();
+        return;
+    }
   }
 
-  // Wait for the primary profile to be created.
-  CHECK(!primary_profile_creation_waiter_);
-  primary_profile_creation_waiter_ = PrimaryProfileCreationWaiter::WaitOrRun(
-      g_browser_process->profile_manager(), barrier_closure);
-}
-
-void BrowserManager::OnLaunchParamsFetched(
-    bool launching_at_login_screen,
-    BrowserLauncher::LaunchParamsFromBackground params) {
-  CHECK_EQ(state_, State::PREPARING_FOR_LAUNCH);
-
-  // On launching at login screen, the device ownership data is not ready yet
-  // and will be fetched on resuming launch.
-  if (launching_at_login_screen) {
-    StartWithLogFile(launching_at_login_screen, std::move(params));
-    return;
-  }
-
-  WaitForDeviceOwnerFetchedAndProfileAddedAndThen(base::BindOnce(
-      &BrowserManager::StartWithLogFile, weak_factory_.GetWeakPtr(),
-      launching_at_login_screen, std::move(params)));
-}
-
-void BrowserManager::ResumeLaunchAfterProfileAdded() {
-  CHECK_EQ(state_, State::WAITING_OWNER_FETCH);
-  // Execute actions that we couldn't run when pre-launching at login screen,
-  // because they required the user to be logged in.
-  RecordLacrosLaunchMode();
-  crosapi::lacros_startup_state::SetLacrosStartupState(true);
-
-  lacros_resume_time_ = base::TimeTicks::Now();
-  browser_launcher_.ResumeLaunch();
+  lacros_resume_time_ = resume_time.value();
 
   // Lacros launch is unblocked now.
   SetState(State::STARTING);
 
+  // Record Lacros launch mode and state.
+  RecordLacrosLaunchMode();
+  crosapi::lacros_startup_state::SetLacrosStartupState(true);
+
   // Post `DryRunToCollectUMA()` to send UMA stats about sizes of files/dirs
   // inside the profile data directory.
   base::ThreadPool::PostTask(
@@ -1549,6 +1467,55 @@
                      ProfileManager::GetPrimaryUserProfile()->GetPath()));
 }
 
+void BrowserManager::OnLaunchParamsFetched(
+    bool launching_at_login_screen,
+    BrowserLauncher::LaunchParamsFromBackground params) {
+  CHECK_EQ(state_, State::PREPARING_FOR_LAUNCH);
+
+  // Ensures that this is the first time to initialize `crosapi_id` before
+  // calling `browser_launcher_.Launch`.
+  CHECK(!crosapi_id_.has_value());
+  CHECK(lacros_selection_.has_value());
+
+  // Lacros-chrome starts with kNormal type
+  // TODO(crbug.com/1289736): When `LacrosThreadTypeDelegate` becomes usable,
+  // `options.pre_exec_delegate` should be assigned a `LacrosThreadTypeDelegate`
+  // object.
+  browser_launcher_.Launch(
+      lacros_path_, std::move(params), launching_at_login_screen,
+      lacros_selection_.value(),
+      base::BindOnce(&BrowserManager::OnMojoDisconnected,
+                     weak_factory_.GetWeakPtr()),
+      keep_alive_features_.empty(),
+      base::BindOnce(&BrowserManager::OnLaunchComplete,
+                     weak_factory_.GetWeakPtr(), launching_at_login_screen));
+}
+
+void BrowserManager::OnLaunchComplete(
+    bool launching_at_login_screen,
+    base::expected<BrowserLauncher::LaunchResults,
+                   BrowserLauncher::LaunchFailureReason> launch_results) {
+  CHECK_EQ(state_, State::PREPARING_FOR_LAUNCH);
+
+  if (!launch_results.has_value()) {
+    switch (launch_results.error()) {
+      case BrowserLauncher::LaunchFailureReason::kUnknown:
+        // We give up, as this is most likely a permanent problem.
+        SetState(State::UNAVAILABLE);
+        return;
+      case BrowserLauncher::LaunchFailureReason::kShutdownRequested:
+        LOG(ERROR) << "Start attempted after Shutdown() called.";
+        SetState(State::STOPPED);
+        return;
+    }
+  }
+
+  crosapi_id_ = launch_results->crosapi_id;
+  lacros_launch_time_ = launch_results->lacros_launch_time;
+
+  SetState(launching_at_login_screen ? State::PRE_LAUNCHED : State::STARTING);
+}
+
 void BrowserManager::HandleGoToFiles() {
   // If "Go to files" on the migration error page was clicked, launch it here.
   Profile* profile = ProfileManager::GetPrimaryUserProfile();
@@ -1710,14 +1677,7 @@
       return;
 
     case State::PREPARING_FOR_LAUNCH:
-      LOG(WARNING)
-          << "params for lacros-chrome are prepared on a background thread";
-      pending_actions_.PushOrCancel(std::move(action),
-                                    mojom::CreationResult::kBrowserNotRunning);
-      return;
-
-    case State::WAITING_OWNER_FETCH:
-      LOG(WARNING) << "lacros-chrome is waiting for device owner to be fetched";
+      LOG(WARNING) << "lacros-chrome is preparing for launch";
       pending_actions_.PushOrCancel(std::move(action),
                                     mojom::CreationResult::kBrowserNotRunning);
       return;
@@ -1797,10 +1757,4 @@
   browser_launcher_.TriggerTerminate(/*exit_code=*/1);
 }
 
-// static
-void BrowserManager::SkipDeviceOwnershipWaitForTesting(bool skip) {
-  CHECK_IS_TEST();
-  g_skip_device_ownership_wait_for_testing = skip;
-}
-
 }  // namespace crosapi
diff --git a/chrome/browser/ash/crosapi/browser_manager.h b/chrome/browser/ash/crosapi/browser_manager.h
index 5e6af5b4..1c8ca9f9 100644
--- a/chrome/browser/ash/crosapi/browser_manager.h
+++ b/chrome/browser/ash/crosapi/browser_manager.h
@@ -27,8 +27,6 @@
 #include "chrome/browser/ash/crosapi/browser_util.h"
 #include "chrome/browser/ash/crosapi/browser_version_service_ash.h"
 #include "chrome/browser/ash/crosapi/crosapi_id.h"
-#include "chrome/browser/ash/crosapi/device_ownership_waiter_impl.h"
-#include "chrome/browser/ash/crosapi/primary_profile_creation_waiter.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
 #include "chromeos/crosapi/mojom/crosapi.mojom.h"
@@ -331,11 +329,6 @@
   void set_device_ownership_waiter_for_testing(
       std::unique_ptr<DeviceOwnershipWaiter> device_ownership_waiter);
 
-  // Skips device ownership fetch. Use set_device_ownership_waiter_for_testing()
-  // above if possible. Use this method only if your test must set up the
-  // behavior before BrowserManager is initialized.
-  static void SkipDeviceOwnershipWaitForTesting(bool skip);
-
   void set_relaunch_requested_for_testing(bool relaunch_requested);
 
   // Disable most of BrowserManager's functionality such that it never tries to
@@ -404,10 +397,6 @@
     // Params for lacros-chrome are parepared on a background thread.
     PREPARING_FOR_LAUNCH,
 
-    // Lacros-chrome is waiting for device owner to be fetched after receiving
-    // params. For prelaunching, it also waits for profile to be added.
-    WAITING_OWNER_FETCH,
-
     // Lacros-chrome has been pre-launched at login screen, and it's waiting to
     // be unblocked post-login.
     PRE_LAUNCHED,
@@ -563,11 +552,6 @@
 
   void StartIfNeeded(bool launching_at_login_screen = false);
 
-  // Starts the lacros-chrome process and redirects stdout/err to file pointed
-  // by |params.logfd|.
-  void StartWithLogFile(bool launching_at_login_screen,
-                        BrowserLauncher::LaunchParamsFromBackground params);
-
   // Called when the Mojo connection to lacros-chrome is disconnected. It may be
   // "just a Mojo error" or "lacros-chrome crash". This method posts a
   // shutdown-blocking async task that waits lacros-chrome to exit, giving it a
@@ -595,22 +579,22 @@
   // Resume Lacros startup process after login.
   void ResumeLaunch();
 
-  // Executes actions needed to resume Lacros's launch post-login,
-  // and writes post login data to the Lacros process.
-  // This method is guaranteed to run after the profile has been added.
-  void ResumeLaunchAfterProfileAdded();
-
-  // Waits for the device owner being fetched from `UserManager` and the primary
-  // user profile being fully created and then executes a callback. Should NOT
-  // be called if Lacros is launching at the login screen since the device owner
-  // nor the profile is not available until login.
-  void WaitForDeviceOwnerFetchedAndProfileAddedAndThen(base::OnceClosure cb);
+  // Called on ResumeLaunch completed.
+  void OnResumeLaunchComplete(
+      base::expected<base::TimeTicks, BrowserLauncher::LaunchFailureReason>
+          resume_time);
 
   // Called as soon as `LaunchParamsFromBackground` are fetched.
   void OnLaunchParamsFetched(
       bool launching_at_login_screens,
       BrowserLauncher::LaunchParamsFromBackground params);
 
+  // Called on launch process completed.
+  void OnLaunchComplete(
+      bool lauching_at_login_screen,
+      base::expected<BrowserLauncher::LaunchResults,
+                     BrowserLauncher::LaunchFailureReason> launch_results);
+
   // Launch "Go to files" if the migration error page was clicked.
   void HandleGoToFiles();
 
@@ -759,10 +743,6 @@
   // '--lacros-mojo-socket-for-testing' is present in the command line.
   std::unique_ptr<TestMojoConnectionManager> test_mojo_connection_manager_;
 
-  // Used to wait for the primary user profile to be fully created.
-  std::unique_ptr<PrimaryProfileCreationWaiter>
-      primary_profile_creation_waiter_;
-
   // The features that are currently registered to keep Lacros alive.
   std::set<Feature> keep_alive_features_;
 
@@ -772,9 +752,6 @@
 
   const bool disabled_for_testing_;
 
-  // Indicates whether the delegate has been used.
-  bool device_ownership_waiter_called_{false};
-
   // Used to launch files.app when user clicked "Go to files" on the migration
   // error screen.
   std::unique_ptr<FilesAppLauncher> files_app_launcher_;
@@ -795,9 +772,6 @@
                           user_manager::UserManager::Observer>
       user_manager_observation_{this};
 
-  // Used to delay an action until the definitive device owner is fetched.
-  std::unique_ptr<DeviceOwnershipWaiter> device_ownership_waiter_;
-
   base::WeakPtrFactory<BrowserManager> weak_factory_{this};
 };
 
diff --git a/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc b/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc
index 18a5c20..8d7fa33 100644
--- a/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc
+++ b/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc
@@ -92,12 +92,12 @@
   ~CrostiniSshfsHelperTest() override {
     storage::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
         kMountName);
-    file_manager::VolumeManagerFactory::GetInstance()->SetTestingFactory(
-        profile_.get(), BrowserContextKeyedServiceFactory::TestingFactory{});
-    DiskMountManager::Shutdown();
     crostini_sshfs_.reset();
     crostini_test_helper_.reset();
     profile_.reset();
+    file_manager::VolumeManagerFactory::GetInstance()->SetTestingFactory(
+        profile_.get(), BrowserContextKeyedServiceFactory::TestingFactory{});
+    DiskMountManager::Shutdown();
     ash::SeneschalClient::Shutdown();
     ash::ConciergeClient::Shutdown();
     ash::CiceroneClient::Shutdown();
@@ -160,14 +160,7 @@
   base::HistogramTester histogram_tester{};
 };
 
-// TODO(https://crbug.com/1491372): UAF and other failures in MSAN, ASAN
-#if BUILDFLAG(IS_LINUX) && \
-    (defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER))
-#define MAYBE_MountDiskMountsDisk DISABLED_MountDiskMountsDisk
-#else
-#define MAYBE_MountDiskMountsDisk MountDiskMountsDisk
-#endif
-TEST_F(CrostiniSshfsHelperTest, MAYBE_MountDiskMountsDisk) {
+TEST_F(CrostiniSshfsHelperTest, MountDiskMountsDisk) {
   SetContainerRunning(DefaultContainerId());
   ExpectMountCalls(1);
   bool result = false;
@@ -205,15 +198,7 @@
   histogram_tester.ExpectTotalCount(kCrostiniMetricMountTimeTaken, 1);
 }
 
-// TODO(https://crbug.com/1491372): UAF and other failures in MSAN, ASAN
-#if BUILDFLAG(IS_LINUX) && \
-    (defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER))
-#define MAYBE_OnlyDefaultContainerSupported \
-  DISABLED_OnlyDefaultContainerSupported
-#else
-#define MAYBE_OnlyDefaultContainerSupported OnlyDefaultContainerSupported
-#endif
-TEST_F(CrostiniSshfsHelperTest, MAYBE_OnlyDefaultContainerSupported) {
+TEST_F(CrostiniSshfsHelperTest, OnlyDefaultContainerSupported) {
   auto not_default =
       guest_os::GuestId(kCrostiniDefaultVmType, "vm_name", "container_name");
   SetContainerRunning(not_default);
@@ -247,16 +232,7 @@
   histogram_tester.ExpectTotalCount(kCrostiniMetricMountResultUserVisible, 0);
 }
 
-// TODO(https://crbug.com/1491372): UAF and other failures in MSAN, ASAN
-#if BUILDFLAG(IS_LINUX) && \
-    (defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER))
-#define MAYBE_MultipleCallsAreQueuedAndOnlyMountOnce \
-  DISABLED_MultipleCallsAreQueuedAndOnlyMountOnce
-#else
-#define MAYBE_MultipleCallsAreQueuedAndOnlyMountOnce \
-  MultipleCallsAreQueuedAndOnlyMountOnce
-#endif
-TEST_F(CrostiniSshfsHelperTest, MAYBE_MultipleCallsAreQueuedAndOnlyMountOnce) {
+TEST_F(CrostiniSshfsHelperTest, MultipleCallsAreQueuedAndOnlyMountOnce) {
   SetContainerRunning(DefaultContainerId());
 
   ExpectMountCalls(1);
@@ -285,14 +261,7 @@
   histogram_tester.ExpectTotalCount(kCrostiniMetricMountTimeTaken, 2);
 }
 
-// TODO(https://crbug.com/1491372): UAF and other failures in MSAN, ASAN
-#if BUILDFLAG(IS_LINUX) && \
-    (defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER))
-#define MAYBE_CanRemountAfterUnmount DISABLED_CanRemountAfterUnmount
-#else
-#define MAYBE_CanRemountAfterUnmount CanRemountAfterUnmount
-#endif
-TEST_F(CrostiniSshfsHelperTest, MAYBE_CanRemountAfterUnmount) {
+TEST_F(CrostiniSshfsHelperTest, CanRemountAfterUnmount) {
   SetContainerRunning(DefaultContainerId());
   ExpectMountCalls(2);
   EXPECT_CALL(*disk_manager_, UnmountPath)
@@ -329,16 +298,7 @@
   histogram_tester.ExpectTotalCount(kCrostiniMetricUnmountTimeTaken, 1);
 }
 
-// TODO(https://crbug.com/1491372): UAF and other failures in MSAN, ASAN
-#if BUILDFLAG(IS_LINUX) && \
-    (defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER))
-#define MAYBE_ContainerShutdownClearsMountStatus \
-  DISABLED_ContainerShutdownClearsMountStatus
-#else
-#define MAYBE_ContainerShutdownClearsMountStatus \
-  ContainerShutdownClearsMountStatus
-#endif
-TEST_F(CrostiniSshfsHelperTest, MAYBE_ContainerShutdownClearsMountStatus) {
+TEST_F(CrostiniSshfsHelperTest, ContainerShutdownClearsMountStatus) {
   SetContainerRunning(DefaultContainerId());
   ExpectMountCalls(2);
   crostini_sshfs_->MountCrostiniFiles(
diff --git a/chrome/browser/ash/dbus/vm/vm_applications_service_provider.cc b/chrome/browser/ash/dbus/vm/vm_applications_service_provider.cc
index 52502c6..ef5bad5 100644
--- a/chrome/browser/ash/dbus/vm/vm_applications_service_provider.cc
+++ b/chrome/browser/ash/dbus/vm/vm_applications_service_provider.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/ash/borealis/borealis_service.h"
 #include "chrome/browser/ash/crostini/crostini_features.h"
 #include "chrome/browser/ash/crostini/crostini_util.h"
-#include "chrome/browser/ash/exo/chrome_data_exchange_delegate.h"
+#include "chrome/browser/ash/exo/chrome_security_delegate.h"
 #include "chrome/browser/ash/guest_os/guest_id.h"
 #include "chrome/browser/ash/guest_os/guest_os_mime_types_service.h"
 #include "chrome/browser/ash/guest_os/guest_os_mime_types_service_factory.h"
diff --git a/chrome/browser/ash/exo/chrome_data_exchange_delegate.cc b/chrome/browser/ash/exo/chrome_data_exchange_delegate.cc
index ccbdb91..0783b29 100644
--- a/chrome/browser/ash/exo/chrome_data_exchange_delegate.cc
+++ b/chrome/browser/ash/exo/chrome_data_exchange_delegate.cc
@@ -7,44 +7,19 @@
 #include <string>
 #include <vector>
 
-#include "ash/components/arc/arc_util.h"
 #include "ash/public/cpp/app_types_util.h"
-#include "base/logging.h"
-#include "base/memory/ref_counted_memory.h"
-#include "base/strings/escape.h"
-#include "base/strings/strcat.h"
-#include "base/strings/string_piece.h"
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ash/arc/arc_util.h"
 #include "chrome/browser/ash/borealis/borealis_window_manager.h"
 #include "chrome/browser/ash/crosapi/browser_util.h"
 #include "chrome/browser/ash/crostini/crostini_util.h"
-#include "chrome/browser/ash/extensions/file_manager/event_router.h"
-#include "chrome/browser/ash/extensions/file_manager/event_router_factory.h"
-#include "chrome/browser/ash/file_manager/app_id.h"
 #include "chrome/browser/ash/file_manager/fileapi_util.h"
-#include "chrome/browser/ash/file_manager/filesystem_api_util.h"
 #include "chrome/browser/ash/file_manager/path_util.h"
-#include "chrome/browser/ash/fusebox/fusebox_server.h"
-#include "chrome/browser/ash/guest_os/guest_os_session_tracker.h"
-#include "chrome/browser/ash/guest_os/guest_os_share_path.h"
-#include "chrome/browser/ash/plugin_vm/plugin_vm_files.h"
 #include "chrome/browser/ash/plugin_vm/plugin_vm_util.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/common/drop_data.h"
-#include "storage/browser/file_system/external_mount_points.h"
 #include "storage/browser/file_system/file_system_context.h"
 #include "storage/browser/file_system/file_system_url.h"
-#include "third_party/blink/public/common/storage_key/storage_key.h"
 #include "ui/aura/window.h"
-#include "ui/base/clipboard/clipboard.h"
-#include "ui/base/clipboard/clipboard_buffer.h"
-#include "ui/base/clipboard/file_info.h"
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
-#include "ui/base/dragdrop/os_exchange_data.h"
-#include "url/gurl.h"
 
 namespace ash {
 
@@ -52,8 +27,6 @@
 
 constexpr char kMimeTypeArcUriList[] = "application/x-arc-uri-list";
 constexpr char kMimeTypeTextUriList[] = "text/uri-list";
-constexpr char kUriListSeparator[] = "\r\n";
-constexpr char kVmFileScheme[] = "vmfile";
 
 storage::FileSystemContext* GetFileSystemContext() {
   Profile* primary_profile = ProfileManager::GetPrimaryUserProfile();
@@ -63,267 +36,32 @@
   return file_manager::util::GetFileManagerFileSystemContext(primary_profile);
 }
 
-void GetFileSystemUrlsFromPickle(
-    const base::Pickle& pickle,
-    std::vector<storage::FileSystemURL>* file_system_urls) {
+}  // namespace
+
+std::vector<storage::FileSystemURL> GetFileSystemUrlsFromPickle(
+    const base::Pickle& pickle) {
+  std::vector<storage::FileSystemURL> file_system_urls;
+
   storage::FileSystemContext* file_system_context = GetFileSystemContext();
-  if (!file_system_context)
-    return;
+  if (!file_system_context) {
+    return file_system_urls;
+  }
 
   std::vector<content::DropData::FileSystemFileInfo> file_system_files;
   if (!content::DropData::FileSystemFileInfo::ReadFileSystemFilesFromPickle(
-          pickle, &file_system_files))
-    return;
+          pickle, &file_system_files)) {
+    return file_system_urls;
+  }
 
   for (const auto& file_system_file : file_system_files) {
     const storage::FileSystemURL file_system_url =
         file_system_context->CrackURLInFirstPartyContext(file_system_file.url);
-    if (file_system_url.is_valid())
-      file_system_urls->push_back(std::move(file_system_url));
-  }
-}
-
-void SendArcUrls(exo::DataExchangeDelegate::SendDataCallback callback,
-                 const std::vector<GURL>& urls) {
-  std::vector<std::string> lines;
-  for (const GURL& url : urls) {
-    if (!url.is_valid())
-      continue;
-    lines.push_back(url.spec());
-  }
-  // Arc requires UTF16 for data.
-  std::move(callback).Run(base::MakeRefCounted<base::RefCountedString16>(
-      base::UTF8ToUTF16(base::JoinString(lines, kUriListSeparator))));
-}
-
-void SendAfterShare(ui::EndpointType target,
-                    exo::DataExchangeDelegate::SendDataCallback callback,
-                    std::vector<std::string> file_urls) {
-  std::string joined = base::JoinString(file_urls, kUriListSeparator);
-  scoped_refptr<base::RefCountedMemory> data;
-  if (target == ui::EndpointType::kArc) {
-    // Arc uses utf-16 data.
-    data = base::MakeRefCounted<base::RefCountedString16>(
-        base::UTF8ToUTF16(joined));
-  } else {
-    data = base::MakeRefCounted<base::RefCountedString>(std::move(joined));
-  }
-
-  std::move(callback).Run(data);
-}
-
-struct FileInfo {
-  base::FilePath path;
-  storage::FileSystemURL url;
-};
-
-// Returns true if path is shared with the specified VM, or for crostini if path
-// is homedir or dir within.
-bool IsPathShared(Profile* profile,
-                  std::string vm_name,
-                  bool is_crostini,
-                  base::FilePath path) {
-  auto* share_path = guest_os::GuestOsSharePath::GetForProfile(profile);
-  if (share_path->IsPathShared(vm_name, path)) {
-    return true;
-  }
-  if (is_crostini) {
-    base::FilePath mount =
-        file_manager::util::GetCrostiniMountDirectory(profile);
-    return path == mount || mount.IsParent(path);
-  }
-  return false;
-}
-
-// Translate |vm_paths| from |source| VM to host paths.
-std::vector<FileInfo> TranslateVMToHost(ui::EndpointType source,
-                                        std::vector<ui::FileInfo> vm_paths) {
-  std::vector<FileInfo> file_info;
-  Profile* primary_profile = ProfileManager::GetPrimaryUserProfile();
-  bool is_crostini = source == ui::EndpointType::kCrostini;
-  bool is_plugin_vm = source == ui::EndpointType::kPluginVm;
-
-  base::FilePath vm_mount;
-  std::string vm_name;
-  if (is_crostini) {
-    vm_mount = crostini::ContainerChromeOSBaseDirectory();
-    vm_name = crostini::kCrostiniDefaultVmName;
-  } else if (is_plugin_vm) {
-    vm_mount = plugin_vm::ChromeOSBaseDirectory();
-    vm_name = plugin_vm::kPluginVmName;
-  }
-
-  for (ui::FileInfo& info : vm_paths) {
-    base::FilePath path = std::move(info.path);
-    storage::FileSystemURL url;
-
-    // Convert the VM path to a path in the host if possible (in homedir or
-    // /mnt/chromeos for crostini; in //ChromeOS for Plugin VM), otherwise
-    // prefix with 'vmfile:<vm_name>:' to avoid VMs spoofing host paths.
-    // E.g. crostini /etc/mime.types => vmfile:termina:/etc/mime.types.
-    if (is_crostini || is_plugin_vm) {
-      if (file_manager::util::ConvertPathInsideVMToFileSystemURL(
-              primary_profile, path, vm_mount,
-              /*map_crostini_home=*/is_crostini, &url)) {
-        path = url.path();
-        // Only allow write to clipboard for paths that are shared.
-        if (!IsPathShared(primary_profile, vm_name, is_crostini, path)) {
-          LOG(WARNING) << "Unshared file path: " << path;
-          continue;
-        }
-      } else {
-        path = base::FilePath(
-            base::StrCat({kVmFileScheme, ":", vm_name, ":", path.value()}));
-      }
+    if (file_system_url.is_valid()) {
+      file_system_urls.push_back(std::move(file_system_url));
     }
-    file_info.push_back({std::move(path), std::move(url)});
-  }
-  return file_info;
-}
-
-// Crack paths and get FileSystemURL.
-std::vector<FileInfo> CrackPaths(std::vector<base::FilePath> paths) {
-  storage::ExternalMountPoints* mount_points =
-      storage::ExternalMountPoints::GetSystemInstance();
-  base::FilePath virtual_path;
-  std::vector<FileInfo> file_info;
-
-  for (auto& path : paths) {
-    // Convert absolute host path to FileSystemURL if possible.
-    storage::FileSystemURL url;
-    if (mount_points->GetVirtualPath(path, &virtual_path)) {
-      url = mount_points->CreateCrackedFileSystemURL(
-          blink::StorageKey(), storage::kFileSystemTypeExternal, virtual_path);
-    }
-    file_info.push_back({std::move(path), std::move(url)});
-  }
-  return file_info;
-}
-
-// Share |files| with |target| VM and invoke |callback| with translated file:
-// URLs.
-void ShareAndTranslateHostToVM(
-    ui::EndpointType target,
-    std::vector<FileInfo> files,
-    base::OnceCallback<void(std::vector<std::string>)> callback) {
-  Profile* primary_profile = ProfileManager::GetPrimaryUserProfile();
-  bool is_arc = target == ui::EndpointType::kArc;
-  bool is_crostini = target == ui::EndpointType::kCrostini;
-  bool is_plugin_vm = target == ui::EndpointType::kPluginVm;
-
-  base::FilePath vm_mount;
-  std::string vm_name;
-  if (is_arc) {
-    // For ARC, |share_required| below will always be false and |vm_name| will
-    // not be used. Setting it to arc::kArcVmName has no effect.
-    vm_name = arc::kArcVmName;
-  } else if (is_crostini) {
-    vm_mount = crostini::ContainerChromeOSBaseDirectory();
-    vm_name = crostini::kCrostiniDefaultVmName;
-  } else if (is_plugin_vm) {
-    vm_mount = plugin_vm::ChromeOSBaseDirectory();
-    vm_name = plugin_vm::kPluginVmName;
   }
 
-  const std::string vm_prefix =
-      base::StrCat({kVmFileScheme, ":", vm_name, ":"});
-  std::vector<std::string> file_urls;
-  auto* share_path = guest_os::GuestOsSharePath::GetForProfile(primary_profile);
-  std::vector<base::FilePath> paths_to_share;
-
-  for (auto& info : files) {
-    std::string file_url;
-    bool share_required = false;
-    if (is_arc) {
-      GURL arc_url;
-      if (!file_manager::util::ConvertPathToArcUrl(info.path, &arc_url,
-                                                   &share_required)) {
-        LOG(WARNING) << "Could not convert arc path " << info.path;
-        continue;
-      }
-      file_url = arc_url.spec();
-    } else if (is_crostini || is_plugin_vm) {
-      base::FilePath path;
-      // Check if it is a path inside the VM: 'vmfile:<vm_name>:'.
-      if (base::StartsWith(info.path.value(), vm_prefix,
-                           base::CompareCase::SENSITIVE)) {
-        file_url = ui::FilePathToFileURL(
-            base::FilePath(info.path.value().substr(vm_prefix.size())));
-      } else if (file_manager::util::ConvertFileSystemURLToPathInsideVM(
-                     primary_profile, info.url, vm_mount,
-                     /*map_crostini_home=*/is_crostini, &path)) {
-        // Convert to path inside the VM.
-        file_url = ui::FilePathToFileURL(path);
-        share_required = true;
-      } else {
-        LOG(WARNING) << "Could not convert into VM path " << info.path;
-        continue;
-      }
-    } else {
-      // Use path without conversion as default.
-      file_url = ui::FilePathToFileURL(info.path);
-    }
-    file_urls.push_back(std::move(file_url));
-    if (share_required && !share_path->IsPathShared(vm_name, info.path))
-      paths_to_share.push_back(std::move(info.path));
-  }
-
-  if (!paths_to_share.empty()) {
-    if (!is_plugin_vm) {
-      auto vm_info =
-          guest_os::GuestOsSessionTracker::GetForProfile(primary_profile)
-              ->GetVmInfo(vm_name);
-      if (!vm_info) {
-        // VM must be running for copy-paste or drag-drop to be happening so
-        // something's gone wrong, skip trying to share and just send the data.
-        std::move(callback).Run(std::move(file_urls));
-        return;
-      }
-      share_path->SharePaths(
-          vm_name, vm_info->seneschal_server_handle(),
-          std::move(paths_to_share),
-          base::BindOnce(
-              [](base::OnceCallback<void(std::vector<std::string>)> callback,
-                 std::vector<std::string> file_urls, bool success,
-                 const std::string& failure_reason) {
-                if (!success)
-                  LOG(ERROR) << "Error sharing paths: " << failure_reason;
-
-                // Still send the data, even if sharing failed.
-                std::move(callback).Run(file_urls);
-              },
-              std::move(callback), std::move(file_urls)));
-      return;
-    }
-
-    // Show FilesApp move-to-windows-files dialog when Plugin VM is not shared.
-    if (auto* event_router =
-            file_manager::EventRouterFactory::GetForProfile(primary_profile)) {
-      event_router->DropFailedPluginVmDirectoryNotShared();
-    }
-    file_urls.clear();
-  }
-
-  std::move(callback).Run(std::move(file_urls));
-}
-
-}  // namespace
-
-std::vector<base::FilePath> TranslateVMPathsToHost(
-    ui::EndpointType source,
-    const std::vector<ui::FileInfo>& vm_paths) {
-  std::vector<FileInfo> translated = TranslateVMToHost(source, vm_paths);
-  std::vector<base::FilePath> result;
-  for (auto& info : translated)
-    result.push_back(std::move(info.path));
-  return result;
-}
-
-void ShareWithVMAndTranslateToFileUrls(
-    ui::EndpointType target,
-    const std::vector<base::FilePath>& files,
-    base::OnceCallback<void(std::vector<std::string>)> callback) {
-  ShareAndTranslateHostToVM(target, CrackPaths(files), std::move(callback));
+  return file_system_urls;
 }
 
 ChromeDataExchangeDelegate::ChromeDataExchangeDelegate() = default;
@@ -352,76 +90,15 @@
   return ui::EndpointType::kUnknownVm;
 }
 
-std::vector<ui::FileInfo> ChromeDataExchangeDelegate::GetFilenames(
-    ui::EndpointType source,
-    const std::vector<uint8_t>& data) const {
-  std::vector<ui::FileInfo> result;
-  std::vector<FileInfo> file_info = TranslateVMToHost(
-      source, ui::URIListToFileInfos(std::string(data.begin(), data.end())));
-  for (auto& info : file_info)
-    result.push_back(ui::FileInfo(std::move(info.path), base::FilePath()));
-  return result;
-}
-
 std::string ChromeDataExchangeDelegate::GetMimeTypeForUriList(
     ui::EndpointType target) const {
   return target == ui::EndpointType::kArc ? kMimeTypeArcUriList
                                           : kMimeTypeTextUriList;
 }
 
-void ChromeDataExchangeDelegate::SendFileInfo(
-    ui::EndpointType target,
-    const std::vector<ui::FileInfo>& files,
-    SendDataCallback callback) const {
-  std::vector<base::FilePath> paths;
-  for (const auto& file : files)
-    paths.push_back(file.path);
-
-  ShareAndTranslateHostToVM(
-      target, CrackPaths(std::move(paths)),
-      base::BindOnce(&SendAfterShare, target, std::move(callback)));
-}
-
 bool ChromeDataExchangeDelegate::HasUrlsInPickle(
     const base::Pickle& pickle) const {
-  std::vector<storage::FileSystemURL> file_system_urls;
-  GetFileSystemUrlsFromPickle(pickle, &file_system_urls);
-  return !file_system_urls.empty();
-}
-
-void ChromeDataExchangeDelegate::SendPickle(ui::EndpointType target,
-                                            const base::Pickle& pickle,
-                                            SendDataCallback callback) {
-  std::vector<storage::FileSystemURL> file_system_urls;
-  GetFileSystemUrlsFromPickle(pickle, &file_system_urls);
-
-  // ARC FileSystemURLs are converted to Content URLs.
-  if (target == ui::EndpointType::kArc) {
-    if (file_system_urls.empty()) {
-      std::move(callback).Run(nullptr);
-      return;
-    }
-    arc::ConvertToContentUrlsAndShare(
-        ProfileManager::GetPrimaryUserProfile(), file_system_urls,
-        base::BindOnce(&SendArcUrls, std::move(callback)));
-    return;
-  }
-
-  std::vector<FileInfo> list;
-  for (auto& url : file_system_urls) {
-    if (url.TypeImpliesPathIsReal()) {
-      base::FilePath path = url.path();
-      list.emplace_back(std::move(path), std::move(url));
-    } else if (base::FilePath path =
-                   fusebox::Server::SubstituteFuseboxFilePath(url);
-               !path.empty()) {
-      list.emplace_back(std::move(path), std::move(url));
-    }
-  }
-
-  ShareAndTranslateHostToVM(
-      target, std::move(list),
-      base::BindOnce(&SendAfterShare, target, std::move(callback)));
+  return !GetFileSystemUrlsFromPickle(pickle).empty();
 }
 
 std::vector<ui::FileInfo> ChromeDataExchangeDelegate::ParseFileSystemSources(
diff --git a/chrome/browser/ash/exo/chrome_data_exchange_delegate.h b/chrome/browser/ash/exo/chrome_data_exchange_delegate.h
index 95721051..98abe39 100644
--- a/chrome/browser/ash/exo/chrome_data_exchange_delegate.h
+++ b/chrome/browser/ash/exo/chrome_data_exchange_delegate.h
@@ -8,22 +8,13 @@
 #include "base/files/file_path.h"
 #include "base/functional/callback.h"
 #include "components/exo/data_exchange_delegate.h"
+#include "storage/browser/file_system/file_system_url.h"
 
 namespace ash {
 
-// Translate paths from |source| VM to valid paths in the host. Invalid paths
-// are ignored.
-std::vector<base::FilePath> TranslateVMPathsToHost(
-    ui::EndpointType source,
-    const std::vector<ui::FileInfo>& vm_paths);
-
-// Share |files| with |target| VM, and translate |files| to be "file://" URLs
-// which can be used inside the vm. |callback| is invoked with translated
-// "file://" URLs.
-void ShareWithVMAndTranslateToFileUrls(
-    ui::EndpointType target,
-    const std::vector<base::FilePath>& files,
-    base::OnceCallback<void(std::vector<std::string>)> callback);
+// Get all FileSystemURLs in `pickle`.
+std::vector<storage::FileSystemURL> GetFileSystemUrlsFromPickle(
+    const base::Pickle& pickle);
 
 class ChromeDataExchangeDelegate : public exo::DataExchangeDelegate {
  public:
@@ -36,17 +27,8 @@
   // DataExchangeDelegate:
   ui::EndpointType GetDataTransferEndpointType(
       aura::Window* window) const override;
-  std::vector<ui::FileInfo> GetFilenames(
-      ui::EndpointType source,
-      const std::vector<uint8_t>& data) const override;
   std::string GetMimeTypeForUriList(ui::EndpointType target) const override;
-  void SendFileInfo(ui::EndpointType target,
-                    const std::vector<ui::FileInfo>& files,
-                    SendDataCallback callback) const override;
   bool HasUrlsInPickle(const base::Pickle& pickle) const override;
-  void SendPickle(ui::EndpointType target,
-                  const base::Pickle& pickle,
-                  SendDataCallback callback) override;
   std::vector<ui::FileInfo> ParseFileSystemSources(
       const ui::DataTransferEndpoint* source,
       const base::Pickle& pickle) const override;
diff --git a/chrome/browser/ash/exo/chrome_data_exchange_delegate_unittest.cc b/chrome/browser/ash/exo/chrome_data_exchange_delegate_unittest.cc
index 35c0951..ec0a57b 100644
--- a/chrome/browser/ash/exo/chrome_data_exchange_delegate_unittest.cc
+++ b/chrome/browser/ash/exo/chrome_data_exchange_delegate_unittest.cc
@@ -4,30 +4,16 @@
 
 #include "chrome/browser/ash/exo/chrome_data_exchange_delegate.h"
 
-#include <string>
-#include <vector>
-
 #include "ash/constants/app_types.h"
 #include "ash/public/cpp/app_types_util.h"
 #include "base/memory/raw_ptr.h"
-#include "base/memory/ref_counted_memory.h"
-#include "base/memory/scoped_refptr.h"
-#include "base/ranges/algorithm.h"
-#include "base/strings/strcat.h"
-#include "base/strings/utf_string_conversions.h"
+#include "base/pickle.h"
 #include "chrome/browser/ash/crosapi/browser_util.h"
-#include "chrome/browser/ash/crostini/crostini_manager.h"
 #include "chrome/browser/ash/crostini/crostini_test_helper.h"
 #include "chrome/browser/ash/crostini/crostini_util.h"
 #include "chrome/browser/ash/file_manager/path_util.h"
-#include "chrome/browser/ash/guest_os/guest_os_share_path.h"
 #include "chrome/browser/ash/plugin_vm/plugin_vm_util.h"
 #include "chrome/test/base/testing_profile.h"
-#include "chromeos/ash/components/dbus/chunneld/chunneld_client.h"
-#include "chromeos/ash/components/dbus/cicerone/cicerone_client.h"
-#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
-#include "chromeos/ash/components/dbus/seneschal/fake_seneschal_client.h"
-#include "chromeos/ash/components/dbus/seneschal/seneschal_client.h"
 #include "components/exo/shell_surface_util.h"
 #include "content/public/common/drop_data.h"
 #include "content/public/test/browser_task_environment.h"
@@ -35,59 +21,25 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/storage_key/storage_key.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/window_types.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
-#include "ui/base/clipboard/clipboard.h"
-#include "ui/base/clipboard/clipboard_buffer.h"
 #include "ui/base/clipboard/file_info.h"
-#include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/compositor/layer_type.h"
 #include "ui/gfx/geometry/rect.h"
-#include "url/url_constants.h"
 
 namespace ash {
 
-namespace {
-
-std::vector<uint8_t> Data(const std::string& s) {
-  return std::vector<uint8_t>(s.begin(), s.end());
-}
-
-void Capture(std::string* result, scoped_refptr<base::RefCountedMemory> data) {
-  *result = std::string(data->front_as<char>(), data->size());
-}
-
-void CaptureUTF16(std::string* result,
-                  scoped_refptr<base::RefCountedMemory> data) {
-  base::UTF16ToUTF8(data->front_as<char16_t>(), data->size() / 2, result);
-}
-
-}  // namespace
-
 class ChromeDataExchangeDelegateTest : public testing::Test {
  public:
   void SetUp() override {
-    ChunneldClient::InitializeFake();
-    CiceroneClient::InitializeFake();
-    ConciergeClient::InitializeFake();
-    SeneschalClient::InitializeFake();
-
     profile_ = std::make_unique<TestingProfile>();
     test_helper_ =
         std::make_unique<crostini::CrostiniTestHelper>(profile_.get());
 
-    // Setup CrostiniManager for testing.
-    crostini::CrostiniManager* crostini_manager =
-        crostini::CrostiniManager::GetForProfile(profile_.get());
-    crostini_manager->AddRunningVmForTesting(crostini::kCrostiniDefaultVmName);
-    crostini_manager->AddRunningContainerForTesting(
-        crostini::kCrostiniDefaultVmName,
-        crostini::ContainerInfo(crostini::kCrostiniDefaultContainerName,
-                                "testuser", "/home/testuser",
-                                "PLACEHOLDER_IP"));
-
     // Register my files and crostini.
     mount_points_ = storage::ExternalMountPoints::GetSystemInstance();
     // For example, "Downloads-test%40example.com-hash"
@@ -99,29 +51,12 @@
     mount_points_->RegisterFileSystem(
         myfiles_mount_name_, storage::kFileSystemTypeLocal,
         storage::FileSystemMountOption(), myfiles_dir_);
-    // For example, "crostini_test_termina_penguin"
-    crostini_mount_name_ =
-        file_manager::util::GetCrostiniMountPointName(profile_.get());
-    // For example, "/media/fuse/crostini_test_termina_penguin"
-    crostini_dir_ =
-        file_manager::util::GetCrostiniMountDirectory(profile_.get());
-    mount_points_->RegisterFileSystem(
-        crostini_mount_name_, storage::kFileSystemTypeLocal,
-        storage::FileSystemMountOption(), crostini_dir_);
-
-    // DBus seneschal client.
-    fake_seneschal_client_ = FakeSeneschalClient::Get();
-    ASSERT_TRUE(fake_seneschal_client_);
   }
 
   void TearDown() override {
     mount_points_->RevokeAllFileSystems();
     test_helper_.reset();
     profile_.reset();
-    SeneschalClient::Shutdown();
-    ConciergeClient::Shutdown();
-    CiceroneClient::Shutdown();
-    ChunneldClient::Shutdown();
   }
 
  protected:
@@ -130,17 +65,10 @@
   content::BrowserTaskEnvironment task_environment_;
   std::unique_ptr<TestingProfile> profile_;
   std::unique_ptr<crostini::CrostiniTestHelper> test_helper_;
-
   aura::test::TestWindowDelegate delegate_;
-
   raw_ptr<storage::ExternalMountPoints> mount_points_;
   std::string myfiles_mount_name_;
   base::FilePath myfiles_dir_;
-  std::string crostini_mount_name_;
-  base::FilePath crostini_dir_;
-
-  raw_ptr<FakeSeneschalClient, DanglingUntriaged> fake_seneschal_client_ =
-      nullptr;
 };
 
 TEST_F(ChromeDataExchangeDelegateTest, GetDataTransferEndpointType) {
@@ -209,109 +137,6 @@
       data_exchange_delegate.GetDataTransferEndpointType(plugin_vm_window));
 }
 
-TEST_F(ChromeDataExchangeDelegateTest, GetFilenames) {
-  ChromeDataExchangeDelegate data_exchange_delegate;
-  base::FilePath shared_path = myfiles_dir_.Append("shared");
-  auto* guest_os_share_path =
-      guest_os::GuestOsSharePath::GetForProfile(profile());
-  guest_os_share_path->RegisterSharedPath(crostini::kCrostiniDefaultVmName,
-                                          shared_path);
-  guest_os_share_path->RegisterSharedPath(plugin_vm::kPluginVmName,
-                                          shared_path);
-
-  // Multiple lines should be parsed.
-  // Arc should not translate paths.
-  std::vector<ui::FileInfo> files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kArc,
-      Data("\n\tfile:///file1\t\r\n#ignore\r\nfile:///file2\r\n"));
-  EXPECT_EQ(2u, files.size());
-  EXPECT_EQ("/file1", files[0].path.value());
-  EXPECT_EQ("", files[0].display_name.value());
-  EXPECT_EQ("/file2", files[1].path.value());
-  EXPECT_EQ("", files[1].display_name.value());
-
-  // Crostini shared paths should be mapped.
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kCrostini,
-      Data("file:///mnt/chromeos/MyFiles/shared/file"));
-  EXPECT_EQ(1u, files.size());
-  EXPECT_EQ(shared_path.Append("file"), files[0].path);
-
-  // Crostini homedir should be mapped.
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kCrostini, Data("file:///home/testuser/file"));
-  EXPECT_EQ(1u, files.size());
-  EXPECT_EQ(crostini_dir_.Append("file"), files[0].path);
-
-  // Crostini internal paths should be mapped.
-  files = data_exchange_delegate.GetFilenames(ui::EndpointType::kCrostini,
-                                              Data("file:///etc/hosts"));
-  EXPECT_EQ(1u, files.size());
-  EXPECT_EQ("vmfile:termina:/etc/hosts", files[0].path.value());
-
-  // Unshared paths should fail.
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kCrostini,
-      Data("file:///mnt/chromeos/MyFiles/unshared/file"));
-  EXPECT_EQ(0u, files.size());
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kCrostini,
-      Data("file:///mnt/chromeos/MyFiles/shared/file1\r\n"
-           "file:///mnt/chromeos/MyFiles/unshared/file2"));
-  EXPECT_EQ(1u, files.size());
-  EXPECT_EQ(shared_path.Append("file1"), files[0].path);
-
-  // file:/path should fail.
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kCrostini, Data("file:/mnt/chromeos/MyFiles/file"));
-  EXPECT_EQ(0u, files.size());
-
-  // file:path should fail.
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kCrostini, Data("file:mnt/chromeos/MyFiles/file"));
-  EXPECT_EQ(0u, files.size());
-
-  // file:// should fail.
-  files = data_exchange_delegate.GetFilenames(ui::EndpointType::kCrostini,
-                                              Data("file://"));
-  EXPECT_EQ(0u, files.size());
-
-  // file:/// maps to internal root.
-  files = data_exchange_delegate.GetFilenames(ui::EndpointType::kCrostini,
-                                              Data("file:///"));
-  EXPECT_EQ(1u, files.size());
-  EXPECT_EQ("vmfile:termina:/", files[0].path.value());
-
-  // /path should fail.
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kCrostini, Data("/mnt/chromeos/MyFiles/file"));
-  EXPECT_EQ(0u, files.size());
-
-  // Plugin VM shared paths should be mapped.
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kPluginVm, Data("file://ChromeOS/MyFiles/shared/file"));
-  EXPECT_EQ(1u, files.size());
-  EXPECT_EQ(shared_path.Append("file"), files[0].path);
-
-  // Plugin VM internal paths should be mapped.
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kPluginVm, Data("file:///C:/WINDOWS/notepad.exe"));
-  EXPECT_EQ(1u, files.size());
-  EXPECT_EQ("vmfile:PvmDefault:C:/WINDOWS/notepad.exe", files[0].path.value());
-
-  // Unshared paths should fail.
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kPluginVm,
-      Data("file://ChromeOS/MyFiles/unshared/file"));
-  EXPECT_EQ(0u, files.size());
-  files = data_exchange_delegate.GetFilenames(
-      ui::EndpointType::kPluginVm,
-      Data("file://ChromeOS/MyFiles/shared/file1\r\n"
-           "file://ChromeOS/MyFiles/unshared/file2"));
-  EXPECT_EQ(1u, files.size());
-  EXPECT_EQ(shared_path.Append("file1"), files[0].path);
-}
-
 TEST_F(ChromeDataExchangeDelegateTest, GetMimeTypeForUriList) {
   ChromeDataExchangeDelegate data_exchange_delegate;
   EXPECT_EQ(
@@ -323,129 +148,6 @@
                                  ui::EndpointType::kPluginVm));
 }
 
-TEST_F(ChromeDataExchangeDelegateTest, SendFileInfoConvertPaths) {
-  ChromeDataExchangeDelegate data_exchange_delegate;
-  ui::FileInfo file1(myfiles_dir_.Append("file1"), base::FilePath());
-  ui::FileInfo file2(myfiles_dir_.Append("file2"), base::FilePath());
-  auto* guest_os_share_path =
-      guest_os::GuestOsSharePath::GetForProfile(profile());
-  guest_os_share_path->RegisterSharedPath(plugin_vm::kPluginVmName,
-                                          myfiles_dir_);
-
-  // Arc should convert path to UTF16 URL.
-  std::string data;
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kArc, {file1},
-                                      base::BindOnce(&CaptureUTF16, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ(
-      "content://org.chromium.arc.volumeprovider/"
-      "0000000000000000000000000000CAFEF00D2019/file1",
-      data);
-
-  // Arc should join lines with CRLF.
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kArc, {file1, file2},
-                                      base::BindOnce(&CaptureUTF16, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ(
-      "content://org.chromium.arc.volumeprovider/"
-      "0000000000000000000000000000CAFEF00D2019/file1"
-      "\r\n"
-      "content://org.chromium.arc.volumeprovider/"
-      "0000000000000000000000000000CAFEF00D2019/file2",
-      data);
-
-  // Crostini should convert path to inside VM, and share the path.
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file1},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ("file:///mnt/chromeos/MyFiles/file1", data);
-
-  // Crostini should join lines with CRLF.
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kCrostini,
-                                      {file1, file2},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ(
-      "file:///mnt/chromeos/MyFiles/file1"
-      "\r\n"
-      "file:///mnt/chromeos/MyFiles/file2",
-      data);
-
-  // Plugin VM should convert path to inside VM.
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kPluginVm, {file1},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ("file://ChromeOS/MyFiles/file1", data);
-
-  // Crostini should handle vmfile:termina:/etc/hosts.
-  file1.path = base::FilePath("vmfile:termina:/etc/hosts");
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file1},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ("file:///etc/hosts", data);
-
-  // Crostini should ignore vmfile:PvmDefault:C:/WINDOWS/notepad.exe.
-  file1.path = base::FilePath("vmfile:PvmDefault:C:/WINDOWS/notepad.exe");
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file1},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ("", data);
-
-  // Plugin VM should handle vmfile:PvmDefault:C:/WINDOWS/notepad.exe.
-  file1.path = base::FilePath("vmfile:PvmDefault:C:/WINDOWS/notepad.exe");
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kPluginVm, {file1},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ("file:///C:/WINDOWS/notepad.exe", data);
-
-  // Crostini should handle vmfile:termina:/etc/hosts.
-  file1.path = base::FilePath("vmfile:termina:/etc/hosts");
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kPluginVm, {file1},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ("", data);
-}
-
-TEST_F(ChromeDataExchangeDelegateTest, SendFileInfoSharePathsCrostini) {
-  ChromeDataExchangeDelegate data_exchange_delegate;
-
-  // A path which is already shared should not be shared again.
-  base::FilePath shared_path = myfiles_dir_.Append("shared");
-  auto* guest_os_share_path =
-      guest_os::GuestOsSharePath::GetForProfile(profile());
-  guest_os_share_path->RegisterSharedPath(crostini::kCrostiniDefaultVmName,
-                                          shared_path);
-  ui::FileInfo file(shared_path, base::FilePath());
-  EXPECT_FALSE(fake_seneschal_client_->share_path_called());
-  std::string data;
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ("file:///mnt/chromeos/MyFiles/shared", data);
-  EXPECT_FALSE(fake_seneschal_client_->share_path_called());
-
-  // A path which is not already shared should be shared.
-  file = ui::FileInfo(myfiles_dir_.Append("file"), base::FilePath());
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ("file:///mnt/chromeos/MyFiles/file", data);
-  EXPECT_TRUE(fake_seneschal_client_->share_path_called());
-}
-
-TEST_F(ChromeDataExchangeDelegateTest, SendFileInfoSharePathsPluginVm) {
-  ChromeDataExchangeDelegate data_exchange_delegate;
-
-  // Plugin VM should send empty data and not share path if not already shared.
-  ui::FileInfo file(myfiles_dir_.Append("file"), base::FilePath());
-  std::string data;
-  data_exchange_delegate.SendFileInfo(ui::EndpointType::kPluginVm, {file},
-                                      base::BindOnce(&Capture, &data));
-  task_environment_.RunUntilIdle();
-  EXPECT_EQ("", data);
-  EXPECT_FALSE(fake_seneschal_client_->share_path_called());
-}
-
 TEST_F(ChromeDataExchangeDelegateTest, HasUrlsInPickle) {
   ChromeDataExchangeDelegate data_exchange_delegate;
 
diff --git a/chrome/browser/ash/exo/chrome_security_delegate.cc b/chrome/browser/ash/exo/chrome_security_delegate.cc
index 07deae9..374b393 100644
--- a/chrome/browser/ash/exo/chrome_security_delegate.cc
+++ b/chrome/browser/ash/exo/chrome_security_delegate.cc
@@ -4,11 +4,293 @@
 
 #include "chrome/browser/ash/exo/chrome_security_delegate.h"
 
+#include <memory>
+#include <string>
+
+#include "ash/components/arc/arc_util.h"
 #include "ash/public/cpp/app_types_util.h"
+#include "base/memory/ref_counted_memory.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ash/arc/arc_util.h"
+#include "chrome/browser/ash/crostini/crostini_util.h"
+#include "chrome/browser/ash/exo/chrome_data_exchange_delegate.h"
+#include "chrome/browser/ash/extensions/file_manager/event_router.h"
+#include "chrome/browser/ash/extensions/file_manager/event_router_factory.h"
+#include "chrome/browser/ash/file_manager/fileapi_util.h"
+#include "chrome/browser/ash/file_manager/path_util.h"
+#include "chrome/browser/ash/fusebox/fusebox_server.h"
+#include "chrome/browser/ash/guest_os/guest_os_session_tracker.h"
+#include "chrome/browser/ash/guest_os/guest_os_share_path.h"
+#include "chrome/browser/ash/plugin_vm/plugin_vm_files.h"
+#include "chrome/browser/ash/plugin_vm/plugin_vm_util.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "components/exo/shell_surface_util.h"
+#include "content/public/common/drop_data.h"
+#include "storage/browser/file_system/external_mount_points.h"
+#include "storage/browser/file_system/file_system_context.h"
+#include "storage/browser/file_system/file_system_url.h"
+#include "third_party/blink/public/common/storage_key/storage_key.h"
+#include "ui/base/clipboard/file_info.h"
+#include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
 
 namespace ash {
 
+namespace {
+
+constexpr char kUriListSeparator[] = "\r\n";
+constexpr char kVmFileScheme[] = "vmfile";
+
+void SendArcUrls(exo::SecurityDelegate::SendDataCallback callback,
+                 const std::vector<GURL>& urls) {
+  std::vector<std::string> lines;
+  for (const GURL& url : urls) {
+    if (!url.is_valid()) {
+      continue;
+    }
+    lines.push_back(url.spec());
+  }
+  // Arc requires UTF16 for data.
+  std::move(callback).Run(base::MakeRefCounted<base::RefCountedString16>(
+      base::UTF8ToUTF16(base::JoinString(lines, kUriListSeparator))));
+}
+
+void SendAfterShare(ui::EndpointType target,
+                    exo::SecurityDelegate::SendDataCallback callback,
+                    std::vector<std::string> file_urls) {
+  std::string joined = base::JoinString(file_urls, kUriListSeparator);
+  scoped_refptr<base::RefCountedMemory> data;
+  if (target == ui::EndpointType::kArc) {
+    // Arc uses utf-16 data.
+    data = base::MakeRefCounted<base::RefCountedString16>(
+        base::UTF8ToUTF16(joined));
+  } else {
+    data = base::MakeRefCounted<base::RefCountedString>(std::move(joined));
+  }
+
+  std::move(callback).Run(data);
+}
+
+struct FileInfo {
+  const base::FilePath path;
+  const storage::FileSystemURL url;
+};
+
+// Returns true if path is shared with the specified VM, or for crostini if path
+// is homedir or dir within.
+bool IsPathShared(Profile* profile,
+                  std::string vm_name,
+                  bool is_crostini,
+                  base::FilePath path) {
+  auto* share_path = guest_os::GuestOsSharePath::GetForProfile(profile);
+  if (share_path->IsPathShared(vm_name, path)) {
+    return true;
+  }
+  if (is_crostini) {
+    base::FilePath mount =
+        file_manager::util::GetCrostiniMountDirectory(profile);
+    return path == mount || mount.IsParent(path);
+  }
+  return false;
+}
+
+// Translate |vm_paths| from |source| VM to host paths.
+std::vector<FileInfo> TranslateVMToHost(ui::EndpointType source,
+                                        std::vector<ui::FileInfo> vm_paths) {
+  std::vector<FileInfo> file_infos;
+  Profile* primary_profile = ProfileManager::GetPrimaryUserProfile();
+  bool is_crostini = source == ui::EndpointType::kCrostini;
+  bool is_plugin_vm = source == ui::EndpointType::kPluginVm;
+
+  base::FilePath vm_mount;
+  std::string vm_name;
+  if (is_crostini) {
+    vm_mount = crostini::ContainerChromeOSBaseDirectory();
+    vm_name = crostini::kCrostiniDefaultVmName;
+  } else if (is_plugin_vm) {
+    vm_mount = plugin_vm::ChromeOSBaseDirectory();
+    vm_name = plugin_vm::kPluginVmName;
+  }
+
+  for (ui::FileInfo& info : vm_paths) {
+    base::FilePath path = std::move(info.path);
+    storage::FileSystemURL url;
+
+    // Convert the VM path to a path in the host if possible (in homedir or
+    // /mnt/chromeos for crostini; in //ChromeOS for Plugin VM), otherwise
+    // prefix with 'vmfile:<vm_name>:' to avoid VMs spoofing host paths.
+    // E.g. crostini /etc/mime.types => vmfile:termina:/etc/mime.types.
+    if (is_crostini || is_plugin_vm) {
+      if (file_manager::util::ConvertPathInsideVMToFileSystemURL(
+              primary_profile, path, vm_mount,
+              /*map_crostini_home=*/is_crostini, &url)) {
+        path = url.path();
+        // Only allow write to clipboard for paths that are shared.
+        if (!IsPathShared(primary_profile, vm_name, is_crostini, path)) {
+          LOG(WARNING) << "Unshared file path: " << path;
+          continue;
+        }
+      } else {
+        path = base::FilePath(
+            base::StrCat({kVmFileScheme, ":", vm_name, ":", path.value()}));
+      }
+    }
+    file_infos.push_back({std::move(path), std::move(url)});
+  }
+  return file_infos;
+}
+
+// Crack paths and get FileSystemURL.
+std::vector<FileInfo> CrackPaths(std::vector<base::FilePath> paths) {
+  storage::ExternalMountPoints* mount_points =
+      storage::ExternalMountPoints::GetSystemInstance();
+  base::FilePath virtual_path;
+  std::vector<FileInfo> file_infos;
+
+  for (auto& path : paths) {
+    // Convert absolute host path to FileSystemURL if possible.
+    storage::FileSystemURL url;
+    if (mount_points->GetVirtualPath(path, &virtual_path)) {
+      url = mount_points->CreateCrackedFileSystemURL(
+          blink::StorageKey(), storage::kFileSystemTypeExternal, virtual_path);
+    }
+    file_infos.push_back({std::move(path), std::move(url)});
+  }
+  return file_infos;
+}
+
+// Share |files| with |target| VM and invoke |callback| with translated file:
+// URLs.
+void ShareAndTranslateHostToVM(
+    ui::EndpointType target,
+    std::vector<FileInfo> file_infos,
+    base::OnceCallback<void(std::vector<std::string>)> callback) {
+  Profile* primary_profile = ProfileManager::GetPrimaryUserProfile();
+  bool is_arc = target == ui::EndpointType::kArc;
+  bool is_crostini = target == ui::EndpointType::kCrostini;
+  bool is_plugin_vm = target == ui::EndpointType::kPluginVm;
+
+  base::FilePath vm_mount;
+  std::string vm_name;
+  if (is_arc) {
+    // For ARC, |share_required| below will always be false and |vm_name| will
+    // not be used. Setting it to arc::kArcVmName has no effect.
+    vm_name = arc::kArcVmName;
+  } else if (is_crostini) {
+    vm_mount = crostini::ContainerChromeOSBaseDirectory();
+    vm_name = crostini::kCrostiniDefaultVmName;
+  } else if (is_plugin_vm) {
+    vm_mount = plugin_vm::ChromeOSBaseDirectory();
+    vm_name = plugin_vm::kPluginVmName;
+  }
+
+  const std::string vm_prefix =
+      base::StrCat({kVmFileScheme, ":", vm_name, ":"});
+  std::vector<std::string> file_urls;
+  auto* share_path = guest_os::GuestOsSharePath::GetForProfile(primary_profile);
+  std::vector<base::FilePath> paths_to_share;
+
+  for (auto& info : file_infos) {
+    std::string file_url;
+    bool share_required = false;
+    if (is_arc) {
+      GURL arc_url;
+      if (!file_manager::util::ConvertPathToArcUrl(info.path, &arc_url,
+                                                   &share_required)) {
+        LOG(WARNING) << "Could not convert arc path " << info.path;
+        continue;
+      }
+      file_url = arc_url.spec();
+    } else if (is_crostini || is_plugin_vm) {
+      base::FilePath path;
+      // Check if it is a path inside the VM: 'vmfile:<vm_name>:'.
+      if (base::StartsWith(info.path.value(), vm_prefix,
+                           base::CompareCase::SENSITIVE)) {
+        file_url = ui::FilePathToFileURL(
+            base::FilePath(info.path.value().substr(vm_prefix.size())));
+      } else if (file_manager::util::ConvertFileSystemURLToPathInsideVM(
+                     primary_profile, info.url, vm_mount,
+                     /*map_crostini_home=*/is_crostini, &path)) {
+        // Convert to path inside the VM.
+        file_url = ui::FilePathToFileURL(path);
+        share_required = true;
+      } else {
+        LOG(WARNING) << "Could not convert into VM path " << info.path;
+        continue;
+      }
+    } else {
+      // Use path without conversion as default.
+      file_url = ui::FilePathToFileURL(info.path);
+    }
+    file_urls.push_back(std::move(file_url));
+    if (share_required && !share_path->IsPathShared(vm_name, info.path)) {
+      paths_to_share.push_back(std::move(info.path));
+    }
+  }
+
+  if (!paths_to_share.empty()) {
+    if (!is_plugin_vm) {
+      auto vm_info =
+          guest_os::GuestOsSessionTracker::GetForProfile(primary_profile)
+              ->GetVmInfo(vm_name);
+      if (!vm_info) {
+        // VM must be running for copy-paste or drag-drop to be happening so
+        // something's gone wrong, skip trying to share and just send the data.
+        std::move(callback).Run(std::move(file_urls));
+        return;
+      }
+      share_path->SharePaths(
+          vm_name, vm_info->seneschal_server_handle(),
+          std::move(paths_to_share),
+          base::BindOnce(
+              [](base::OnceCallback<void(std::vector<std::string>)> callback,
+                 std::vector<std::string> file_urls, bool success,
+                 const std::string& failure_reason) {
+                if (!success) {
+                  LOG(ERROR) << "Error sharing paths: " << failure_reason;
+                }
+
+                // Still send the data, even if sharing failed.
+                std::move(callback).Run(file_urls);
+              },
+              std::move(callback), std::move(file_urls)));
+      return;
+    }
+
+    // Show FilesApp move-to-windows-files dialog when Plugin VM is not shared.
+    if (auto* event_router =
+            file_manager::EventRouterFactory::GetForProfile(primary_profile)) {
+      event_router->DropFailedPluginVmDirectoryNotShared();
+    }
+    file_urls.clear();
+  }
+
+  std::move(callback).Run(std::move(file_urls));
+}
+
+}  // namespace
+
+// static
+std::vector<base::FilePath> TranslateVMPathsToHost(
+    ui::EndpointType source,
+    const std::vector<ui::FileInfo>& vm_paths) {
+  std::vector<FileInfo> translated = TranslateVMToHost(source, vm_paths);
+  std::vector<base::FilePath> result;
+  for (auto& info : translated) {
+    result.push_back(std::move(info.path));
+  }
+  return result;
+}
+
+// static
+void ShareWithVMAndTranslateToFileUrls(
+    ui::EndpointType target,
+    const std::vector<base::FilePath>& files,
+    base::OnceCallback<void(std::vector<std::string>)> callback) {
+  ShareAndTranslateHostToVM(target, CrackPaths(files), std::move(callback));
+}
+
 ChromeSecurityDelegate::ChromeSecurityDelegate() = default;
 
 ChromeSecurityDelegate::~ChromeSecurityDelegate() = default;
@@ -41,6 +323,66 @@
   }
 }
 
+std::vector<ui::FileInfo> ChromeSecurityDelegate::GetFilenames(
+    ui::EndpointType source,
+    const std::vector<uint8_t>& data) const {
+  std::vector<ui::FileInfo> result;
+  std::vector<FileInfo> file_infos = TranslateVMToHost(
+      source, ui::URIListToFileInfos(std::string(data.begin(), data.end())));
+  for (auto& info : file_infos) {
+    result.push_back(ui::FileInfo(std::move(info.path), base::FilePath()));
+  }
+  return result;
+}
+
+void ChromeSecurityDelegate::SendFileInfo(
+    ui::EndpointType target,
+    const std::vector<ui::FileInfo>& files,
+    SendDataCallback callback) const {
+  std::vector<base::FilePath> paths;
+  for (const auto& file : files) {
+    paths.push_back(file.path);
+  }
+
+  ShareAndTranslateHostToVM(
+      target, CrackPaths(std::move(paths)),
+      base::BindOnce(&SendAfterShare, target, std::move(callback)));
+}
+
+void ChromeSecurityDelegate::SendPickle(ui::EndpointType target,
+                                        const base::Pickle& pickle,
+                                        SendDataCallback callback) {
+  std::vector<storage::FileSystemURL> file_system_urls =
+      GetFileSystemUrlsFromPickle(pickle);
+  // ARC FileSystemURLs are converted to Content URLs.
+  if (target == ui::EndpointType::kArc) {
+    if (file_system_urls.empty()) {
+      std::move(callback).Run(nullptr);
+      return;
+    }
+    arc::ConvertToContentUrlsAndShare(
+        ProfileManager::GetPrimaryUserProfile(), file_system_urls,
+        base::BindOnce(&SendArcUrls, std::move(callback)));
+    return;
+  }
+
+  std::vector<FileInfo> file_infos;
+  for (auto& url : file_system_urls) {
+    if (url.TypeImpliesPathIsReal()) {
+      base::FilePath path = url.path();
+      file_infos.emplace_back(std::move(path), std::move(url));
+    } else if (base::FilePath path =
+                   fusebox::Server::SubstituteFuseboxFilePath(url);
+               !path.empty()) {
+      file_infos.emplace_back(std::move(path), std::move(url));
+    }
+  }
+
+  ShareAndTranslateHostToVM(
+      target, std::move(file_infos),
+      base::BindOnce(&SendAfterShare, target, std::move(callback)));
+}
+
 std::string ChromeSecurityDelegate::GetVmName() const {
   return std::string();
 }
diff --git a/chrome/browser/ash/exo/chrome_security_delegate.h b/chrome/browser/ash/exo/chrome_security_delegate.h
index d1811c4..da2d6e57 100644
--- a/chrome/browser/ash/exo/chrome_security_delegate.h
+++ b/chrome/browser/ash/exo/chrome_security_delegate.h
@@ -6,9 +6,24 @@
 #define CHROME_BROWSER_ASH_EXO_CHROME_SECURITY_DELEGATE_H_
 
 #include "components/exo/security_delegate.h"
+#include "storage/browser/file_system/file_system_url.h"
 
 namespace ash {
 
+// Translate paths from |source| VM to valid paths in the host. Invalid paths
+// are ignored.
+std::vector<base::FilePath> TranslateVMPathsToHost(
+    ui::EndpointType source,
+    const std::vector<ui::FileInfo>& vm_paths);
+
+// Share |files| with |target| VM, and translate |files| to be "file://" URLs
+// which can be used inside the vm. |callback| is invoked with translated
+// "file://" URLs.
+void ShareWithVMAndTranslateToFileUrls(
+    ui::EndpointType target,
+    const std::vector<base::FilePath>& files,
+    base::OnceCallback<void(std::vector<std::string>)> callback);
+
 class ChromeSecurityDelegate : public exo::SecurityDelegate {
  public:
   ChromeSecurityDelegate();
@@ -20,6 +35,15 @@
   bool CanSelfActivate(aura::Window* window) const override;
   bool CanLockPointer(aura::Window* window) const override;
   SetBoundsPolicy CanSetBounds(aura::Window* window) const override;
+  std::vector<ui::FileInfo> GetFilenames(
+      ui::EndpointType source,
+      const std::vector<uint8_t>& data) const override;
+  void SendFileInfo(ui::EndpointType target,
+                    const std::vector<ui::FileInfo>& files,
+                    SendDataCallback callback) const override;
+  void SendPickle(ui::EndpointType target,
+                  const base::Pickle& pickle,
+                  SendDataCallback callback) override;
 
   virtual std::string GetVmName() const;
 };
diff --git a/chrome/browser/ash/exo/chrome_security_delegate_unittest.cc b/chrome/browser/ash/exo/chrome_security_delegate_unittest.cc
index dcb3cef..16a81fe7 100644
--- a/chrome/browser/ash/exo/chrome_security_delegate_unittest.cc
+++ b/chrome/browser/ash/exo/chrome_security_delegate_unittest.cc
@@ -4,19 +4,125 @@
 
 #include "chrome/browser/ash/exo/chrome_security_delegate.h"
 
+#include <string>
+#include <vector>
+
 #include "ash/constants/app_types.h"
+#include "base/memory/ref_counted_memory.h"
+#include "base/memory/scoped_refptr.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ash/crostini/crostini_manager.h"
+#include "chrome/browser/ash/crostini/crostini_test_helper.h"
+#include "chrome/browser/ash/crostini/crostini_util.h"
+#include "chrome/browser/ash/file_manager/path_util.h"
+#include "chrome/browser/ash/guest_os/guest_os_share_path.h"
+#include "chrome/browser/ash/plugin_vm/plugin_vm_util.h"
+#include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/components/dbus/chunneld/chunneld_client.h"
+#include "chromeos/ash/components/dbus/cicerone/cicerone_client.h"
+#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
+#include "chromeos/ash/components/dbus/seneschal/fake_seneschal_client.h"
+#include "chromeos/ash/components/dbus/seneschal/seneschal_client.h"
+#include "content/public/test/browser_task_environment.h"
+#include "storage/browser/file_system/external_mount_points.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/common/storage_key/storage_key.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_types.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
+#include "ui/base/clipboard/file_info.h"
+#include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 
-using ChromeSecurityDelegateTest = testing::Test;
+namespace {
+
+std::vector<uint8_t> Data(const std::string& s) {
+  return std::vector<uint8_t>(s.begin(), s.end());
+}
+
+void Capture(std::string* result, scoped_refptr<base::RefCountedMemory> data) {
+  *result = std::string(data->front_as<char>(), data->size());
+}
+
+void CaptureUTF16(std::string* result,
+                  scoped_refptr<base::RefCountedMemory> data) {
+  base::UTF16ToUTF8(data->front_as<char16_t>(), data->size() / 2, result);
+}
+
+}  // namespace
+
+class ChromeSecurityDelegateTest : public testing::Test {
+ public:
+  void SetUp() override {
+    ChunneldClient::InitializeFake();
+    CiceroneClient::InitializeFake();
+    ConciergeClient::InitializeFake();
+    SeneschalClient::InitializeFake();
+
+    profile_ = std::make_unique<TestingProfile>();
+    test_helper_ =
+        std::make_unique<crostini::CrostiniTestHelper>(profile_.get());
+
+    // Setup CrostiniManager for testing.
+    crostini::CrostiniManager* crostini_manager =
+        crostini::CrostiniManager::GetForProfile(profile_.get());
+    crostini_manager->AddRunningVmForTesting(crostini::kCrostiniDefaultVmName);
+    crostini_manager->AddRunningContainerForTesting(
+        crostini::kCrostiniDefaultVmName,
+        crostini::ContainerInfo(crostini::kCrostiniDefaultContainerName,
+                                "testuser", "/home/testuser",
+                                "PLACEHOLDER_IP"));
+
+    // Register my files and crostini.
+    mount_points_ = storage::ExternalMountPoints::GetSystemInstance();
+    // Downloads-test%40example.com-hash
+    myfiles_mount_name_ =
+        file_manager::util::GetDownloadsMountPointName(profile_.get());
+    // $HOME/Downloads
+    myfiles_dir_ =
+        file_manager::util::GetMyFilesFolderForProfile(profile_.get());
+    mount_points_->RegisterFileSystem(
+        myfiles_mount_name_, storage::kFileSystemTypeLocal,
+        storage::FileSystemMountOption(), myfiles_dir_);
+    // crostini_test_termina_penguin
+    crostini_mount_name_ =
+        file_manager::util::GetCrostiniMountPointName(profile_.get());
+    // /media/fuse/crostini_test_termina_penguin
+    crostini_dir_ =
+        file_manager::util::GetCrostiniMountDirectory(profile_.get());
+    mount_points_->RegisterFileSystem(
+        crostini_mount_name_, storage::kFileSystemTypeLocal,
+        storage::FileSystemMountOption(), crostini_dir_);
+  }
+
+  void TearDown() override {
+    mount_points_->RevokeAllFileSystems();
+    test_helper_.reset();
+    profile_.reset();
+    SeneschalClient::Shutdown();
+    ConciergeClient::Shutdown();
+    CiceroneClient::Shutdown();
+    ChunneldClient::Shutdown();
+  }
+
+ protected:
+  Profile* profile() { return profile_.get(); }
+
+  content::BrowserTaskEnvironment task_environment_;
+  std::unique_ptr<TestingProfile> profile_;
+  std::unique_ptr<crostini::CrostiniTestHelper> test_helper_;
+
+  raw_ptr<storage::ExternalMountPoints> mount_points_;
+  std::string myfiles_mount_name_;
+  base::FilePath myfiles_dir_;
+  std::string crostini_mount_name_;
+  base::FilePath crostini_dir_;
+};
 
 TEST_F(ChromeSecurityDelegateTest, CanLockPointer) {
   auto security_delegate = std::make_unique<ChromeSecurityDelegate>();
@@ -47,4 +153,228 @@
   EXPECT_FALSE(security_delegate->CanLockPointer(crostini_toplevel.get()));
 }
 
+TEST_F(ChromeSecurityDelegateTest, GetFilenames) {
+  ChromeSecurityDelegate security_delegate;
+  base::FilePath shared_path = myfiles_dir_.Append("shared");
+  auto* guest_os_share_path =
+      guest_os::GuestOsSharePath::GetForProfile(profile());
+  guest_os_share_path->RegisterSharedPath(crostini::kCrostiniDefaultVmName,
+                                          shared_path);
+  guest_os_share_path->RegisterSharedPath(plugin_vm::kPluginVmName,
+                                          shared_path);
+
+  // Multiple lines should be parsed.
+  // Arc should not translate paths.
+  std::vector<ui::FileInfo> files = security_delegate.GetFilenames(
+      ui::EndpointType::kArc,
+      Data("\n\tfile:///file1\t\r\n#ignore\r\nfile:///file2\r\n"));
+  EXPECT_EQ(2u, files.size());
+  EXPECT_EQ("/file1", files[0].path.value());
+  EXPECT_EQ("", files[0].display_name.value());
+  EXPECT_EQ("/file2", files[1].path.value());
+  EXPECT_EQ("", files[1].display_name.value());
+
+  // Crostini shared paths should be mapped.
+  files = security_delegate.GetFilenames(
+      ui::EndpointType::kCrostini,
+      Data("file:///mnt/chromeos/MyFiles/shared/file"));
+  EXPECT_EQ(1u, files.size());
+  EXPECT_EQ(shared_path.Append("file"), files[0].path);
+
+  // Crostini homedir should be mapped.
+  files = security_delegate.GetFilenames(ui::EndpointType::kCrostini,
+                                         Data("file:///home/testuser/file"));
+  EXPECT_EQ(1u, files.size());
+  EXPECT_EQ(crostini_dir_.Append("file"), files[0].path);
+
+  // Crostini internal paths should be mapped.
+  files = security_delegate.GetFilenames(ui::EndpointType::kCrostini,
+                                         Data("file:///etc/hosts"));
+  EXPECT_EQ(1u, files.size());
+  EXPECT_EQ("vmfile:termina:/etc/hosts", files[0].path.value());
+
+  // Unshared paths should fail.
+  files = security_delegate.GetFilenames(
+      ui::EndpointType::kCrostini,
+      Data("file:///mnt/chromeos/MyFiles/unshared/file"));
+  EXPECT_EQ(0u, files.size());
+  files = security_delegate.GetFilenames(
+      ui::EndpointType::kCrostini,
+      Data("file:///mnt/chromeos/MyFiles/shared/file1\r\n"
+           "file:///mnt/chromeos/MyFiles/unshared/file2"));
+  EXPECT_EQ(1u, files.size());
+  EXPECT_EQ(shared_path.Append("file1"), files[0].path);
+
+  // file:/path should fail.
+  files = security_delegate.GetFilenames(
+      ui::EndpointType::kCrostini, Data("file:/mnt/chromeos/MyFiles/file"));
+  EXPECT_EQ(0u, files.size());
+
+  // file:path should fail.
+  files = security_delegate.GetFilenames(
+      ui::EndpointType::kCrostini, Data("file:mnt/chromeos/MyFiles/file"));
+  EXPECT_EQ(0u, files.size());
+
+  // file:// should fail.
+  files = security_delegate.GetFilenames(ui::EndpointType::kCrostini,
+                                         Data("file://"));
+  EXPECT_EQ(0u, files.size());
+
+  // file:/// maps to internal root.
+  files = security_delegate.GetFilenames(ui::EndpointType::kCrostini,
+                                         Data("file:///"));
+  EXPECT_EQ(1u, files.size());
+  EXPECT_EQ("vmfile:termina:/", files[0].path.value());
+
+  // /path should fail.
+  files = security_delegate.GetFilenames(ui::EndpointType::kCrostini,
+                                         Data("/mnt/chromeos/MyFiles/file"));
+  EXPECT_EQ(0u, files.size());
+
+  // Plugin VM shared paths should be mapped.
+  files = security_delegate.GetFilenames(
+      ui::EndpointType::kPluginVm, Data("file://ChromeOS/MyFiles/shared/file"));
+  EXPECT_EQ(1u, files.size());
+  EXPECT_EQ(shared_path.Append("file"), files[0].path);
+
+  // Plugin VM internal paths should be mapped.
+  files = security_delegate.GetFilenames(
+      ui::EndpointType::kPluginVm, Data("file:///C:/WINDOWS/notepad.exe"));
+  EXPECT_EQ(1u, files.size());
+  EXPECT_EQ("vmfile:PvmDefault:C:/WINDOWS/notepad.exe", files[0].path.value());
+
+  // Unshared paths should fail.
+  files = security_delegate.GetFilenames(
+      ui::EndpointType::kPluginVm,
+      Data("file://ChromeOS/MyFiles/unshared/file"));
+  EXPECT_EQ(0u, files.size());
+  files = security_delegate.GetFilenames(
+      ui::EndpointType::kPluginVm,
+      Data("file://ChromeOS/MyFiles/shared/file1\r\n"
+           "file://ChromeOS/MyFiles/unshared/file2"));
+  EXPECT_EQ(1u, files.size());
+  EXPECT_EQ(shared_path.Append("file1"), files[0].path);
+}
+
+TEST_F(ChromeSecurityDelegateTest, SendFileInfoConvertPaths) {
+  ChromeSecurityDelegate security_delegate;
+  ui::FileInfo file1(myfiles_dir_.Append("file1"), base::FilePath());
+  ui::FileInfo file2(myfiles_dir_.Append("file2"), base::FilePath());
+  auto* guest_os_share_path =
+      guest_os::GuestOsSharePath::GetForProfile(profile());
+  guest_os_share_path->RegisterSharedPath(plugin_vm::kPluginVmName,
+                                          myfiles_dir_);
+
+  // Arc should convert path to UTF16 URL.
+  std::string data;
+  security_delegate.SendFileInfo(ui::EndpointType::kArc, {file1},
+                                 base::BindOnce(&CaptureUTF16, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ(
+      "content://org.chromium.arc.volumeprovider/"
+      "0000000000000000000000000000CAFEF00D2019/file1",
+      data);
+
+  // Arc should join lines with CRLF.
+  security_delegate.SendFileInfo(ui::EndpointType::kArc, {file1, file2},
+                                 base::BindOnce(&CaptureUTF16, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ(
+      "content://org.chromium.arc.volumeprovider/"
+      "0000000000000000000000000000CAFEF00D2019/file1"
+      "\r\n"
+      "content://org.chromium.arc.volumeprovider/"
+      "0000000000000000000000000000CAFEF00D2019/file2",
+      data);
+
+  // Crostini should convert path to inside VM, and share the path.
+  security_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file1},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ("file:///mnt/chromeos/MyFiles/file1", data);
+
+  // Crostini should join lines with CRLF.
+  security_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file1, file2},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ(
+      "file:///mnt/chromeos/MyFiles/file1"
+      "\r\n"
+      "file:///mnt/chromeos/MyFiles/file2",
+      data);
+
+  // Plugin VM should convert path to inside VM.
+  security_delegate.SendFileInfo(ui::EndpointType::kPluginVm, {file1},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ("file://ChromeOS/MyFiles/file1", data);
+
+  // Crostini should handle vmfile:termina:/etc/hosts.
+  file1.path = base::FilePath("vmfile:termina:/etc/hosts");
+  security_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file1},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ("file:///etc/hosts", data);
+
+  // Crostini should ignore vmfile:PvmDefault:C:/WINDOWS/notepad.exe.
+  file1.path = base::FilePath("vmfile:PvmDefault:C:/WINDOWS/notepad.exe");
+  security_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file1},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ("", data);
+
+  // Plugin VM should handle vmfile:PvmDefault:C:/WINDOWS/notepad.exe.
+  file1.path = base::FilePath("vmfile:PvmDefault:C:/WINDOWS/notepad.exe");
+  security_delegate.SendFileInfo(ui::EndpointType::kPluginVm, {file1},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ("file:///C:/WINDOWS/notepad.exe", data);
+
+  // Crostini should handle vmfile:termina:/etc/hosts.
+  file1.path = base::FilePath("vmfile:termina:/etc/hosts");
+  security_delegate.SendFileInfo(ui::EndpointType::kPluginVm, {file1},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ("", data);
+}
+
+TEST_F(ChromeSecurityDelegateTest, SendFileInfoSharePathsCrostini) {
+  ChromeSecurityDelegate security_delegate;
+
+  // A path which is already shared should not be shared again.
+  base::FilePath shared_path = myfiles_dir_.Append("shared");
+  auto* guest_os_share_path =
+      guest_os::GuestOsSharePath::GetForProfile(profile());
+  guest_os_share_path->RegisterSharedPath(crostini::kCrostiniDefaultVmName,
+                                          shared_path);
+  ui::FileInfo file(shared_path, base::FilePath());
+  EXPECT_FALSE(FakeSeneschalClient::Get()->share_path_called());
+  std::string data;
+  security_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ("file:///mnt/chromeos/MyFiles/shared", data);
+  EXPECT_FALSE(FakeSeneschalClient::Get()->share_path_called());
+
+  // A path which is not already shared should be shared.
+  file = ui::FileInfo(myfiles_dir_.Append("file"), base::FilePath());
+  security_delegate.SendFileInfo(ui::EndpointType::kCrostini, {file},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ("file:///mnt/chromeos/MyFiles/file", data);
+  EXPECT_TRUE(FakeSeneschalClient::Get()->share_path_called());
+}
+
+TEST_F(ChromeSecurityDelegateTest, SendFileInfoSharePathsPluginVm) {
+  ChromeSecurityDelegate security_delegate;
+
+  // Plugin VM should send empty data and not share path if not already shared.
+  ui::FileInfo file(myfiles_dir_.Append("file"), base::FilePath());
+  std::string data;
+  security_delegate.SendFileInfo(ui::EndpointType::kPluginVm, {file},
+                                 base::BindOnce(&Capture, &data));
+  task_environment_.RunUntilIdle();
+  EXPECT_EQ("", data);
+  EXPECT_FALSE(FakeSeneschalClient::Get()->share_path_called());
+}
 }  // namespace ash
diff --git a/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
index e4ce74eb..cc23da9 100644
--- a/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
@@ -2091,8 +2091,6 @@
       return api::autotest_private::LacrosState::kStopped;
     case crosapi::BrowserManager::State::PREPARING_FOR_LAUNCH:
       return api::autotest_private::LacrosState::kPreparingForLaunch;
-    case crosapi::BrowserManager::State::WAITING_OWNER_FETCH:
-      return api::autotest_private::LacrosState::kWaitingOwnerFetch;
     case crosapi::BrowserManager::State::PRE_LAUNCHED:
       return api::autotest_private::LacrosState::kPreLaunched;
     case crosapi::BrowserManager::State::STARTING:
diff --git a/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider.cc b/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider.cc
index 25e9424..02cc8d2 100644
--- a/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider.cc
+++ b/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider.cc
@@ -29,13 +29,12 @@
 namespace ash {
 namespace {
 
-constexpr base::TimeDelta kMaxLastModifiedOrViewedTime = base::Days(8);
-
 constexpr char kBaseHistogramName[] = "Ash.Search.FileSuggestions.DriveRecents";
 
-drivefs::mojom::QueryParametersPtr CreateRecentlyModifiedQuery() {
+drivefs::mojom::QueryParametersPtr CreateRecentlyModifiedQuery(
+    base::TimeDelta max_recency) {
   auto query = drivefs::mojom::QueryParameters::New();
-  query->modified_time = base::Time::Now() - kMaxLastModifiedOrViewedTime;
+  query->modified_time = base::Time::Now() - max_recency;
   query->modified_time_operator =
       drivefs::mojom::QueryParameters::DateComparisonOperator::kGreaterThan;
   query->page_size = 15;
@@ -47,7 +46,8 @@
   return query;
 }
 
-drivefs::mojom::QueryParametersPtr CreateRecentlyViewedQuery() {
+drivefs::mojom::QueryParametersPtr CreateRecentlyViewedQuery(
+    base::TimeDelta max_recency) {
   auto query = drivefs::mojom::QueryParameters::New();
   query->page_size = 15;
   query->query_source =
@@ -56,7 +56,7 @@
       drivefs::mojom::QueryParameters::SortDirection::kDescending;
   query->sort_field =
       drivefs::mojom::QueryParameters::SortField::kLastViewedByMe;
-  query->viewed_time = base::Time::Now() - kMaxLastModifiedOrViewedTime;
+  query->viewed_time = base::Time::Now() - max_recency;
   query->viewed_time_operator =
       drivefs::mojom::QueryParameters::DateComparisonOperator::kGreaterThan;
   return query;
@@ -101,7 +101,8 @@
 
 std::optional<FileSuggestData> CreateFileSuggestion(
     const base::FilePath& path,
-    const drivefs::mojom::FileMetadata& file_metadata) {
+    const drivefs::mojom::FileMetadata& file_metadata,
+    base::TimeDelta max_recency) {
   const base::Time& modified_time = file_metadata.modification_time;
   const base::Time& viewed_time = file_metadata.last_viewed_by_me_time;
 
@@ -110,8 +111,7 @@
   if (const std::optional<base::Time>& shared_time =
           file_metadata.shared_with_me_time;
       shared_time && !shared_time->is_null() && viewed_time.is_null()) {
-    if ((base::Time::Now() - *shared_time).magnitude() >
-        kMaxLastModifiedOrViewedTime) {
+    if ((base::Time::Now() - *shared_time).magnitude() > max_recency) {
       return std::nullopt;
     }
 
@@ -124,11 +124,18 @@
 
   // Viewed by the user more recently than the last modification.
   if (viewed_time > modified_time) {
+    if ((base::Time::Now() - viewed_time).magnitude() > max_recency) {
+      return std::nullopt;
+    }
     return CreateFileSuggestionWithJustification(
         path, app_list::JustificationType::kViewed, viewed_time,
         /*user_info=*/nullptr);
   }
 
+  if ((base::Time::Now() - modified_time).magnitude() > max_recency) {
+    return std::nullopt;
+  }
+
   base::UmaHistogramBoolean(
       base::JoinString({kBaseHistogramName, "ModifyingUserMetadataPresent"},
                        "."),
@@ -155,7 +162,9 @@
 DriveRecentFileSuggestionProvider::DriveRecentFileSuggestionProvider(
     Profile* profile,
     base::RepeatingCallback<void(FileSuggestionType)> notify_update_callback)
-    : FileSuggestionProvider(notify_update_callback), profile_(profile) {
+    : FileSuggestionProvider(notify_update_callback),
+      profile_(profile),
+      max_recency_(GetMaxFileSuggestionRecency()) {
   auto* drive_integration_service =
       drive::DriveIntegrationServiceFactory::GetForProfile(profile);
   if (drive_integration_service) {
@@ -211,10 +220,12 @@
       3, base::BindOnce(
              &DriveRecentFileSuggestionProvider::OnRecentFilesSearchesCompleted,
              weak_factory_.GetWeakPtr()));
-  PerformSearch(SearchType::kLastModified, CreateRecentlyModifiedQuery(),
-                drive_service, search_callback);
-  PerformSearch(SearchType::kLastViewed, CreateRecentlyViewedQuery(),
-                drive_service, search_callback);
+  PerformSearch(SearchType::kLastModified,
+                CreateRecentlyModifiedQuery(max_recency_), drive_service,
+                search_callback);
+  PerformSearch(SearchType::kLastViewed,
+                CreateRecentlyViewedQuery(max_recency_), drive_service,
+                search_callback);
   PerformSearch(SearchType::kSharedWithUser, CreateSharedWithMeQuery(),
                 drive_service, search_callback);
 }
@@ -368,7 +379,7 @@
     }
 
     std::optional<FileSuggestData> suggestion =
-        CreateFileSuggestion(path, *item.second);
+        CreateFileSuggestion(path, *item.second, max_recency_);
     if (suggestion) {
       results.push_back(*suggestion);
     }
diff --git a/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider.h b/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider.h
index f1cf96e4..2e2ecba 100644
--- a/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider.h
+++ b/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider.h
@@ -88,6 +88,10 @@
 
   const raw_ptr<Profile> profile_;
 
+  // The time delta within which a valid file suggestion needs to be viewed or
+  // modified.
+  const base::TimeDelta max_recency_;
+
   // Whether request for file suggest data can generate results from the latest
   // cached query results.
   bool can_use_cache_ = false;
diff --git a/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider_unittest.cc b/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider_unittest.cc
index e8150a4..4d428db 100644
--- a/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider_unittest.cc
+++ b/chrome/browser/ash/file_suggest/drive_recent_file_suggestion_provider_unittest.cc
@@ -602,6 +602,17 @@
               .last_modified_time = GetReferenceTime() - base::Hours(26),
               .last_modifying_user = "Test User 1",
               .shared_with_me_time = GetReferenceTime() - base::Days(3),
+              .sharing_user = "Test User 2"},
+             {.path = base::FilePath("/Old shared file"),
+              .last_modified_time = GetReferenceTime() - base::Days(100),
+              .last_modifying_user = "Test User 1",
+              .shared_with_me_time = GetReferenceTime() - base::Days(100),
+              .sharing_user = "Test User 2"},
+             {.path = base::FilePath("/Old shared file viewed by user"),
+              .last_modified_time = GetReferenceTime() - base::Days(100),
+              .last_modifying_user = "Test User 1",
+              .last_viewed_by_me_time = GetReferenceTime() - base::Days(99),
+              .shared_with_me_time = GetReferenceTime() - base::Days(100),
               .sharing_user = "Test User 2"}}));
 
         mojo::MakeSelfOwnedReceiver(std::move(search_query),
diff --git a/chrome/browser/ash/file_suggest/file_suggest_util.cc b/chrome/browser/ash/file_suggest/file_suggest_util.cc
index 249bffb..ed7f6b0 100644
--- a/chrome/browser/ash/file_suggest/file_suggest_util.cc
+++ b/chrome/browser/ash/file_suggest/file_suggest_util.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/ash/file_suggest/file_suggest_util.h"
 
+#include "ash/constants/ash_features.h"
+#include "base/time/time.h"
+
 namespace ash {
 namespace {
 
@@ -13,6 +16,10 @@
 // The prefix of a local file suggestion id.
 constexpr char kLocalFileSuggestionPrefix[] = "zero_state_file://";
 
+// The number of days within which a file must be modified, or viewed to be
+// considered as a file suggestion.
+constexpr int kDefaultMaxRecencyInDays = 8;
+
 // Returns the prefix that matches `type`.
 std::string GetPrefixFromSuggestionType(FileSuggestionType type) {
   switch (type) {
@@ -25,6 +32,12 @@
 
 }  // namespace
 
+base::TimeDelta GetMaxFileSuggestionRecency() {
+  return base::Days(base::GetFieldTrialParamByFeatureAsInt(
+      ash::features::kLauncherContinueSectionWithRecents, "max_recency_in_days",
+      kDefaultMaxRecencyInDays));
+}
+
 // FileSuggestData -------------------------------------------------------------
 
 FileSuggestData::FileSuggestData(
diff --git a/chrome/browser/ash/file_suggest/file_suggest_util.h b/chrome/browser/ash/file_suggest/file_suggest_util.h
index 1633d1e..ea13007 100644
--- a/chrome/browser/ash/file_suggest/file_suggest_util.h
+++ b/chrome/browser/ash/file_suggest/file_suggest_util.h
@@ -39,6 +39,10 @@
   kLocalFile,
 };
 
+// Returns the max amount of time from now that a file was modified or viewed to
+// be available as a file suggestion.
+base::TimeDelta GetMaxFileSuggestionRecency();
+
 // The data of an individual file suggested by `FileSuggestKeyedService`.
 struct FileSuggestData {
   FileSuggestData(FileSuggestionType new_type,
diff --git a/chrome/browser/ash/file_suggest/local_file_suggestion_provider.cc b/chrome/browser/ash/file_suggest/local_file_suggestion_provider.cc
index 2dccefd1..892243c 100644
--- a/chrome/browser/ash/file_suggest/local_file_suggestion_provider.cc
+++ b/chrome/browser/ash/file_suggest/local_file_suggestion_provider.cc
@@ -77,7 +77,7 @@
     base::RepeatingCallback<void(FileSuggestionType)> notify_update_callback)
     : FileSuggestionProvider(notify_update_callback),
       profile_(profile),
-      max_last_modified_time_(base::Days(kDefaultMaxLastModifiedTimeInDays)) {
+      max_last_modified_time_(GetMaxFileSuggestionRecency()) {
   DCHECK(profile_);
 
   task_runner_ = base::ThreadPool::CreateSequencedTaskRunner(
diff --git a/chrome/browser/ash/file_suggest/local_file_suggestion_provider.h b/chrome/browser/ash/file_suggest/local_file_suggestion_provider.h
index 630d203..cc9f116 100644
--- a/chrome/browser/ash/file_suggest/local_file_suggestion_provider.h
+++ b/chrome/browser/ash/file_suggest/local_file_suggestion_provider.h
@@ -34,8 +34,6 @@
     base::File::Info info;
   };
 
-  static const int kDefaultMaxLastModifiedTimeInDays = 8;
-
   LocalFileSuggestionProvider(
       Profile* profile,
       base::RepeatingCallback<void(FileSuggestionType)> notify_update_callback);
diff --git a/chrome/browser/ash/file_suggest/local_file_suggestion_provider_unittest.cc b/chrome/browser/ash/file_suggest/local_file_suggestion_provider_unittest.cc
index 5ceb59a..a38b9e38 100644
--- a/chrome/browser/ash/file_suggest/local_file_suggestion_provider_unittest.cc
+++ b/chrome/browser/ash/file_suggest/local_file_suggestion_provider_unittest.cc
@@ -135,11 +135,7 @@
   WriteFile(Path("new.txt"));
   WriteFile(Path("old.png"));
   auto now = base::Time::Now();
-  base::TouchFile(
-      Path("old.png"), now,
-      now -
-          base::Days(
-              LocalFileSuggestionProvider::kDefaultMaxLastModifiedTimeInDays));
+  base::TouchFile(Path("old.png"), now, now - GetMaxFileSuggestionRecency());
 
   GetProvider()->OnFilesOpened(
       {OpenEvent(Path("new.txt")), OpenEvent(Path("old.png"))});
diff --git a/chrome/browser/ash/fileapi/recent_arc_media_source.cc b/chrome/browser/ash/fileapi/recent_arc_media_source.cc
index e1854a7d..bb5c771 100644
--- a/chrome/browser/ash/fileapi/recent_arc_media_source.cc
+++ b/chrome/browser/ash/fileapi/recent_arc_media_source.cc
@@ -82,10 +82,14 @@
 
 }  // namespace
 
-RecentArcMediaSource::CallContext::CallContext(GetRecentFilesCallback callback)
-    : callback(std::move(callback)), build_start_time(base::TimeTicks::Now()) {}
+RecentArcMediaSource::CallContext::CallContext(const Params& params,
+                                               GetRecentFilesCallback callback)
+    : params(params),
+      callback(std::move(callback)),
+      build_start_time(base::TimeTicks::Now()) {}
 RecentArcMediaSource::CallContext::CallContext(CallContext&& context)
-    : callback(std::move(context.callback)),
+    : params(context.params),
+      callback(std::move(context.callback)),
       build_start_time(std::move(context.build_start_time)) {}
 
 RecentArcMediaSource::CallContext::~CallContext() = default;
@@ -124,7 +128,7 @@
   }
 }
 
-void RecentArcMediaSource::GetRecentFiles(Params params,
+void RecentArcMediaSource::GetRecentFiles(const Params& params,
                                           GetRecentFilesCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(context_map_.Lookup(params.call_id()) == nullptr);
@@ -142,7 +146,7 @@
     return;
   }
 
-  auto context = std::make_unique<CallContext>(std::move(callback));
+  auto context = std::make_unique<CallContext>(params, std::move(callback));
   context_map_.AddWithID(std::move(context), params.call_id());
 
   if (!MatchesFileType(params.file_type())) {
@@ -163,14 +167,14 @@
   runner->GetRecentDocuments(
       arc::kMediaDocumentsProviderAuthority, root_id_,
       base::BindOnce(&RecentArcMediaSource::OnRunnerDone,
-                     weak_ptr_factory_.GetWeakPtr(), params));
+                     weak_ptr_factory_.GetWeakPtr(), params.call_id()));
 }
 
 void RecentArcMediaSource::OnRunnerDone(
-    const Params& params,
+    const int32_t call_id,
     std::optional<std::vector<arc::mojom::DocumentPtr>> maybe_documents) {
   if (!lag_.is_positive()) {
-    OnGotRecentDocuments(params, std::move(maybe_documents));
+    OnGotRecentDocuments(call_id, std::move(maybe_documents));
     return;
   }
 
@@ -179,23 +183,23 @@
   }
   timer_->Start(FROM_HERE, lag_,
                 base::BindOnce(&RecentArcMediaSource::OnGotRecentDocuments,
-                               weak_ptr_factory_.GetWeakPtr(), params,
+                               weak_ptr_factory_.GetWeakPtr(), call_id,
                                std::move(maybe_documents)));
 }
 
 void RecentArcMediaSource::OnGotRecentDocuments(
-    const Params& params,
+    const int32_t call_id,
     std::optional<std::vector<arc::mojom::DocumentPtr>> maybe_documents) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  CallContext* context = context_map_.Lookup(params.call_id());
+  CallContext* context = context_map_.Lookup(call_id);
   if (context == nullptr) {
     return;
   }
 
   // Initialize |document_id_to_file_| with recent document IDs returned.
   if (maybe_documents.has_value()) {
-    const std::u16string q16 = base::UTF8ToUTF16(params.query());
+    const std::u16string q16 = base::UTF8ToUTF16(context->params.query());
     for (const auto& document : maybe_documents.value()) {
       // Exclude media files under Downloads or MyFiles directory since they are
       // covered by RecentDiskSource.
@@ -212,20 +216,20 @@
   }
 
   if (context->document_id_to_file.empty()) {
-    OnComplete(params.call_id());
+    OnComplete(call_id);
     return;
   }
 
   // We have several recent documents, so start searching their real paths.
-  ScanDirectory(params, base::FilePath());
+  ScanDirectory(call_id, base::FilePath());
 }
 
-void RecentArcMediaSource::ScanDirectory(const Params& params,
+void RecentArcMediaSource::ScanDirectory(const int32_t call_id,
                                          const base::FilePath& path) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // If context was cleared while we were scanning directories, just abandon
   // this effort.
-  CallContext* context = context_map_.Lookup(params.call_id());
+  CallContext* context = context_map_.Lookup(call_id);
   if (context == nullptr) {
     return;
   }
@@ -238,7 +242,7 @@
     // We already checked ARC is allowed for this profile (indirectly), so
     // this should never happen.
     LOG(ERROR) << "ArcDocumentsProviderRootMap is not available";
-    OnDirectoryRead(params, path, base::File::FILE_ERROR_FAILED, {});
+    OnDirectoryRead(call_id, path, base::File::FILE_ERROR_FAILED, {});
     return;
   }
 
@@ -247,24 +251,24 @@
   if (!root) {
     // Media roots should always exist.
     LOG(ERROR) << "ArcDocumentsProviderRoot is missing";
-    OnDirectoryRead(params, path, base::File::FILE_ERROR_NOT_FOUND, {});
+    OnDirectoryRead(call_id, path, base::File::FILE_ERROR_NOT_FOUND, {});
     return;
   }
 
   root->ReadDirectory(
       path, base::BindOnce(&RecentArcMediaSource::OnDirectoryRead,
-                           weak_ptr_factory_.GetWeakPtr(), params, path));
+                           weak_ptr_factory_.GetWeakPtr(), call_id, path));
 }
 
 void RecentArcMediaSource::OnDirectoryRead(
-    const Params& params,
+    const int32_t call_id,
     const base::FilePath& path,
     base::File::Error result,
     std::vector<arc::ArcDocumentsProviderRoot::ThinFileInfo> files) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // If callback was cleared while we were scanning directories just abandon
   // this effort.
-  CallContext* context = context_map_.Lookup(params.call_id());
+  CallContext* context = context_map_.Lookup(call_id);
   if (context == nullptr) {
     return;
   }
@@ -272,8 +276,8 @@
   for (const auto& file : files) {
     base::FilePath subpath = path.Append(file.name);
     if (file.is_directory) {
-      if (!params.IsLate()) {
-        ScanDirectory(params, subpath);
+      if (!context->params.IsLate()) {
+        ScanDirectory(call_id, subpath);
       }
       continue;
     }
@@ -286,7 +290,7 @@
     // Update |document_id_to_file_|.
     // We keep the lexicographically smallest URL to stabilize the results when
     // there are multiple files with the same document ID.
-    auto url = BuildDocumentsProviderUrl(params, subpath);
+    auto url = BuildDocumentsProviderUrl(context->params, subpath);
     std::optional<RecentFile>& entry = doc_it->second;
     if (!entry.has_value() ||
         storage::FileSystemURL::Comparator()(url, entry.value().url())) {
@@ -298,11 +302,11 @@
   DCHECK_LE(0, context->num_inflight_readdirs);
 
   if (context->num_inflight_readdirs == 0) {
-    OnComplete(params.call_id());
+    OnComplete(call_id);
   }
 }
 
-std::vector<RecentFile> RecentArcMediaSource::Stop(int32_t call_id) {
+std::vector<RecentFile> RecentArcMediaSource::Stop(const int32_t call_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   CallContext* context = context_map_.Lookup(call_id);
diff --git a/chrome/browser/ash/fileapi/recent_arc_media_source.h b/chrome/browser/ash/fileapi/recent_arc_media_source.h
index 3f28273..23686071 100644
--- a/chrome/browser/ash/fileapi/recent_arc_media_source.h
+++ b/chrome/browser/ash/fileapi/recent_arc_media_source.h
@@ -53,11 +53,12 @@
 
   // Overrides the base class method to launch searches for recent file in the
   // root identified by the `root_id` parameter given at the construction time.
-  void GetRecentFiles(Params params, GetRecentFilesCallback callback) override;
+  void GetRecentFiles(const Params& params,
+                      GetRecentFilesCallback callback) override;
 
   // Overrides the base class Stop method to return partial results collected
   // before the timeout call. This method must be called on the UI thread.
-  std::vector<RecentFile> Stop(int32_t call_id) override;
+  std::vector<RecentFile> Stop(const int32_t call_id) override;
 
   // Causes laggy performance for this source. This is to be only used in tests.
   void SetLagForTesting(const base::TimeDelta& lag);
@@ -70,11 +71,14 @@
   // Call context stores information specific to a single GetRecentFiles call.
   // If multiple calls are issued each will have its own context.
   struct CallContext {
-    explicit CallContext(GetRecentFilesCallback callback);
+    CallContext(const Params& params, GetRecentFilesCallback callback);
     // Move constructor needed as callback cannot be copied.
     CallContext(CallContext&& context);
     ~CallContext();
 
+    // The parameters of the GetRecentFiles call.
+    const Params params;
+
     // The callback to be called once all files are gathered. We do not know
     // ahead of time when this may be the case, due to nested directories.
     // Thus this class behaves similarly to a Barrier class, except that the
@@ -102,28 +106,28 @@
   // Extra method that allows us to insert an optional lag between the runner
   // being done and the OnGotRecentDocuments being called.
   void OnRunnerDone(
-      const Params& params,
+      const int32_t call_id,
       std::optional<std::vector<arc::mojom::DocumentPtr>> maybe_documents);
 
   // The method called once recent document pointers have been retrieved. This
   // may take place immediately after the runner was done, or with a small lag
   // that helps testing the interaction with the Stop method.
   void OnGotRecentDocuments(
-      const Params& params,
+      const int32_t call_id,
       std::optional<std::vector<arc::mojom::DocumentPtr>> maybe_documents);
 
   // Starts scanning of the directory with the given path.
-  void ScanDirectory(const Params& params, const base::FilePath& path);
+  void ScanDirectory(const int32_t call_id, const base::FilePath& path);
 
   // The method called once a scan of directory is completed.
   void OnDirectoryRead(
-      const Params& params,
+      const int32_t call_id,
       const base::FilePath& path,
       base::File::Error result,
       std::vector<arc::ArcDocumentsProviderRoot::ThinFileInfo> files);
 
   // Invoked once traversing of the directory hirerachy is finished.
-  void OnComplete(int32_t call_id);
+  void OnComplete(const int32_t call_id);
 
   // Creates a complete FileSystemURL for the given `path`, with the
   // help of `relative_mount_path_`.
diff --git a/chrome/browser/ash/fileapi/recent_disk_source.cc b/chrome/browser/ash/fileapi/recent_disk_source.cc
index 3a2feec..2ba8f2cb 100644
--- a/chrome/browser/ash/fileapi/recent_disk_source.cc
+++ b/chrome/browser/ash/fileapi/recent_disk_source.cc
@@ -81,15 +81,18 @@
 }  // namespace
 
 RecentDiskSource::RecentDiskSource::CallContext::CallContext(
+    const Params& params,
     size_t max_files,
     GetRecentFilesCallback callback)
-    : callback(std::move(callback)),
+    : params(params),
+      callback(std::move(callback)),
       build_start_time(base::TimeTicks::Now()),
       accumulator(max_files) {}
 
 RecentDiskSource::RecentDiskSource::CallContext::CallContext(
     CallContext&& context)
-    : callback(std::move(context.callback)),
+    : params(context.params),
+      callback(std::move(context.callback)),
       build_start_time(context.build_start_time),
       inflight_readdirs(context.inflight_readdirs),
       inflight_stats(context.inflight_stats),
@@ -114,7 +117,7 @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
-void RecentDiskSource::GetRecentFiles(Params params,
+void RecentDiskSource::GetRecentFiles(const Params& params,
                                       GetRecentFilesCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(context_map_.Lookup(params.call_id()) == nullptr);
@@ -129,10 +132,11 @@
   }
 
   // Create a unique context for this call.
-  auto context = std::make_unique<CallContext>(max_files_, std::move(callback));
+  auto context =
+      std::make_unique<CallContext>(params, max_files_, std::move(callback));
   context_map_.AddWithID(std::move(context), params.call_id());
 
-  ScanDirectory(params, base::FilePath(), 1);
+  ScanDirectory(params.call_id(), base::FilePath(), 1);
 }
 
 std::vector<RecentFile> RecentDiskSource::Stop(const int32_t call_id) {
@@ -149,31 +153,32 @@
   return files;
 }
 
-void RecentDiskSource::ScanDirectory(const Params& params,
+void RecentDiskSource::ScanDirectory(const int32_t call_id,
                                      const base::FilePath& path,
                                      int depth) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If context is gone, that is Stop() has been called, exit immediately.
-  CallContext* context = context_map_.Lookup(params.call_id());
+  CallContext* context = context_map_.Lookup(call_id);
   if (context == nullptr) {
     return;
   }
 
-  storage::FileSystemURL url = BuildDiskURL(params, path);
+  storage::FileSystemURL url = BuildDiskURL(context->params, path);
 
   ++context->inflight_readdirs;
   content::GetIOThreadTaskRunner({})->PostTask(
       FROM_HERE,
-      base::BindOnce(&ReadDirectoryOnIOThread,
-                     base::WrapRefCounted(params.file_system_context()), url,
-                     base::BindRepeating(&RecentDiskSource::OnReadDirectory,
-                                         weak_ptr_factory_.GetWeakPtr(), params,
-                                         path, depth)));
+      base::BindOnce(
+          &ReadDirectoryOnIOThread,
+          base::WrapRefCounted(context->params.file_system_context()), url,
+          base::BindRepeating(&RecentDiskSource::OnReadDirectory,
+                              weak_ptr_factory_.GetWeakPtr(), call_id, path,
+                              depth)));
 }
 
 void RecentDiskSource::OnReadDirectory(
-    const Params& params,
+    const int32_t call_id,
     const base::FilePath& path,
     const int depth,
     base::File::Error result,
@@ -181,12 +186,12 @@
     bool has_more) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // If context is gone, that is Stop() has been called, exit immediately.
-  CallContext* context = context_map_.Lookup(params.call_id());
+  CallContext* context = context_map_.Lookup(call_id);
   if (context == nullptr) {
     return;
   }
 
-  const std::u16string q16 = base::UTF8ToUTF16(params.query());
+  const std::u16string q16 = base::UTF8ToUTF16(context->params.query());
   for (const auto& entry : entries) {
     // Ignore directories and files that start with dot.
     if (ignore_dotfiles_ &&
@@ -197,29 +202,29 @@
     base::FilePath subpath = path.Append(entry.name);
 
     if (entry.type == filesystem::mojom::FsFileType::DIRECTORY) {
-      if ((max_depth_ > 0 && depth >= max_depth_) || params.IsLate()) {
+      if ((max_depth_ > 0 && depth >= max_depth_) || context->params.IsLate()) {
         continue;
       }
-      ScanDirectory(params, subpath, depth + 1);
+      ScanDirectory(call_id, subpath, depth + 1);
     } else {
-      if (!MatchesFileType(entry.name, params.file_type())) {
+      if (!MatchesFileType(entry.name, context->params.file_type())) {
         continue;
       }
       if (!FileNameMatches(base::UTF8ToUTF16(entry.name.value()), q16)) {
         continue;
       }
-      storage::FileSystemURL url = BuildDiskURL(params, subpath);
+      storage::FileSystemURL url = BuildDiskURL(context->params, subpath);
       ++context->inflight_stats;
       content::GetIOThreadTaskRunner({})->PostTask(
           FROM_HERE,
           base::BindOnce(
               &GetMetadataOnIOThread,
-              base::WrapRefCounted(params.file_system_context()), url,
+              base::WrapRefCounted(context->params.file_system_context()), url,
               storage::FileSystemOperation::GetMetadataFieldSet(
                   {storage::FileSystemOperation::GetMetadataField::
                        kLastModified}),
               base::BindOnce(&RecentDiskSource::OnGotMetadata,
-                             weak_ptr_factory_.GetWeakPtr(), params, url)));
+                             weak_ptr_factory_.GetWeakPtr(), call_id, url)));
     }
   }
 
@@ -229,35 +234,35 @@
 
   --context->inflight_readdirs;
   if (context->inflight_stats == 0 && context->inflight_readdirs == 0) {
-    OnReadOrStatFinished(params);
+    OnReadOrStatFinished(call_id);
   }
 }
 
-void RecentDiskSource::OnGotMetadata(const Params& params,
+void RecentDiskSource::OnGotMetadata(const int32_t call_id,
                                      const storage::FileSystemURL& url,
                                      base::File::Error result,
                                      const base::File::Info& info) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // If context is gone, that is Stop() has been called, exit immediately.
-  CallContext* context = context_map_.Lookup(params.call_id());
+  CallContext* context = context_map_.Lookup(call_id);
   if (context == nullptr) {
     return;
   }
 
   if (result == base::File::FILE_OK &&
-      info.last_modified >= params.cutoff_time()) {
+      info.last_modified >= context->params.cutoff_time()) {
     context->accumulator.Add(RecentFile(url, info.last_modified));
   }
 
   --context->inflight_stats;
   if (context->inflight_stats == 0 && context->inflight_readdirs == 0) {
-    OnReadOrStatFinished(params);
+    OnReadOrStatFinished(call_id);
   }
 }
 
-void RecentDiskSource::OnReadOrStatFinished(const Params& params) {
+void RecentDiskSource::OnReadOrStatFinished(const int32_t call_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  CallContext* context = context_map_.Lookup(params.call_id());
+  CallContext* context = context_map_.Lookup(call_id);
   // If context is gone, that is Stop() has been called, exit immediately.
   if (context == nullptr) {
     return;
@@ -272,7 +277,7 @@
                     base::TimeTicks::Now() - context->build_start_time);
 
   std::move(context->callback).Run(context->accumulator.Get());
-  context_map_.Remove(params.call_id());
+  context_map_.Remove(call_id);
 }
 
 storage::FileSystemURL RecentDiskSource::BuildDiskURL(
diff --git a/chrome/browser/ash/fileapi/recent_disk_source.h b/chrome/browser/ash/fileapi/recent_disk_source.h
index 4645a9a..05d919a 100644
--- a/chrome/browser/ash/fileapi/recent_disk_source.h
+++ b/chrome/browser/ash/fileapi/recent_disk_source.h
@@ -47,7 +47,8 @@
   ~RecentDiskSource() override;
 
   // RecentSource overrides:
-  void GetRecentFiles(Params params, GetRecentFilesCallback callback) override;
+  void GetRecentFiles(const Params& params,
+                      GetRecentFilesCallback callback) override;
 
   // Stops the recent files search. Returns any partial results already
   // collected.
@@ -63,20 +64,20 @@
 
   static const char kLoadHistogramName[];
 
-  void ScanDirectory(const Params& params,
+  void ScanDirectory(const int32_t call_id,
                      const base::FilePath& path,
                      int depth);
-  void OnReadDirectory(const Params& params,
+  void OnReadDirectory(const int32_t call_id,
                        const base::FilePath& path,
                        int depth,
                        base::File::Error result,
                        storage::FileSystemOperation::FileEntryList entries,
                        bool has_more);
-  void OnGotMetadata(const Params& params,
+  void OnGotMetadata(const int32_t call_id,
                      const storage::FileSystemURL& url,
                      base::File::Error result,
                      const base::File::Info& info);
-  void OnReadOrStatFinished(const Params& params);
+  void OnReadOrStatFinished(int32_t call_id);
 
   storage::FileSystemURL BuildDiskURL(const Params& params,
                                       const base::FilePath& path) const;
@@ -93,12 +94,17 @@
   // map is only accessed on the UI thread we do not need to use additional
   // locks to guarantee its consistency.
   struct CallContext {
-    CallContext(size_t max_files, GetRecentFilesCallback callback);
+    CallContext(const Params& params,
+                size_t max_files,
+                GetRecentFilesCallback callback);
     // Move constructor; necessary as callback is a move-only type.
     CallContext(CallContext&& context);
 
     ~CallContext();
 
+    // The parameters of the GetRecentFiles call.
+    const Params params;
+
     // The callback called when the files and their metadata is ready.
     GetRecentFilesCallback callback;
     // Time when the build started.
diff --git a/chrome/browser/ash/fileapi/recent_drive_source.cc b/chrome/browser/ash/fileapi/recent_drive_source.cc
index fd47042..5e4c2c02 100644
--- a/chrome/browser/ash/fileapi/recent_drive_source.cc
+++ b/chrome/browser/ash/fileapi/recent_drive_source.cc
@@ -83,7 +83,7 @@
   return type_filters;
 }
 
-void RecentDriveSource::GetRecentFiles(Params params,
+void RecentDriveSource::GetRecentFiles(const Params& params,
                                        GetRecentFilesCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -137,7 +137,7 @@
   return files;
 }
 
-void RecentDriveSource::OnComplete(int32_t call_id) {
+void RecentDriveSource::OnComplete(const int32_t call_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CallContext* context = context_map_.Lookup(call_id);
   if (context == nullptr) {
diff --git a/chrome/browser/ash/fileapi/recent_drive_source.h b/chrome/browser/ash/fileapi/recent_drive_source.h
index 42a9d72..99e2a3f 100644
--- a/chrome/browser/ash/fileapi/recent_drive_source.h
+++ b/chrome/browser/ash/fileapi/recent_drive_source.h
@@ -40,7 +40,8 @@
   ~RecentDriveSource() override;
 
   // RecentSource overrides:
-  void GetRecentFiles(Params params, GetRecentFilesCallback callback) override;
+  void GetRecentFiles(const Params& params,
+                      GetRecentFilesCallback callback) override;
 
   // Overrides the Stop method to implement search interruption.
   std::vector<RecentFile> Stop(const int32_t call_id) override;
diff --git a/chrome/browser/ash/fileapi/recent_source.h b/chrome/browser/ash/fileapi/recent_source.h
index 119da3d..1f4b2ef 100644
--- a/chrome/browser/ash/fileapi/recent_source.h
+++ b/chrome/browser/ash/fileapi/recent_source.h
@@ -108,7 +108,7 @@
   // You can assume that, once this function is called, it is not called again
   // until the callback is invoked. This means that you can safely save internal
   // states to compute recent files in member variables.
-  virtual void GetRecentFiles(Params params,
+  virtual void GetRecentFiles(const Params& params,
                               GetRecentFilesCallback callback) = 0;
 
   // Called by the RecentModel if it wants to interrupt search for recent files.
diff --git a/chrome/browser/ash/fileapi/test/fake_recent_source.cc b/chrome/browser/ash/fileapi/test/fake_recent_source.cc
index 7edd0379..38f19026 100644
--- a/chrome/browser/ash/fileapi/test/fake_recent_source.cc
+++ b/chrome/browser/ash/fileapi/test/fake_recent_source.cc
@@ -77,7 +77,7 @@
   producers_.emplace_back(std::move(producer));
 }
 
-void FakeRecentSource::GetRecentFiles(Params params,
+void FakeRecentSource::GetRecentFiles(const Params& params,
                                       GetRecentFilesCallback callback) {
   const auto& [it, _] = context_map_.emplace(
       params.call_id(), CallContext(std::move(callback), params));
diff --git a/chrome/browser/ash/fileapi/test/fake_recent_source.h b/chrome/browser/ash/fileapi/test/fake_recent_source.h
index b61bfc2..c3b2e048 100644
--- a/chrome/browser/ash/fileapi/test/fake_recent_source.h
+++ b/chrome/browser/ash/fileapi/test/fake_recent_source.h
@@ -57,7 +57,8 @@
   // RecentSource overrides. When this method is called it triggers GetFiles
   // calls on all known file producers. When all file producers deliver the
   // results the callback is called with all delivered files.
-  void GetRecentFiles(Params params, GetRecentFilesCallback callback) override;
+  void GetRecentFiles(const Params& params,
+                      GetRecentFilesCallback callback) override;
 
   std::vector<RecentFile> Stop(int32_t call_id) override;
 
diff --git a/chrome/browser/ash/guest_os/guest_os_share_path.cc b/chrome/browser/ash/guest_os/guest_os_share_path.cc
index 292d740..5de2893c 100644
--- a/chrome/browser/ash/guest_os/guest_os_share_path.cc
+++ b/chrome/browser/ash/guest_os/guest_os_share_path.cc
@@ -183,7 +183,7 @@
   }
 
   if (auto* vmgr = file_manager::VolumeManager::Get(profile_)) {
-    vmgr->AddObserver(this);
+    volume_manager_observer_.Observe(vmgr);
   }
 
   // We receive notifications from DriveFS about any deleted paths so
@@ -202,10 +202,6 @@
     client->RemoveVmObserver(this);
   }
 
-  if (auto* vmgr = file_manager::VolumeManager::Get(profile_)) {
-    vmgr->RemoveObserver(this);
-  }
-
   for (auto& shared_path : shared_paths_) {
     if (shared_path.second.watcher) {
       file_watcher_task_runner_->DeleteSoon(
diff --git a/chrome/browser/ash/guest_os/guest_os_share_path.h b/chrome/browser/ash/guest_os/guest_os_share_path.h
index d7b15b36..08e2e92 100644
--- a/chrome/browser/ash/guest_os/guest_os_share_path.h
+++ b/chrome/browser/ash/guest_os/guest_os_share_path.h
@@ -16,6 +16,7 @@
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "base/scoped_observation.h"
 #include "base/task/sequenced_task_runner.h"
 #include "chrome/browser/ash/crostini/crostini_util.h"
 #include "chrome/browser/ash/file_manager/volume_manager_observer.h"
@@ -222,6 +223,10 @@
   std::map<base::FilePath, SharedPathInfo> shared_paths_;
   base::flat_set<GuestId> guests_;
 
+  base::ScopedObservation<file_manager::VolumeManager,
+                          file_manager::VolumeManagerObserver>
+      volume_manager_observer_{this};
+
   base::WeakPtrFactory<GuestOsSharePath> weak_ptr_factory_{this};
 };  // class
 
diff --git a/chrome/browser/ash/guest_os/guest_os_share_path_factory.cc b/chrome/browser/ash/guest_os/guest_os_share_path_factory.cc
index 4d65d15a..b4699418 100644
--- a/chrome/browser/ash/guest_os/guest_os_share_path_factory.cc
+++ b/chrome/browser/ash/guest_os/guest_os_share_path_factory.cc
@@ -6,6 +6,8 @@
 
 #include "base/no_destructor.h"
 #include "chrome/browser/ash/crostini/crostini_manager_factory.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
+#include "chrome/browser/ash/file_manager/volume_manager_factory.h"
 #include "chrome/browser/ash/guest_os/guest_os_share_path.h"
 #include "chrome/browser/profiles/profile.h"
 
@@ -33,6 +35,8 @@
               .WithSystem(ProfileSelection::kNone)
               .Build()) {
   DependsOn(crostini::CrostiniManagerFactory::GetInstance());
+  DependsOn(file_manager::VolumeManagerFactory::GetInstance());
+  DependsOn(drive::DriveIntegrationServiceFactory::GetInstance());
 }
 
 GuestOsSharePathFactory::~GuestOsSharePathFactory() = default;
diff --git a/chrome/browser/ash/login/screens/mock_demo_setup_screen.h b/chrome/browser/ash/login/screens/mock_demo_setup_screen.h
index b0f2b9a..d0e044f 100644
--- a/chrome/browser/ash/login/screens/mock_demo_setup_screen.h
+++ b/chrome/browser/ash/login/screens/mock_demo_setup_screen.h
@@ -38,6 +38,13 @@
   MOCK_METHOD(void,
               SetCurrentSetupStep,
               (const DemoSetupController::DemoSetupStep current_step));
+
+  base::WeakPtr<DemoSetupScreenView> AsWeakPtr() override {
+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
+ private:
+  base::WeakPtrFactory<DemoSetupScreenView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/ash/login/screens/mock_network_screen.h b/chrome/browser/ash/login/screens/mock_network_screen.h
index dcb1a29..4267d31 100644
--- a/chrome/browser/ash/login/screens/mock_network_screen.h
+++ b/chrome/browser/ash/login/screens/mock_network_screen.h
@@ -27,7 +27,7 @@
   void ExitScreen(NetworkScreen::Result result);
 };
 
-class MockNetworkScreenView : public NetworkScreenView {
+class MockNetworkScreenView final : public NetworkScreenView {
  public:
   MockNetworkScreenView();
 
@@ -41,6 +41,13 @@
   MOCK_METHOD(void, ClearErrors, ());
   MOCK_METHOD(void, SetOfflineDemoModeEnabled, (bool enabled));
   MOCK_METHOD(void, SetQuickStartEnabled, ());
+
+  base::WeakPtr<NetworkScreenView> AsWeakPtr() override {
+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
+ private:
+  base::WeakPtrFactory<NetworkScreenView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc b/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc
index 11867985..29132d6 100644
--- a/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc
+++ b/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc
@@ -49,6 +49,7 @@
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
@@ -263,9 +264,8 @@
     widget_->SetBounds(gfx::Rect(0, 0, 100, 100));
     widget_->Show();
 
-    views::test::WidgetActivationWaiter waiter(widget_.get(), true);
     widget_->Show();
-    waiter.Wait();
+    views::test::WaitForWidgetActive(widget_.get(), true);
 
     ASSERT_TRUE(widget_->IsActive());
 
diff --git a/chrome/browser/extensions/chrome_content_verifier_delegate.cc b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
index f1a1108..171f262 100644
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
@@ -60,8 +60,26 @@
 const char kContentVerificationExperimentName[] =
     "ExtensionContentVerification";
 
+ChromeContentVerifierDelegate::GetVerifyInfoTestOverride::VerifyInfoCallback*
+    g_verify_info_test_callback = nullptr;
+
 }  // namespace
 
+ChromeContentVerifierDelegate::GetVerifyInfoTestOverride::
+    GetVerifyInfoTestOverride(VerifyInfoCallback callback)
+    : callback_(std::move(callback)) {
+  DCHECK_EQ(nullptr, g_verify_info_test_callback)
+      << "Nested overrides are not supported.";
+  g_verify_info_test_callback = &callback_;
+}
+
+ChromeContentVerifierDelegate::GetVerifyInfoTestOverride::
+    ~GetVerifyInfoTestOverride() {
+  DCHECK_EQ(&callback_, g_verify_info_test_callback)
+      << "Nested overrides are not supported.";
+  g_verify_info_test_callback = nullptr;
+}
+
 ChromeContentVerifierDelegate::VerifyInfo::VerifyInfo(Mode mode,
                                                       bool is_from_webstore,
                                                       bool should_repair)
@@ -302,6 +320,10 @@
 
 ChromeContentVerifierDelegate::VerifyInfo
 ChromeContentVerifierDelegate::GetVerifyInfo(const Extension& extension) const {
+  if (g_verify_info_test_callback) {
+    return g_verify_info_test_callback->Run(extension);
+  }
+
   ManagementPolicy* management_policy =
       ExtensionSystem::Get(context_)->management_policy();
 
diff --git a/chrome/browser/extensions/chrome_content_verifier_delegate.h b/chrome/browser/extensions/chrome_content_verifier_delegate.h
index 20c86f9..486b6f2 100644
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.h
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.h
@@ -85,6 +85,24 @@
                     ContentVerifyJob::FailureReason reason) override;
   void Shutdown() override;
 
+  // A helper class to allow tests to provide their own `VerifyInfo` for
+  // different extensions. The included callback will be called for each check
+  // of `GetVerifyInfo()`.
+  class GetVerifyInfoTestOverride {
+   public:
+    using VerifyInfoCallback =
+        base::RepeatingCallback<VerifyInfo(const Extension& extension)>;
+
+    explicit GetVerifyInfoTestOverride(VerifyInfoCallback callback);
+    GetVerifyInfoTestOverride(const GetVerifyInfoTestOverride&) = delete;
+    GetVerifyInfoTestOverride& operator=(const GetVerifyInfoTestOverride&) =
+        delete;
+    ~GetVerifyInfoTestOverride();
+
+   private:
+    VerifyInfoCallback callback_;
+  };
+
  private:
   // Returns true iff |extension| is considered extension from Chrome Web Store
   // (and therefore signed hashes may be used for its content verification).
diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc
index 6a3f060..da16807c 100644
--- a/chrome/browser/extensions/content_verifier_browsertest.cc
+++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -10,6 +10,7 @@
 #include "base/files/file_util.h"
 #include "base/functional/callback_helpers.h"
 #include "base/strings/string_split.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/task_environment.h"
 #include "base/test/test_file_util.h"
@@ -47,6 +48,7 @@
 #include "extensions/common/extension_features.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/file_util.h"
+#include "extensions/test/extension_test_message_listener.h"
 #include "third_party/zlib/google/compression_utils.h"
 
 using extensions::mojom::ManifestLocation;
@@ -85,6 +87,15 @@
   std::move(callback).Run();
 }
 
+// A helper override to force generation of hashes for all extensions, not just
+// those from the webstore.
+ChromeContentVerifierDelegate::VerifyInfo GetVerifyInfoAndForceHashes(
+    const Extension& extension) {
+  return ChromeContentVerifierDelegate::VerifyInfo(
+      ChromeContentVerifierDelegate::VerifyInfo::Mode::ENFORCE_STRICT,
+      extension.from_webstore(), /*should_repair=*/false);
+}
+
 }  // namespace
 
 class ContentVerifierTest : public ExtensionBrowserTest {
@@ -380,6 +391,112 @@
                              ScriptModificationAction::kMakeUnreadable);
 }
 
+// A class that forces all installed extensions to generate hashes (normally,
+// we'd only generate hashes for policy-installed extensions with the
+// appropriate enterprise policy applied). This makes it easier to test the
+// relevant bits of content verification (namely, verifying content against an
+// expected set) without needing webstore-signed hashes in the test environment.
+class ContentVerifierTestWithForcedHashes : public ContentVerifierTest {
+ public:
+  ContentVerifierTestWithForcedHashes()
+      : verify_info_override_(
+            base::BindRepeating(&GetVerifyInfoAndForceHashes)) {}
+  ~ContentVerifierTestWithForcedHashes() override = default;
+
+ private:
+  ChromeContentVerifierDelegate::GetVerifyInfoTestOverride
+      verify_info_override_;
+};
+
+// Tests detection of corruption in an extension's service worker file.
+IN_PROC_BROWSER_TEST_F(ContentVerifierTestWithForcedHashes,
+                       TestServiceWorkerCorruption_DisableAndEnable) {
+  static constexpr char kManifest[] =
+      R"({
+           "name": "test extension",
+           "manifest_version": 3,
+           "version": "0.1",
+           "background": {"service_worker": "background.js"}
+         })";
+  static constexpr char kBackgroundJs[] =
+      R"(chrome.tabs.onCreated.addListener(() => {
+           console.warn('Firing listener');
+           chrome.test.sendMessage('listener fired');
+         });
+         chrome.test.sendMessage('ready');)";
+
+  TestExtensionDir test_dir;
+  test_dir.WriteManifest(kManifest);
+  test_dir.WriteFile(FILE_PATH_LITERAL("background.js"), kBackgroundJs);
+
+  ExtensionTestMessageListener event_listener("listener fired");
+  ExtensionTestMessageListener ready_listener("ready");
+  VerifierObserver verifier_observer;
+
+  scoped_refptr<const Extension> extension(
+      InstallExtension(test_dir.Pack(), 1));
+
+  ASSERT_TRUE(extension);
+
+  // Wait for the content verification code to finish processing the hashes and
+  // for the extension to register the listener.
+  verifier_observer.EnsureFetchCompleted(extension->id());
+  ASSERT_TRUE(ready_listener.WaitUntilSatisfied());
+
+  // Navigate to a new tab. This should fire the event listener (ensuring the
+  // extension was active).
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), GURL("chrome://newtab"),
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_LOAD_STOP);
+  ASSERT_TRUE(event_listener.WaitUntilSatisfied());
+
+  // Now alter the contents of the background script.
+  {
+    base::ScopedAllowBlockingForTesting allow_blocking;
+    ASSERT_TRUE(
+        base::AppendToFile(extension->path().AppendASCII("background.js"),
+                           "some_extra_function_call();"));
+  }
+
+  // Disable and re-enable the extension. On re-enable, the extension should
+  // be detected as corrupted, since the contents on disk no longer match the
+  // contents indicated by the generated hash.
+  DisableExtension(extension->id());
+
+  base::HistogramTester histogram_tester;
+  TestContentVerifyJobObserver job_observer;
+  base::FilePath background_script_relative_path =
+      base::FilePath().AppendASCII("background.js");
+  job_observer.ExpectJobResult(extension->id(), background_script_relative_path,
+                               TestContentVerifyJobObserver::Result::FAILURE);
+
+  EnableExtension(extension->id());
+  EXPECT_TRUE(job_observer.WaitForExpectedJobs());
+
+  // The extension should be disabled...
+  ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
+  EXPECT_FALSE(registry->enabled_extensions().Contains(extension->id()));
+  EXPECT_TRUE(registry->disabled_extensions().Contains(extension->id()));
+
+  // ... for the reason of being corrupted...
+  ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
+  int reasons = prefs->GetDisableReasons(extension->id());
+  EXPECT_EQ(disable_reason::DISABLE_CORRUPTED, reasons);
+
+  // ... And we should have recorded metrics for where we found the corruption.
+  histogram_tester.ExpectUniqueSample(
+      "Extensions.ContentVerification.VerifyFailedOnFileMV3."
+      "ServiceWorkerScript",
+      ContentVerifyJob::HASH_MISMATCH, 1);
+  // We hard-code the script type here to avoid exposing it publicly from the
+  // class.
+  constexpr int kServiceWorkerScriptFileType = 3;
+  histogram_tester.ExpectUniqueSample(
+      "Extensions.ContentVerification.VerifyFailedOnFileTypeMV3",
+      kServiceWorkerScriptFileType, 1);
+}
+
 // Tests the case of a corrupt extension that is force-installed by policy and
 // should not be allowed to be manually uninstalled/disabled by the user.
 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, PolicyCorrupted) {
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 3fe4f56..e8936a0 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -2361,11 +2361,6 @@
     "expiry_milestone": 135
   },
   {
-    "name": "enable-critical-persisted-tab-data",
-    "owners": [ "chrome-shopping@google.com" ],
-    "expiry_milestone": 120
-  },
-  {
     "name": "enable-cros-autocorrect-by-default",
     "owners": [ "curtismcmullan@chromium.org", "essential-inputs-team@google.com" ],
     "expiry_milestone": 130
@@ -7302,16 +7297,6 @@
     "expiry_milestone": 130
   },
   {
-    "name": "service-worker-bypass-fetch-handler",
-    "owners": [ "sisidovski@google.com", "chrome-worker@google.com" ],
-    "expiry_milestone": 119
-  },
-  {
-    "name": "service-worker-bypass-fetch-handler-for-main-resource",
-    "owners": [ "sisidovski@google.com", "chrome-worker@google.com" ],
-    "expiry_milestone": 119
-  },
-  {
     "name": "service-worker-static-router",
     "owners": [ "yyanagisawa@google.com", "sisidovski@google.com", "chrome-worker@google.com" ],
     "expiry_milestone": 125
@@ -7597,11 +7582,6 @@
     "expiry_milestone": 125
   },
   {
-    "name": "storage-buckets",
-    "owners": [ "ayui@chromium.org", "estade@chromium.org", "chrome-owp-storage@google.com" ],
-    "expiry_milestone": 121
-  },
-  {
     "name": "strict-origin-isolation",
     "owners": [ "wjmaclean@chromium.org", "alexmos@chromium.org", "creis@chromium.org" ],
     // This can be used to opt in to origin isolation which isolates full
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 5c928a1..89871f9c2 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -761,25 +761,6 @@
     "The shortcut app badge is painted in the UI instead of being part of the "
     "shortcut app icon, and more effects are added for the icon.";
 
-const char kServiceWorkerBypassFetchHandlerName[] =
-    "Bypass Service Worker Fetch Handler";
-const char kServiceWorkerBypassFetchHandlerDescription[] =
-    "Bypass starting a service worker and its fetch handler when the fetch "
-    "event meets the conditions. The service worker may start after sending a "
-    "resource request, or conduct a race between the network request and its "
-    "fetch handler. If the resource could be handled in the fetch handler, the "
-    "feature may affect the page load. This feature will override "
-    "chrome://flags/#service-worker-bypass-fetch-handler-for-main-resource";
-
-const char kServiceWorkerBypassFetchHandlerForMainResourceName[] =
-    "Bypass Service Worker Fetch Handler for main resource";
-const char kServiceWorkerBypassFetchHandlerForMainResourceDescription[] =
-    "Bypass starting a service worker and its fetch handler for main resource "
-    "requests. The service worker starts after sending a main resource request "
-    "and handles subresources. If the main resource could be handled in the "
-    "fetch handler, the feature may affect the page load. This feature will be "
-    "overridden by chrome://flags/#service-worker-bypass-fetch-handler";
-
 const char kServiceWorkerStaticRouterName[] = "Service Worker Static Router";
 const char kServiceWorkerStaticRouterDescription[] =
     "When enabled, Chrome will enable the Service Worker Static Routing API. "
@@ -2071,12 +2052,6 @@
 const char kStartSurfaceReturnTimeDescription[] =
     "Enable showing start surface at startup after specified time has elapsed";
 
-const char kStorageBucketsName[] = "Storage Buckets API";
-const char kStorageBucketsDescription[] =
-    "Enable experimental Storage Buckets API, allowing websites to create "
-    "multiple buckets of storage to organize their data, allowing user agents "
-    "to delete each bucket independently of other buckets.";
-
 const char kHttpsFirstModeIncognitoName[] = "HTTPS-First Mode in Incognito";
 const char kHttpsFirstModeIncognitoDescription[] =
     "Enable HTTPS-First Mode in Incognito as default setting and add as new "
@@ -4080,11 +4055,13 @@
 const char kDrawCutoutEdgeToEdgeName[] = "DrawCutoutEdgeToEdge";
 const char kDrawCutoutEdgeToEdgeDescription[] =
     "Enables the Android feature Edge-to-Edge Feature to coordinate with the "
-    "Display Cutout for the notch when drawing below the Nav Bar.";
+    "Display Cutout for the notch when drawing below the Nav Bar.  Requires "
+    "DrawEdgeToEdge to also be enabled.";
 
 const char kDrawEdgeToEdgeName[] = "DrawEdgeToEdge";
 const char kDrawEdgeToEdgeDescription[] =
-    "Enables the Android feature Edge-to-Edge to draw below the Nav Bar.";
+    "Enables the Android feature Edge-to-Edge to draw below the Nav Bar. "
+    "Requires DrawCutoutEdgeToEdge to also be enabled.";
 
 const char kDrawNativeEdgeToEdgeName[] = "DrawNativeEdgeToEdge";
 const char kDrawNativeEdgeToEdgeDescription[] =
@@ -4544,7 +4521,8 @@
 
 const char kTotallyEdgeToEdgeName[] = "Totally Edge To Edge exploration";
 const char kTotallyEdgeToEdgeDescription[] =
-    "An exploration of further ideas to activate Edge To Edge.";
+    "An exploration of further ideas to activate Edge To Edge. Requires "
+    "DrawCutoutEdgeToEdge and DrawEdgeToEdge to also be enabled.";
 
 const char kTouchDragAndContextMenuName[] =
     "Simultaneous touch drag and context menu";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index fcf9f89..dcaede4 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -434,12 +434,6 @@
 extern const char kSeparateWebAppShortcutBadgeIconName[];
 extern const char kSeparateWebAppShortcutBadgeIconDescription[];
 
-extern const char kServiceWorkerBypassFetchHandlerName[];
-extern const char kServiceWorkerBypassFetchHandlerDescription[];
-
-extern const char kServiceWorkerBypassFetchHandlerForMainResourceName[];
-extern const char kServiceWorkerBypassFetchHandlerForMainResourceDescription[];
-
 extern const char kServiceWorkerStaticRouterName[];
 extern const char kServiceWorkerStaticRouterDescription[];
 
@@ -1161,9 +1155,6 @@
 extern const char kStartSurfaceReturnTimeName[];
 extern const char kStartSurfaceReturnTimeDescription[];
 
-extern const char kStorageBucketsName[];
-extern const char kStorageBucketsDescription[];
-
 extern const char kHideIncognitoMediaMetadataName[];
 extern const char kHideIncognitoMediaMetadataDescription[];
 
diff --git a/chrome/browser/lacros/metrics_reporting_observer_unittest.cc b/chrome/browser/lacros/metrics_reporting_observer_unittest.cc
index fc4f41e5..de5f4ed8 100644
--- a/chrome/browser/lacros/metrics_reporting_observer_unittest.cc
+++ b/chrome/browser/lacros/metrics_reporting_observer_unittest.cc
@@ -35,8 +35,8 @@
   }
 
  private:
-  raw_ptr<MockMetricsServiceProxy> mock_metrics_service_;
   std::unique_ptr<MetricsReportingObserver> observer_;
+  raw_ptr<MockMetricsServiceProxy> mock_metrics_service_;
 };
 
 TEST_F(MetricsReportingObserverTest, EnablingMetricsReporting) {
diff --git a/chrome/browser/lacros/multitask_menu_nudge_delegate_lacros_browsertest.cc b/chrome/browser/lacros/multitask_menu_nudge_delegate_lacros_browsertest.cc
index 46d3a96..1575c9b 100644
--- a/chrome/browser/lacros/multitask_menu_nudge_delegate_lacros_browsertest.cc
+++ b/chrome/browser/lacros/multitask_menu_nudge_delegate_lacros_browsertest.cc
@@ -16,6 +16,7 @@
 #include "chromeos/lacros/lacros_service.h"
 #include "content/public/test/browser_test.h"
 #include "ui/aura/window.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 
 using MultitaskMenuNudgeDelegateLacrosBrowserTest = InProcessBrowserTest;
@@ -93,9 +94,9 @@
 
   Browser* browser2 = CreateBrowser(browser()->profile());
   ASSERT_TRUE(browser_test_util::WaitForWindowCreation(browser2));
-  views::test::WidgetActivationWaiter(
-      BrowserView::GetBrowserViewForBrowser(browser2)->frame(), /*active=*/true)
-      .Wait();
+  views::test::WaitForWidgetActive(
+      BrowserView::GetBrowserViewForBrowser(browser2)->frame(),
+      /*active=*/true);
   ASSERT_TRUE(browser2->window()->IsActive());
 
   chromeos::MultitaskMenuNudgeController::SetSuppressNudgeForTesting(false);
@@ -106,12 +107,12 @@
   browser1->window()->Activate();
   browser2->window()->Activate();
   browser1->window()->Activate();
-  views::test::WidgetActivationWaiter(
-      BrowserView::GetBrowserViewForBrowser(browser1)->frame(), /*active=*/true)
-      .Wait();
+  views::test::WaitForWidgetActive(
+      BrowserView::GetBrowserViewForBrowser(browser1)->frame(),
+      /*active=*/true);
 
   browser2->window()->Activate();
-  views::test::WidgetActivationWaiter(
-      BrowserView::GetBrowserViewForBrowser(browser2)->frame(), /*active=*/true)
-      .Wait();
+  views::test::WaitForWidgetActive(
+      BrowserView::GetBrowserViewForBrowser(browser2)->frame(),
+      /*active=*/true);
 }
diff --git a/chrome/browser/lacros/window_lacros_browsertest.cc b/chrome/browser/lacros/window_lacros_browsertest.cc
index f9d79cac..b40bd26b 100644
--- a/chrome/browser/lacros/window_lacros_browsertest.cc
+++ b/chrome/browser/lacros/window_lacros_browsertest.cc
@@ -8,19 +8,11 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/browser_test.h"
 #include "ui/ozone/public/ozone_platform.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
 
 namespace crosapi {
-namespace {
-
-// Waits for a widget to become active.
-void WaitForActivation(views::Widget* widget) {
-  views::test::WidgetActivationWaiter waiter(widget, true);
-  waiter.Wait();
-}
-
-}  // namespace
 
 class WindowLacrosBrowserTest : public InProcessBrowserTest {
  public:
@@ -42,7 +34,7 @@
   views::Widget* widget1 =
       BrowserView::GetBrowserViewForBrowser(browser1)->GetWidget();
   browser1->window()->Show();
-  WaitForActivation(widget1);
+  views::test::WaitForWidgetActive(widget1, true);
 
   // Showing the second window should implicitly activate.
   Browser* browser2 =
@@ -50,15 +42,15 @@
   views::Widget* widget2 =
       BrowserView::GetBrowserViewForBrowser(browser2)->GetWidget();
   browser2->window()->Show();
-  WaitForActivation(widget2);
+  views::test::WaitForWidgetActive(widget2, true);
 
   // Check that activating the first browser makes it active.
   widget1->Activate();
-  WaitForActivation(widget1);
+  views::test::WaitForWidgetActive(widget1, true);
 
   // Check that deactivating the first browser makes the second one active.
   widget1->Deactivate();
-  WaitForActivation(widget2);
+  views::test::WaitForWidgetActive(widget2, true);
 }
 
 }  // namespace crosapi
diff --git a/chrome/browser/notifications/notification_platform_bridge_win.cc b/chrome/browser/notifications/notification_platform_bridge_win.cc
index 7e03b25..f8f69501 100644
--- a/chrome/browser/notifications/notification_platform_bridge_win.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_win.cc
@@ -40,18 +40,14 @@
 #include "chrome/browser/notifications/win/notification_template_builder.h"
 #include "chrome/browser/notifications/win/notification_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/shell_integration_win.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/web_applications/web_app_helpers.h"
 #include "chrome/common/chrome_features.h"
-#include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notifications/notification_image_retainer.h"
 #include "chrome/install_static/install_util.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
-#include "components/webapps/common/web_app_id.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/message_center/public/cpp/notification.h"
@@ -346,26 +342,6 @@
     return toast_notification;
   }
 
-  // Returns either the Chrome app user model id or a web app's user model id,
-  // depending on whether Chrome or a web app created the notification.
-  std::wstring GetAppIdForNotification(
-      const message_center::Notification* notification,
-      const std::string& profile_id) {
-    webapps::AppId web_app_id =
-        notification->notifier_id().web_app_id.value_or("");
-    if (web_app_id.empty()) {
-      return GetBrowserAppId();
-    }
-
-    // Get the profile_path that corresponds to profile_id and return the
-    // app user model id constructed from it and the app name.
-    base::FilePath default_user_data_dir;
-    chrome::GetDefaultUserDataDirectory(&default_user_data_dir);
-    return shell_integration::win::GetAppUserModelIdForApp(
-        base::UTF8ToWide(web_app::GenerateApplicationNameFromAppId(web_app_id)),
-        default_user_data_dir.AppendASCII(profile_id));
-  }
-
   void Display(NotificationHandler::Type notification_type,
                const std::string& profile_id,
                bool incognito,
@@ -375,19 +351,13 @@
     // crbug.com/761039.
     DCHECK(notification_task_runner_->RunsTasksInCurrentSequence());
 
-    std::wstring app_user_model_id =
-        GetAppIdForNotification(notification.get(), profile_id);
-    if (notifier_app_user_model_id_ != app_user_model_id) {
-      notifier_.Reset();
-      notifier_app_user_model_id_.clear();
-    }
+    std::wstring app_user_model_id = GetAppId();
     if (!notifier_for_testing_ && !notifier_.Get() &&
         FAILED(InitializeToastNotifier(app_user_model_id))) {
       // A histogram should have already been logged for this failure.
       DLOG(ERROR) << "Unable to initialize toast notifier";
       return;
     }
-    notifier_app_user_model_id_ = app_user_model_id;
 
     winui::Notifications::IToastNotifier* notifier =
         notifier_for_testing_ ? notifier_for_testing_ : notifier_.Get();
@@ -457,29 +427,7 @@
       DLOG(ERROR) << "Failed to get IToastNotificationHistory";
       return;
     }
-
-    // Find the displayed notification with `notification_id` and extract its
-    // app user model id.
-    std::wstring app_user_model_id;
-    bool notification_found = false;
-    for (const auto& displayed_notification : displayed_notifications_) {
-      if (displayed_notification.first.notification_id == notification_id) {
-        app_user_model_id = displayed_notification.first.app_user_model_id;
-        notification_found = true;
-        break;
-      }
-    }
-    if (!notification_found) {
-      DLOG(ERROR) << "Failed to find notification " << notification_id;
-      LogCloseHistogram(CloseStatus::kNotificationNotFound);
-      return;
-    }
-    if (app_user_model_id.empty()) {
-      DLOG(ERROR) << "App User Model Id empty for notification "
-                  << notification_id;
-      LogCloseHistogram(CloseStatus::kEmptyAumi);
-      return;
-    }
+    std::wstring app_user_model_id = GetAppId();
     ScopedHString application_id = ScopedHString::Create(app_user_model_id);
     ScopedHString group = ScopedHString::Create(kGroup);
     ScopedHString tag = ScopedHString::Create(
@@ -559,50 +507,42 @@
       return {};
     }
 
-    // Build up the set of app user model id's in `displayed_notifications_`
-    // and loop through them to find which ones are still displayed.
-    std::set<std::wstring> app_user_model_ids;
-    for (const auto& notification : displayed_notifications_) {
-      // Make sure app_user_model_id gets set.
-      DCHECK(!notification.first.app_user_model_id.empty());
-      app_user_model_ids.insert(notification.first.app_user_model_id);
+    ScopedHString application_id = ScopedHString::Create(GetAppId());
+
+    mswr::ComPtr<winfoundtn::Collections::IVectorView<
+        winui::Notifications::ToastNotification*>>
+        list;
+    hr = history2->GetHistoryWithId(application_id.get(), &list);
+    if (FAILED(hr)) {
+      LogGetDisplayedStatus(GetDisplayedStatus::kGetHistoryWithIdFailed);
+      DLOG(ERROR) << "GetHistoryWithId failed " << std::hex << hr;
+      return {};
     }
+
+    uint32_t size;
+    hr = list->get_Size(&size);
+    if (FAILED(hr)) {
+      LogGetDisplayedStatus(GetDisplayedStatus::kGetSizeFailed);
+      DLOG(ERROR) << "History get_Size call failed " << std::hex << hr;
+      return {};
+    }
+
     GetDisplayedStatus status = GetDisplayedStatus::kSuccess;
+
     std::vector<mswr::ComPtr<winui::Notifications::IToastNotification>>
         notifications;
-    for (const auto& app_user_model_id : app_user_model_ids) {
-      ScopedHString application_id = ScopedHString::Create(app_user_model_id);
-
-      mswr::ComPtr<winfoundtn::Collections::IVectorView<
-          winui::Notifications::ToastNotification*>>
-          list;
-      hr = history2->GetHistoryWithId(application_id.get(), &list);
+    for (uint32_t index = 0; index < size; ++index) {
+      mswr::ComPtr<winui::Notifications::IToastNotification> tn;
+      hr = list->GetAt(index, &tn);
       if (FAILED(hr)) {
-        LogGetDisplayedStatus(GetDisplayedStatus::kGetHistoryWithIdFailed);
-        DLOG(ERROR) << "GetHistoryWithId failed " << std::hex << hr;
-        return {};
+        status = GetDisplayedStatus::kSuccessWithGetAtFailure;
+        DLOG(ERROR) << "Failed to get notification " << index << " of " << size
+                    << " " << std::hex << hr;
+        continue;
       }
-
-      uint32_t size;
-      hr = list->get_Size(&size);
-      if (FAILED(hr)) {
-        LogGetDisplayedStatus(GetDisplayedStatus::kGetSizeFailed);
-        DLOG(ERROR) << "History get_Size call failed " << std::hex << hr;
-        return {};
-      }
-
-      for (uint32_t index = 0; index < size; ++index) {
-        mswr::ComPtr<winui::Notifications::IToastNotification> tn;
-        hr = list->GetAt(index, &tn);
-        if (FAILED(hr)) {
-          status = GetDisplayedStatus::kSuccessWithGetAtFailure;
-          DLOG(ERROR) << "Failed to get notification " << index << " of "
-                      << size << " " << std::hex << hr;
-          continue;
-        }
-        notifications.push_back(std::move(tn));
-      }
+      notifications.push_back(std::move(tn));
     }
+
     LogGetDisplayedStatus(status);
     return notifications;
   }
@@ -724,8 +664,7 @@
       }
 
       displayed_notifications_[{launch_id.profile_id(),
-                                launch_id.notification_id(),
-                                launch_id.app_user_model_id()}] = launch_id;
+                                launch_id.notification_id()}] = launch_id;
     }
 
     if (!displayed_notifications_.empty())
@@ -736,7 +675,7 @@
     DCHECK(notification_task_runner_->RunsTasksInCurrentSequence());
 
     if (!notifier_for_testing_ && !notifier_.Get() &&
-        FAILED(InitializeToastNotifier(GetBrowserAppId()))) {
+        FAILED(InitializeToastNotifier(GetAppId()))) {
       // A histogram should have already been logged for this failure.
       DLOG(ERROR) << "Unable to initialize toast notifier";
       return;
@@ -848,7 +787,7 @@
     notification_task_runner_->DeleteSoon(FROM_HERE, image_retainer_.release());
   }
 
-  std::wstring GetBrowserAppId() const {
+  std::wstring GetAppId() const {
     return ShellUtil::GetBrowserModelId(InstallUtil::IsPerUserInstall());
   }
 
@@ -957,16 +896,7 @@
   // An object that keeps temp files alive long enough for Windows to pick up.
   std::unique_ptr<NotificationImageRetainer> image_retainer_;
 
-  // The app user model id for the IToastNotifier `notifier_`. This will be
-  // either Chrome's app user model id, or the app user model id for a web app,
-  // or empty, if `notifier_` is NULL.
-  std::wstring notifier_app_user_model_id_;
-
-  // The ToastNotifier to use to communicate with the Action Center. It is
-  // specific to an app user model id, which is stored in
-  // `notifier_app_user_model_id_`. When a notification is displayed for an app
-  // user model id different from `notifier_app_user_model_id_', a new notifier
-  // is created for the new app user model id.
+  // The ToastNotifier to use to communicate with the Action Center.
   mswr::ComPtr<winui::Notifications::IToastNotifier> notifier_;
 };
 
diff --git a/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc b/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc
index 3b85cf0c..24e5a35 100644
--- a/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc
@@ -22,7 +22,6 @@
 #include "base/test/bind.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/scoped_hstring.h"
-#include "base/win/vector.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification_display_service_tester.h"
@@ -35,17 +34,13 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/shell_integration_win.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/web_applications/web_app_helpers.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notifications/notification_operation.h"
-#include "chrome/install_static/install_util.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/webapps/common/web_app_id.h"
 #include "content/public/test/browser_test.h"
 
 namespace mswr = Microsoft::WRL;
@@ -60,9 +55,6 @@
 const char kLaunchIdSettings[] =
     "2|0|Default|aumi|0|https://example.com/|notification_id";
 
-constexpr wchar_t kAppUserModelId[] = L"aumi";
-constexpr wchar_t kAppUserModelId2[] = L"aumi2";
-
 Profile* CreateTestingProfile(const base::FilePath& path) {
   base::ScopedAllowBlockingForTesting allow_blocking;
   ProfileManager* profile_manager = g_browser_process->profile_manager();
@@ -91,23 +83,12 @@
   return ShellUtil::GetBrowserModelId(InstallUtil::IsPerUserInstall());
 }
 
-static std::wstring GetWebAppIdForNotification(const webapps::AppId& web_app_id,
-                                               const std::string& profile_id) {
-  base::FilePath default_user_data_dir;
-  chrome::GetDefaultUserDataDirectory(&default_user_data_dir);
-  return shell_integration::win::GetAppUserModelIdForApp(
-      base::UTF8ToWide(web_app::GenerateApplicationNameFromAppId(web_app_id)),
-      default_user_data_dir.AppendASCII(profile_id));
-}
-
 std::wstring GetToastString(const std::wstring& notification_id,
                             const std::wstring& profile_id,
-                            const std::wstring& app_user_model_id,
                             bool incognito) {
-  return base::StrCat({L"<toast launch=\"0|0|", profile_id, L"|",
-                       app_user_model_id, L"|",
-                       base::NumberToWString(incognito), L"|https://foo.com/|",
-                       notification_id, L"\"></toast>"});
+  return base::StrCat({L"<toast launch=\"0|0|", profile_id, L"|", GetAppId(),
+                       L"|", base::NumberToWString(incognito),
+                       L"|https://foo.com/|", notification_id, L"\"></toast>"});
 }
 
 }  // namespace
@@ -400,15 +381,15 @@
 
   Profile* profile1 = CreateTestingProfile("P1");
   notifications.push_back(Microsoft::WRL::Make<FakeIToastNotification>(
-      GetToastString(L"P1i", L"P1", kAppUserModelId, incognito), L"tag"));
+      GetToastString(L"P1i", L"P1", incognito), L"tag"));
   notifications.push_back(Microsoft::WRL::Make<FakeIToastNotification>(
-      GetToastString(L"P1reg", L"P1", kAppUserModelId, !incognito), L"tag"));
+      GetToastString(L"P1reg", L"P1", !incognito), L"tag"));
 
   Profile* profile2 = CreateTestingProfile("P2");
   notifications.push_back(Microsoft::WRL::Make<FakeIToastNotification>(
-      GetToastString(L"P2i", L"P2", kAppUserModelId, incognito), L"tag"));
+      GetToastString(L"P2i", L"P2", incognito), L"tag"));
   notifications.push_back(Microsoft::WRL::Make<FakeIToastNotification>(
-      GetToastString(L"P2reg", L"P2", kAppUserModelId, !incognito), L"tag"));
+      GetToastString(L"P2reg", L"P2", !incognito), L"tag"));
 
   // Query for profile P1 in incognito (should return 1 item).
   {
@@ -481,22 +462,16 @@
   bridge->SetDisplayedNotificationsForTesting(&notifications);
 
   notifications.push_back(Microsoft::WRL::Make<FakeIToastNotification>(
-      GetToastString(L"P1i", L"Default", kAppUserModelId, true), L"tag"));
-  expected_displayed_notifications[{
-      /*profile_id=*/"Default",
-      /*notification_id=*/"P1i",
-      /*app_user_model_id=*/kAppUserModelId,
-  }] = GetNotificationLaunchId(notifications.back().Get());
+      GetToastString(L"P1i", L"Default", true), L"tag"));
+  expected_displayed_notifications[{/*profile_id=*/"Default",
+                                    /*notification_id=*/"P1i"}] =
+      GetNotificationLaunchId(notifications.back().Get());
 
-  expected_displayed_notifications[{
-      /*profile_id=*/"Default",
-      /*notification_id=*/"P2i",
-      /*app_user_model_id=*/kAppUserModelId2,
-  }] =
+  expected_displayed_notifications[{/*profile_id=*/"Default",
+                                    /*notification_id=*/"P2i"}] =
       GetNotificationLaunchId(
           Microsoft::WRL::Make<FakeIToastNotification>(
-              GetToastString(L"P2i", L"Default", kAppUserModelId2, false),
-              L"tag")
+              GetToastString(L"P2i", L"Default", false), L"tag")
               .Get());
 
   base::RunLoop run_loop;
@@ -515,11 +490,9 @@
   // Only one notification is displayed (P1i). As result, the synchronization
   // will close the notification P2i.
   ASSERT_EQ(1u, actual_expected_displayed_notification.size());
-  EXPECT_TRUE(actual_expected_displayed_notification.count({
-      /*profile_id=*/"Default",
-      /*notification_id=*/"P1i",
-      /*app_user_model_id=*/kAppUserModelId,
-  }));
+  EXPECT_TRUE(actual_expected_displayed_notification.count(
+      {/*profile_id=*/"Default",
+       /*notification_id=*/"P1i"}));
 
   // Validate the close event values.
   EXPECT_EQ(NotificationOperation::kClose, last_operation_);
@@ -613,47 +586,6 @@
   bridge->SetNotifierForTesting(nullptr);
 }
 
-// Test calling Display for a web app notification with a fake implementation of
-// the Action Center and validate it gets the values expected.
-IN_PROC_BROWSER_TEST_F(NotificationPlatformBridgeWinUITest,
-                       DisplayWebAppNotificationWithFakeAC) {
-  NotificationPlatformBridgeWin* bridge = GetBridge();
-  ASSERT_TRUE(bridge);
-
-  FakeIToastNotifier notifier;
-  bridge->SetNotifierForTesting(&notifier);
-
-  auto notification = std::make_unique<message_center::Notification>(
-      message_center::NOTIFICATION_TYPE_SIMPLE, "notification_id", u"Text1",
-      u"Text2", ui::ImageModel(), std::u16string(),
-      GURL("https://example.com/"),
-      message_center::NotifierId(GURL("https://example.com/"), u"webpagetitle",
-                                 base::WideToUTF8(GetAppId().c_str())),
-      message_center::RichNotificationData(), nullptr);
-
-  std::wstring app_id = GetWebAppIdForNotification(
-      notification->notifier_id().web_app_id.value_or(""), "P1");
-  std::string launch_id_value =
-      base::StrCat({"0|0|P1|", base::WideToUTF8(app_id).c_str(),
-                    "|0|https://example.com/|notification_id"});
-  NotificationLaunchId launch_id(launch_id_value);
-  ASSERT_TRUE(launch_id.is_valid());
-
-  std::unique_ptr<NotificationCommon::Metadata> metadata;
-  Profile* profile = CreateTestingProfile("P1");
-
-  {
-    base::RunLoop run_loop;
-    notifier.SetNotificationShownCallback(base::BindRepeating(
-        &NotificationPlatformBridgeWinUITest::ValidateLaunchId,
-        base::Unretained(this), launch_id_value, run_loop.QuitClosure()));
-    bridge->Display(NotificationHandler::Type::WEB_PERSISTENT, profile,
-                    *notification, std::move(metadata));
-    run_loop.Run();
-  }
-  bridge->SetNotifierForTesting(nullptr);
-}
-
 IN_PROC_BROWSER_TEST_F(NotificationPlatformBridgeWinUITest, CmdLineClick) {
   ASSERT_NO_FATAL_FAILURE(ProcessLaunchIdViaCmdLine(kLaunchId, /*reply=*/""));
 
diff --git a/chrome/browser/notifications/win/notification_metrics.h b/chrome/browser/notifications/win/notification_metrics.h
index 7332d8b..8dfbaea 100644
--- a/chrome/browser/notifications/win/notification_metrics.h
+++ b/chrome/browser/notifications/win/notification_metrics.h
@@ -41,9 +41,7 @@
   kSuccess = 0,
   kGetToastHistoryFailed = 1,
   kRemovingToastFailed = 2,
-  kEmptyAumi = 3,
-  kNotificationNotFound = 4,
-  kMaxValue = kNotificationNotFound,
+  kMaxValue = kRemovingToastFailed,
 };
 
 // These values are persisted to logs. Entries should not be renumbered and
diff --git a/chrome/browser/predictors/loading_predictor.cc b/chrome/browser/predictors/loading_predictor.cc
index 0fbea4b..e2d3cd4e 100644
--- a/chrome/browser/predictors/loading_predictor.cc
+++ b/chrome/browser/predictors/loading_predictor.cc
@@ -425,13 +425,13 @@
     prefetch_manager_->Stop(url);
 }
 
-void LoadingPredictor::HandleHintByOrigin(const GURL& url,
+bool LoadingPredictor::HandleHintByOrigin(const GURL& url,
                                           bool preconnectable,
                                           bool only_allow_https,
                                           PreconnectData& preconnect_data) {
   if (!url.is_valid() || !url.has_host() || !IsPreconnectAllowed(profile_) ||
       (only_allow_https && url.scheme() != url::kHttpsScheme)) {
-    return;
+    return false;
   }
 
   const url::Origin origin = url::Origin::Create(url);
@@ -440,7 +440,7 @@
   // origin from the same URL will result in a different unique opaque origin,
   // so any preconnect attempt would never be used anyway.
   if (origin.opaque()) {
-    return;
+    return false;
   }
 
   // Tracking whether this is a new origin request. If so, then
@@ -459,14 +459,17 @@
       preconnect_manager()->StartPreconnectUrl(url, true,
                                                network_anonymization_key);
     }
-    return;
+    return true;
   }
 
   if (is_new_origin || now - preconnect_data.last_preresolve_time_ >=
                            kMinDelayBetweenPreresolveRequests) {
     preconnect_data.last_preresolve_time_ = now;
     preconnect_manager()->StartPreresolveHost(url, network_anonymization_key);
+    return true;
   }
+
+  return false;
 }
 
 void LoadingPredictor::PreconnectInitiated(const GURL& url,
diff --git a/chrome/browser/predictors/loading_predictor.h b/chrome/browser/predictors/loading_predictor.h
index e19ac5d..83971d09 100644
--- a/chrome/browser/predictors/loading_predictor.h
+++ b/chrome/browser/predictors/loading_predictor.h
@@ -156,7 +156,7 @@
 
   // May start a preconnect or a preresolve for `url`. `preconnectable`
   // indicates if preconnect is possible, or only preresolve will be performed.
-  void HandleHintByOrigin(const GURL& url,
+  bool HandleHintByOrigin(const GURL& url,
                           bool preconnectable,
                           bool only_allow_https,
                           PreconnectData& preconnect_data);
@@ -218,6 +218,12 @@
   FRIEND_TEST_ALL_PREFIXES(LoadingPredictorTest,
                            TestDontTrackNonPrefetchableUrls);
   FRIEND_TEST_ALL_PREFIXES(LoadingPredictorTest, TestDontPredictOmniboxHints);
+  FRIEND_TEST_ALL_PREFIXES(LoadingPredictorPreconnectTest,
+                           TestHandleHintWithOpaqueOrigins);
+  FRIEND_TEST_ALL_PREFIXES(LoadingPredictorPreconnectTest,
+                           TestHandleHintWhenOnlyHttpsAllowed);
+  FRIEND_TEST_ALL_PREFIXES(LoadingPredictorPreconnectTest,
+                           TestHandleHintPreresolveWhenOnlyHttpsAllowed);
 
   base::WeakPtrFactory<LoadingPredictor> weak_factory_{this};
 };
diff --git a/chrome/browser/predictors/loading_predictor_unittest.cc b/chrome/browser/predictors/loading_predictor_unittest.cc
index 4ccd2ac..563f2335 100644
--- a/chrome/browser/predictors/loading_predictor_unittest.cc
+++ b/chrome/browser/predictors/loading_predictor_unittest.cc
@@ -577,4 +577,55 @@
       main_frame_url, HintOrigin::OPTIMIZATION_GUIDE, false, prediction));
 }
 
+// Checks that the opaque origins will not trigger preconnect as it is treated
+// as cross-origin and cannot be reused.
+TEST_F(LoadingPredictorPreconnectTest, TestHandleHintWithOpaqueOrigins) {
+  GURL main_frame_url("about:blank");
+  LoadingPredictor::PreconnectData preconnect_data;
+  EXPECT_FALSE(predictor_->HandleHintByOrigin(main_frame_url,
+                                              /*preconnectable=*/true,
+                                              /*only_allow_https=*/false,
+                                              preconnect_data));
+}
+
+// Checks that the behavior of HandleHintByOrigin is expected when
+// only_allow_https = true.
+TEST_F(LoadingPredictorPreconnectTest, TestHandleHintWhenOnlyHttpsAllowed) {
+  GURL main_frame_url_non_https("http://www.google.com/cats");
+  GURL main_frame_url_https("https://www.google.com/cats");
+  LoadingPredictor::PreconnectData preconnect_data;
+  EXPECT_FALSE(predictor_->HandleHintByOrigin(main_frame_url_non_https,
+                                              /*preconnectable=*/true,
+                                              /*only_allow_https=*/true,
+                                              preconnect_data));
+  EXPECT_CALL(
+      *mock_preconnect_manager_,
+      StartPreconnectUrl(main_frame_url_https, true,
+                         CreateNetworkanonymization_key(main_frame_url_https)));
+  EXPECT_TRUE(predictor_->HandleHintByOrigin(main_frame_url_https,
+                                             /*preconnectable=*/true,
+                                             /*only_allow_https=*/true,
+                                             preconnect_data));
+}
+
+// Checks that HandleHintByOrigin can preresolve correctly.
+TEST_F(LoadingPredictorPreconnectTest,
+       TestHandleHintPreresolveWhenOnlyHttpsAllowed) {
+  GURL main_frame_url_non_https("http://www.google.com/cats");
+  GURL main_frame_url_https("https://www.google.com/cats");
+  LoadingPredictor::PreconnectData preconnect_data;
+  EXPECT_FALSE(predictor_->HandleHintByOrigin(main_frame_url_non_https,
+                                              /*preconnectable=*/false,
+                                              /*only_allow_https=*/true,
+                                              preconnect_data));
+  EXPECT_CALL(*mock_preconnect_manager_,
+              StartPreresolveHost(
+                  main_frame_url_https,
+                  CreateNetworkanonymization_key(main_frame_url_https)));
+  EXPECT_TRUE(predictor_->HandleHintByOrigin(main_frame_url_https,
+                                             /*preconnectable=*/false,
+                                             /*only_allow_https=*/true,
+                                             preconnect_data));
+}
+
 }  // namespace predictors
diff --git a/chrome/browser/predictors/prefetch_manager_unittest.cc b/chrome/browser/predictors/prefetch_manager_unittest.cc
index d612055f..282bcb7f 100644
--- a/chrome/browser/predictors/prefetch_manager_unittest.cc
+++ b/chrome/browser/predictors/prefetch_manager_unittest.cc
@@ -470,9 +470,9 @@
               UnorderedElementsAreArray({test_server.GetURL(path2)}));
 }
 
-// Flaky on Mac/Linux/CrOS/Android only. http://crbug.com/1239235
+// Flaky on Mac/Linux/CrOS/Android/Windows. http://crbug.com/1239235
 #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-    BUILDFLAG(IS_ANDROID)
+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN)
 #define MAYBE_StopAndStart DISABLED_StopAndStart
 #else
 #define MAYBE_StopAndStart StopAndStart
diff --git a/chrome/browser/resources/chromeos/app_install/app_install_dialog.html b/chrome/browser/resources/chromeos/app_install/app_install_dialog.html
index 8459562..b26fcb7 100644
--- a/chrome/browser/resources/chromeos/app_install/app_install_dialog.html
+++ b/chrome/browser/resources/chromeos/app_install/app_install_dialog.html
@@ -1,5 +1,5 @@
 <style>
-  #icon {
+  #title-icon-install, #title-icon-installed {
     fill: var(--cros-sys-primary);
   }
 
@@ -48,6 +48,25 @@
     color: var(--cros-sys-primary);
   }
 
+  hr {
+    border-width: 1px 0px 0px 0px;
+    border-style: solid;
+    border-color: var(--cros-sys-app_base_shaded);
+    margin: 0;
+  }
+
+  #description-and-screenshots {
+    padding: 0px 20px 0px 20px;
+  }
+
+  #description {
+    font: var(--cros-annotation-1-font);
+    color: var(--cros-sys-on_surface_variant);
+    overflow-wrap: break-word;
+    padding: 12px 0px;
+    margin: 0px;
+  }
+
   div[slot=button-container] {
     display: flex;
     justify-content: flex-end;
@@ -60,7 +79,8 @@
 </style>
 
 <cr-dialog id="dialog">
-  <svg id="icon" xmlns="http://www.w3.org/2000/svg" height="32" viewBox="0 -960 960 960" width="32"><path d="M480-320 280-520l56-58 104 104v-326h80v326l104-104 56 58-200 200ZM240-160q-33 0-56.5-23.5T160-240v-120h80v120h480v-120h80v120q0 33-23.5 56.5T720-160H240Z"></svg>
+  <svg id="title-icon-install" xmlns="http://www.w3.org/2000/svg" height="32" viewBox="0 -960 960 960" width="32"><path d="M480-320 280-520l56-58 104 104v-326h80v326l104-104 56 58-200 200ZM240-160q-33 0-56.5-23.5T160-240v-120h80v120h480v-120h80v120q0 33-23.5 56.5T720-160H240Z"></svg>
+  <svg display="none" id="title-icon-installed" xmlns="http://www.w3.org/2000/svg" height="32" viewBox="0 -960 960 960" width="32"><path d="m437-398 227-226-57-57-170 170-85-85-56 56 141 142ZM40-120v-80h880v80H40Zm120-120q-33 0-56.5-23.5T80-320v-440q0-33 23.5-56.5T160-840h640q33 0 56.5 23.5T880-760v440q0 33-23.5 56.5T800-240H160Zm0-80h640v-440H160v440Zm0 0v-440 440Z"></svg>
   <h1 id="title">Install app to your Chromebook</h1>
   <div id="content-card">
     <!-- TODO(crbug.com/1488697): Localisation of strings. -->
@@ -71,8 +91,11 @@
         <p id="url">Developer information: <a id="url-link"></a></p>
       </div>
     </div>
-    <!-- TODO(crbug.com/1488697): Add screenshots. -->
-    <p id="description"></p>
+    <hr id="divider" hidden>
+    <div id="description-and-screenshots" hidden>
+      <p id="description"></p>
+      <!-- TODO(crbug.com/40283709): Add screenshots. -->
+    </div>
   </div>
   <div slot="button-container">
     <cros-button
diff --git a/chrome/browser/resources/chromeos/app_install/app_install_dialog.ts b/chrome/browser/resources/chromeos/app_install/app_install_dialog.ts
index 9bd3612..aa9ddff 100644
--- a/chrome/browser/resources/chromeos/app_install/app_install_dialog.ts
+++ b/chrome/browser/resources/chromeos/app_install/app_install_dialog.ts
@@ -56,22 +56,24 @@
       const dialogArgs = await this.proxy.handler.getDialogArgs();
       assert(dialogArgs.args);
 
-      const nameElement = this.$<HTMLSpanElement>('#name');
+      const nameElement = this.$<HTMLParagraphElement>('#name');
       assert(nameElement);
       nameElement.textContent = dialogArgs.args.name;
 
-      const urlElement = this.$<HTMLSpanElement>('#url-link');
+      const urlElement = this.$<HTMLAnchorElement>('#url-link');
       assert(urlElement);
       urlElement.textContent = dialogArgs.args.url.url;
 
-      const descriptionElement = this.$<HTMLSpanElement>('#description');
-      assert(descriptionElement);
-      descriptionElement.textContent = dialogArgs.args.description;
-
       const iconElement = this.$<HTMLImageElement>('#app-icon');
       assert(iconElement);
       iconElement.setAttribute('auto-src', dialogArgs.args.iconUrl.url);
 
+      if (dialogArgs.args.description) {
+        this.$<HTMLDivElement>('#description').textContent =
+            dialogArgs.args.description;
+        this.$<HTMLDivElement>('#description-and-screenshots').hidden = false;
+        this.$<HTMLHRElement>('#divider').hidden = false;
+      }
     } catch (e) {
       // TODO(crbug.com/1488697) Define expected behavior.
       console.error(`Unable to get dialog arguments . Error: ${e}.`);
@@ -123,25 +125,36 @@
     assert(installButton);
     switch (state) {
       case DialogState.INSTALL:
+        this.$<HTMLElement>('#title-icon-install').style.display = 'block';
+        this.$<HTMLElement>('#title-icon-installed').style.display = 'none';
+        this.$<HTMLElement>('#title').textContent =
+            'Install app to your Chromebook';
+
         installButton.disabled = false;
         installButton.label = loadTimeData.getString('install');
         installButton.addEventListener(
             'click', this.onInstallButtonClick.bind(this), {once: true});
 
-        this.$<HTMLSpanElement>('#installing-icon').setAttribute('slot', '');
-        this.$<HTMLSpanElement>('#install-icon')
+        this.$<HTMLElement>('#installing-icon').setAttribute('slot', '');
+        this.$<HTMLElement>('#install-icon')
             .setAttribute('slot', 'leading-icon');
         break;
       case DialogState.INSTALLING:
+        this.$<HTMLElement>('#title').textContent = 'Installing app...';
+
         installButton.disabled = true;
         installButton.label = loadTimeData.getString('installing');
         installButton.classList.replace('install', 'installing');
 
-        this.$<HTMLSpanElement>('#install-icon').setAttribute('slot', '');
-        this.$<HTMLSpanElement>('#installing-icon')
+        this.$<HTMLElement>('#install-icon').setAttribute('slot', '');
+        this.$<HTMLElement>('#installing-icon')
             .setAttribute('slot', 'leading-icon');
         break;
       case DialogState.INSTALLED:
+        this.$<HTMLElement>('#title-icon-install').style.display = 'none';
+        this.$<HTMLElement>('#title-icon-installed').style.display = 'block';
+        this.$<HTMLElement>('#title').textContent = 'App installed';
+
         installButton.disabled = false;
         // TODO(crbug.com/1488697): Localize string.
         installButton.label = 'Open app';
@@ -149,8 +162,8 @@
         installButton.addEventListener(
             'click', this.onOpenAppButtonClick.bind(this));
 
-        this.$<HTMLSpanElement>('#installing-icon').setAttribute('slot', '');
-        this.$<HTMLSpanElement>('#installed-icon')
+        this.$<HTMLElement>('#installing-icon').setAttribute('slot', '');
+        this.$<HTMLElement>('#installed-icon')
             .setAttribute('slot', 'leading-icon');
         break;
       default:
diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
index 2c394cc..903be62 100644
--- a/chrome/browser/resources/pdf/pdf_viewer.ts
+++ b/chrome/browser/resources/pdf/pdf_viewer.ts
@@ -638,6 +638,11 @@
     return this.bookmarks_;
   }
 
+  /** @return The title. Used for testing. */
+  get pdfTitle(): string {
+    return this.title_;
+  }
+
   override setLoadState(loadState: LoadState) {
     super.setLoadState(loadState);
     if (loadState === LoadState.FAILED) {
diff --git a/chrome/browser/resources/pdf/pdf_viewer_base.ts b/chrome/browser/resources/pdf/pdf_viewer_base.ts
index 88aba4f..7aa7070 100644
--- a/chrome/browser/resources/pdf/pdf_viewer_base.ts
+++ b/chrome/browser/resources/pdf/pdf_viewer_base.ts
@@ -378,6 +378,13 @@
   }
 
   /**
+   * @return True if OOPIF PDF is enabled, false otherwise.
+   */
+  get isPdfOopifEnabled(): boolean {
+    return this.pdfOopifEnabled;
+  }
+
+  /**
    * @return Resolved when the load state reaches LOADED, rejects on FAILED.
    *     Returns null if no promise has been created, which is the case for
    *     initial load of the PDF.
diff --git a/chrome/browser/resources/side_panel/read_anything/app.ts b/chrome/browser/resources/side_panel/read_anything/app.ts
index 13ffd48a..f02d618 100644
--- a/chrome/browser/resources/side_panel/read_anything/app.ts
+++ b/chrome/browser/resources/side_panel/read_anything/app.ts
@@ -527,11 +527,15 @@
     this.imageNodeIdsToFetch_.clear();
   }
 
-  updateSelection() {
+  getSelection(): any {
     const shadowRoot = this.shadowRoot;
     assert(shadowRoot);
     const selection = shadowRoot.getSelection();
-    assert(selection);
+    return selection;
+  }
+
+  updateSelection() {
+    const selection = this.getSelection()!;
     selection.removeAllRanges();
 
     const range = new Range();
diff --git a/chrome/browser/resources/tab_search/BUILD.gn b/chrome/browser/resources/tab_search/BUILD.gn
index 4f2f2ab..f348cacc 100644
--- a/chrome/browser/resources/tab_search/BUILD.gn
+++ b/chrome/browser/resources/tab_search/BUILD.gn
@@ -33,6 +33,7 @@
     "tab_organization_not_started_image.ts",
     "tab_organization_page.ts",
     "tab_organization_results.ts",
+    "tab_organization_results_actions.ts",
     "tab_search_group_item.ts",
     "tab_search_item.ts",
     "tab_search_page.ts",
diff --git a/chrome/browser/resources/tab_search/tab_organization_group.html b/chrome/browser/resources/tab_search/tab_organization_group.html
index 541a670..bf9b926 100644
--- a/chrome/browser/resources/tab_search/tab_organization_group.html
+++ b/chrome/browser/resources/tab_search/tab_organization_group.html
@@ -1,9 +1,4 @@
 <style include="mwb-shared-style tab-organization-shared-style cr-icons">
-  cr-button {
-    margin-top: 16px;
-    width: fit-content;
-  }
-
   cr-icon-button {
     --cr-icon-button-fill-color: var(--mwb-icon-button-fill-color);
     --cr-icon-button-icon-size: 16px;
@@ -27,15 +22,13 @@
     --cr-input-padding-top: 8px;
   }
 
-  tab-search-item {
-    --tab-search-favicon-background: var(--color-tab-search-background);
+  tab-organization-results-actions {
+    display: block;
+    margin: 16px 16px 0 16px;
   }
 
-  .button-row {
-    display: flex;
-    gap: 16px;
-    justify-content: flex-end;
-    margin: 0 16px;
+  tab-search-item {
+    --tab-search-favicon-background: var(--color-tab-search-background);
   }
 
   .divider {
@@ -144,14 +137,11 @@
       </tab-search-item>
     </template>
   </iron-selector>
-  <div class="button-row">
-    <template is="dom-if" if="[[showRefresh_]]">
-      <cr-button class="tonal-button" on-click="onRejectGroupClick_">
-        [[getRefreshButtonText_(isLastOrganization)]]
-      </cr-button>
-    </template>
-    <cr-button class="action-button" on-click="onCreateGroupClick_">
-      $i18n{createGroup}
-    </cr-button>
-  </div>
+  <template is="dom-if" if="[[!multiTabOrganization]]">
+    <tab-organization-results-actions
+        is-last-organization="[[isLastOrganization]]"
+        on-create-group-click="onCreateGroupClick_"
+        on-reject-click="onRejectGroupClick_">
+    </tab-organization-results-actions>
+  </template>
 </div>
diff --git a/chrome/browser/resources/tab_search/tab_organization_group.ts b/chrome/browser/resources/tab_search/tab_organization_group.ts
index e6aea3d..76ddd68 100644
--- a/chrome/browser/resources/tab_search/tab_organization_group.ts
+++ b/chrome/browser/resources/tab_search/tab_organization_group.ts
@@ -9,6 +9,7 @@
 import 'chrome://resources/cr_elements/mwb_shared_style.css.js';
 import 'chrome://resources/polymer/v3_0/iron-selector/iron-selector.js';
 import './strings.m.js';
+import './tab_organization_results_actions.js';
 import './tab_organization_shared_style.css.js';
 import './tab_search_item.js';
 
@@ -54,12 +55,6 @@
 
       showInput_: Boolean,
 
-      showRefresh_: {
-        type: Boolean,
-        value: () =>
-            loadTimeData.getBoolean('tabOrganizationRefreshButtonEnabled'),
-      },
-
       tabDatas_: {
         type: Array,
         value: () => [],
@@ -76,7 +71,6 @@
 
   private lastFocusedIndex_: number;
   private showInput_: boolean;
-  private showRefresh_: boolean;
   private tabDatas_: TabData[];
 
   static get template() {
@@ -116,13 +110,6 @@
     }
   }
 
-  private getRefreshButtonText_(): string {
-    if (this.isLastOrganization) {
-      return loadTimeData.getString('rejectFinalSuggestion');
-    }
-    return loadTimeData.getString('rejectSuggestion');
-  }
-
   private getTabIndex_(index: number): number {
     return index === this.lastFocusedIndex_ ? 0 : -1;
   }
@@ -226,7 +213,9 @@
     this.showInput_ = true;
   }
 
-  private onRejectGroupClick_() {
+  private onRejectGroupClick_(event: CustomEvent) {
+    event.stopPropagation();
+    event.preventDefault();
     this.dispatchEvent(new CustomEvent('reject-click', {
       bubbles: true,
       composed: true,
@@ -234,7 +223,9 @@
     }));
   }
 
-  private onCreateGroupClick_() {
+  private onCreateGroupClick_(event: CustomEvent) {
+    event.stopPropagation();
+    event.preventDefault();
     this.dispatchEvent(new CustomEvent('create-group-click', {
       bubbles: true,
       composed: true,
diff --git a/chrome/browser/resources/tab_search/tab_organization_results.html b/chrome/browser/resources/tab_search/tab_organization_results.html
index 89ef3dd..2ad83b0 100644
--- a/chrome/browser/resources/tab_search/tab_organization_results.html
+++ b/chrome/browser/resources/tab_search/tab_organization_results.html
@@ -37,7 +37,8 @@
     [[getTitle_()]]
   </div>
   <div id="scrollable">
-    <template is="dom-repeat" items="[[getOrganizations_(session)]]">
+    <template is="dom-repeat"
+        items="[[getOrganizations_(session, multiTabOrganization)]]">
       <tab-organization-group
         name="[[getName_(item)]]"
         tabs="[[item.tabs]]"
@@ -47,6 +48,13 @@
       </tab-organization-group>
     </template>
   </div>
+  <template is="dom-if" if="[[multiTabOrganization]]">
+    <tab-organization-results-actions
+        multiple-organizations="[[hasMultipleOrganizations_(session)]]"
+        on-create-group-click="onCreateAllGroupsClick_"
+        on-reject-click="onRejectAllGroupsClick_">
+    </tab-organization-results-actions>
+  </template>
   <div class="feedback" role="toolbar" on-keydown="onFeedbackKeyDown_">
     <div class="tab-organization-body">
       $i18n{learnMoreDisclaimer}
diff --git a/chrome/browser/resources/tab_search/tab_organization_results.ts b/chrome/browser/resources/tab_search/tab_organization_results.ts
index f4efb48..54863c3 100644
--- a/chrome/browser/resources/tab_search/tab_organization_results.ts
+++ b/chrome/browser/resources/tab_search/tab_organization_results.ts
@@ -7,6 +7,7 @@
 import 'chrome://resources/cr_elements/mwb_shared_style.css.js';
 import './strings.m.js';
 import './tab_organization_group.js';
+import './tab_organization_results_actions.js';
 import './tab_organization_shared_style.css.js';
 
 import {CrFeedbackOption} from 'chrome://resources/cr_elements/cr_feedback_buttons/cr_feedback_buttons.js';
@@ -85,7 +86,10 @@
     return loadTimeData.getString('successTitle');
   }
 
-  private getOrganizations_() {
+  private getOrganizations_(): TabOrganization[] {
+    if (!this.session) {
+      return [];
+    }
     if (this.multiTabOrganization) {
       return this.session.organizations;
     } else {
@@ -93,6 +97,10 @@
     }
   }
 
+  private hasMultipleOrganizations_() {
+    return this.getOrganizations_().length > 1;
+  }
+
   private getName_(organization: TabOrganization) {
     return mojoString16ToString(organization.name);
   }
@@ -112,6 +120,18 @@
     this.feedbackSelectedOption_ = CrFeedbackOption.UNSPECIFIED;
   }
 
+  private onCreateAllGroupsClick_(event: CustomEvent) {
+    event.stopPropagation();
+    event.preventDefault();
+    // TODO(b/324942857): Implement
+  }
+
+  private onRejectAllGroupsClick_(event: CustomEvent) {
+    event.stopPropagation();
+    event.preventDefault();
+    // TODO(b/324944497): Implement
+  }
+
   private onLearnMoreClick_() {
     this.dispatchEvent(new CustomEvent('learn-more-click', {
       bubbles: true,
diff --git a/chrome/browser/resources/tab_search/tab_organization_results_actions.html b/chrome/browser/resources/tab_search/tab_organization_results_actions.html
new file mode 100644
index 0000000..b098ba19
--- /dev/null
+++ b/chrome/browser/resources/tab_search/tab_organization_results_actions.html
@@ -0,0 +1,22 @@
+<style>
+  cr-button {
+    width: fit-content;
+  }
+
+  .button-row {
+    display: flex;
+    gap: 16px;
+    justify-content: flex-end;
+  }
+</style>
+
+<div class="button-row">
+  <template is="dom-if" if="[[showRefresh_]]">
+    <cr-button class="tonal-button" on-click="onRejectGroupClick_">
+      [[getRefreshButtonText_(isLastOrganization, multipleOrganizations)]]
+    </cr-button>
+  </template>
+  <cr-button class="action-button" on-click="onCreateGroupClick_">
+    [[getCreateButtonText_(multipleOrganizations)]]
+  </cr-button>
+</div>
diff --git a/chrome/browser/resources/tab_search/tab_organization_results_actions.ts b/chrome/browser/resources/tab_search/tab_organization_results_actions.ts
new file mode 100644
index 0000000..fc006be
--- /dev/null
+++ b/chrome/browser/resources/tab_search/tab_organization_results_actions.ts
@@ -0,0 +1,74 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'chrome://resources/cr_elements/cr_button/cr_button.js';
+import './strings.m.js';
+
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
+import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+
+import {getTemplate} from './tab_organization_results_actions.html.js';
+
+export class TabOrganizationResultsActionsElement extends PolymerElement {
+  static get is() {
+    return 'tab-organization-results-actions';
+  }
+
+  static get properties() {
+    return {
+      isLastOrganization: Boolean,
+      multipleOrganizations: Boolean,
+
+      showRefresh_: {
+        type: Boolean,
+        value: () =>
+            loadTimeData.getBoolean('tabOrganizationRefreshButtonEnabled'),
+      },
+    };
+  }
+
+  isLastOrganization: boolean;
+  multipleOrganizations: boolean;
+
+  private showRefresh_: boolean;
+
+  static get template() {
+    return getTemplate();
+  }
+
+  private getRefreshButtonText_(): string {
+    return (this.isLastOrganization || this.multipleOrganizations) ?
+        loadTimeData.getString('rejectFinalSuggestion') :
+        loadTimeData.getString('rejectSuggestion');
+  }
+
+  private getCreateButtonText_(): string {
+    return this.multipleOrganizations ? loadTimeData.getString('createGroups') :
+                                        loadTimeData.getString('createGroup');
+  }
+
+  private onRejectGroupClick_() {
+    this.dispatchEvent(new CustomEvent('reject-click', {
+      bubbles: true,
+      composed: true,
+    }));
+  }
+
+  private onCreateGroupClick_() {
+    this.dispatchEvent(new CustomEvent('create-group-click', {
+      bubbles: true,
+      composed: true,
+    }));
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'tab-organization-results-actions': TabOrganizationResultsActionsElement;
+  }
+}
+
+customElements.define(
+    TabOrganizationResultsActionsElement.is,
+    TabOrganizationResultsActionsElement);
diff --git a/chrome/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.java b/chrome/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.java
index 28cb27d6f5..f8ac830 100644
--- a/chrome/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.java
+++ b/chrome/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.java
@@ -43,6 +43,8 @@
  * https://crbug.com/1523745.
  */
 public class TabGroupModelFilter extends TabModelFilter {
+    private static final int INVALID_COLOR_ID = -1;
+
     private ObserverList<TabGroupModelFilterObserver> mGroupFilterObserver = new ObserverList<>();
     private Map<Integer, Integer> mRootIdToGroupIndexMap = new HashMap<>();
     private Map<Integer, TabGroup> mRootIdToGroupMap = new HashMap<>();
@@ -137,7 +139,8 @@
                         Collections.singletonList(index),
                         Collections.singletonList(tab.getRootId()),
                         Collections.singletonList(null),
-                        null);
+                        null,
+                        INVALID_COLOR_ID);
             }
         }
     }
@@ -186,6 +189,7 @@
             List<Integer> originalRootIds = new ArrayList<>();
             List<Token> originalTabGroupIds = new ArrayList<>();
             String destinationGroupTitle = TabGroupTitleUtils.getTabGroupTitle(destinationRootId);
+            int destinationGroupColorId = TabGroupColorUtils.getTabGroupColor(destinationRootId);
             boolean didCreateNewGroup =
                     !isTabInTabGroup(sourceTab) && !isTabInTabGroup(destinationTab);
 
@@ -240,7 +244,8 @@
                             originalIndexes,
                             originalRootIds,
                             originalTabGroupIds,
-                            destinationGroupTitle);
+                            destinationGroupTitle,
+                            destinationGroupColorId);
                 }
             }
         }
@@ -293,6 +298,7 @@
         }
         int destinationIndexInTabModel = getTabModelDestinationIndex(destinationTab);
         String destinationGroupTitle = TabGroupTitleUtils.getTabGroupTitle(destinationRootId);
+        int destinationGroupColorId = TabGroupColorUtils.getTabGroupColor(destinationRootId);
 
         for (int i = 0; i < tabs.size(); i++) {
             Tab tab = tabs.get(i);
@@ -356,7 +362,8 @@
                         originalIndexes,
                         originalRootIds,
                         originalTabGroupIds,
-                        destinationGroupTitle);
+                        destinationGroupTitle,
+                        destinationGroupColorId);
             }
         }
     }
diff --git a/chrome/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterObserver.java b/chrome/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterObserver.java
index b6ac970..6fec905 100644
--- a/chrome/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterObserver.java
+++ b/chrome/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterObserver.java
@@ -73,13 +73,15 @@
      * @param tabOriginalRootId The original root id for each modified tab.
      * @param tabOriginalTabGroupId The original tab group id for each modified tab.
      * @param destinationGroupTitle The original destination group title.
+     * @param destinationGroupColorId The original destination group color id.
      */
     default void didCreateGroup(
             List<Tab> tabs,
             List<Integer> tabOriginalIndex,
             List<Integer> tabOriginalRootId,
             List<Token> tabOriginalTabGroupId,
-            String destinationGroupTitle) {}
+            String destinationGroupTitle,
+            int destinationGroupColorId) {}
 
     /**
      * This method is called after a new tab group is created, either through drag and drop, the tab
diff --git a/chrome/browser/tab_group/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterUnitTest.java b/chrome/browser/tab_group/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterUnitTest.java
index 2e5e009..fd96105 100644
--- a/chrome/browser/tab_group/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterUnitTest.java
+++ b/chrome/browser/tab_group/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterUnitTest.java
@@ -110,6 +110,10 @@
     private static final String TAB_GROUP_TITLES_FILE_NAME = "tab_group_titles";
     private static final String TAB_TITLE = "Tab";
 
+    private static final String TAB_GROUP_COLORS_FILE_NAME = "tab_group_colors";
+    private static final int INVALID_COLOR_ID = -1;
+    private static final int COLOR_ID = 0;
+
     @Rule public TestRule mProcessor = new Features.JUnitProcessor();
 
     @Rule public JniMocker mJniMocker = new JniMocker();
@@ -122,7 +126,9 @@
 
     @Mock Context mContext;
 
-    @Mock SharedPreferences mSharedPreferences;
+    @Mock SharedPreferences mSharedPreferencesTitle;
+
+    @Mock SharedPreferences mSharedPreferencesColor;
 
     @Captor ArgumentCaptor<TabModelObserver> mTabModelObserverCaptor;
 
@@ -322,11 +328,15 @@
             assertTrue(mTabGroupModelFilter.isTabModelRestored());
         }
 
-        doReturn(mSharedPreferences)
+        doReturn(mSharedPreferencesTitle)
                 .when(mContext)
                 .getSharedPreferences(TAB_GROUP_TITLES_FILE_NAME, Context.MODE_PRIVATE);
+        doReturn(mSharedPreferencesColor)
+                .when(mContext)
+                .getSharedPreferences(TAB_GROUP_COLORS_FILE_NAME, Context.MODE_PRIVATE);
         ContextUtils.initApplicationContextForTests(mContext);
-        when(mSharedPreferences.getString(anyString(), any())).thenReturn(TAB_TITLE);
+        when(mSharedPreferencesTitle.getString(anyString(), any())).thenReturn(TAB_TITLE);
+        when(mSharedPreferencesColor.getInt(anyString(), anyInt())).thenReturn(COLOR_ID);
     }
 
     @Before
@@ -787,7 +797,8 @@
                         Collections.singletonList(0),
                         Collections.singletonList(mTab1.getRootId()),
                         Collections.singletonList(null),
-                        null);
+                        null,
+                        INVALID_COLOR_ID);
         assertTrue(mTabGroupModelFilter.isTabInTabGroup(mTab1));
 
         mTabGroupModelFilter.moveTabOutOfGroup(TAB1_ID);
@@ -1334,7 +1345,7 @@
                 .didCreateNewGroup(mTab4.getRootId(), mTabGroupModelFilter);
         verify(mTabGroupModelFilterObserver).didMergeTabToGroup(mTab4, mTab4.getId());
         verify(mTabGroupModelFilterObserver, never())
-                .didCreateGroup(any(), any(), any(), any(), any());
+                .didCreateGroup(any(), any(), any(), any(), any(), anyInt());
 
         assertThat(mTab4.getTabGroupId(), equalTo(tabGroupId));
 
@@ -1594,7 +1605,8 @@
                         originalIndexes,
                         originalRootIds,
                         originalTabGroupIds,
-                        TAB_TITLE);
+                        TAB_TITLE,
+                        COLOR_ID);
         assertArrayEquals(
                 mTabGroupModelFilter.getRelatedTabList(mTab2.getId()).toArray(),
                 expectedGroup.toArray());
@@ -1637,7 +1649,8 @@
                         originalIndexes,
                         originalRootIds,
                         originalTabGroupIds,
-                        TAB_TITLE);
+                        TAB_TITLE,
+                        COLOR_ID);
         assertArrayEquals(
                 mTabGroupModelFilter.getRelatedTabList(mTab2.getId()).toArray(),
                 expectedGroup.toArray());
@@ -1673,7 +1686,8 @@
                         originalIndexes,
                         originalRootIds,
                         originalTabGroupIds,
-                        TAB_TITLE);
+                        TAB_TITLE,
+                        COLOR_ID);
         assertArrayEquals(
                 mTabGroupModelFilter.getRelatedTabList(mTab1.getId()).toArray(),
                 expectedGroup.toArray());
@@ -1691,7 +1705,7 @@
         verify(mTabGroupModelFilterObserver)
                 .didCreateNewGroup(mTab4.getRootId(), mTabGroupModelFilter);
         verify(mTabGroupModelFilterObserver, never())
-                .didCreateGroup(any(), any(), any(), any(), any());
+                .didCreateGroup(any(), any(), any(), any(), any(), anyInt());
 
         assertEquals(mTab1.getTabGroupId(), tabGroupId);
         assertEquals(mTab4.getTabGroupId(), tabGroupId);
diff --git a/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/EdgeToEdgeControllerImpl.java b/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/EdgeToEdgeControllerImpl.java
index f5577b64..894b81690 100644
--- a/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/EdgeToEdgeControllerImpl.java
+++ b/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/EdgeToEdgeControllerImpl.java
@@ -42,9 +42,6 @@
 public class EdgeToEdgeControllerImpl implements EdgeToEdgeController {
     private static final String TAG = "E2E_ControllerImpl";
 
-    /** Static to force-enable TotallyEdgeToEdge for testing purposes. */
-    private static boolean sEnableTotallyEdgeToEdgeForTesting;
-
     /** The outermost view in our view hierarchy that is identified with a resource ID. */
     private static final int ROOT_UI_VIEW_ID = android.R.id.content;
 
@@ -62,7 +59,6 @@
     private Tab mCurrentTab;
     private WebContentsObserver mWebContentsObserver;
     private boolean mIsActivityToEdge;
-    private float mPreviousSuggestedPadding;
     private @Nullable Insets mSystemInsets;
     private boolean mDidSetDecorAndListener;
     private final @Nullable TotallyEdgeToEdge mTotallyEdgeToEdge;
@@ -111,16 +107,15 @@
                     }
                 };
         mTotallyEdgeToEdge =
-                TotallyEdgeToEdge.isEnabled() || sEnableTotallyEdgeToEdgeForTesting
+                TotallyEdgeToEdge.isEnabled()
                         ? new TotallyEdgeToEdge(
                                 browserControlsStateProvider,
-                                (suggestedPadding) ->
+                                () ->
                                         maybeDrawToEdge(
                                                 ROOT_UI_VIEW_ID,
                                                 mCurrentTab == null
                                                         ? null
-                                                        : mCurrentTab.getWebContents(),
-                                                suggestedPadding))
+                                                        : mCurrentTab.getWebContents()))
                         : null;
     }
 
@@ -197,24 +192,8 @@
      * @param webContents The {@link WebContents} to notify of inset env() changes.
      */
     private void maybeDrawToEdge(int viewId, @Nullable WebContents webContents) {
-        maybeDrawToEdge(viewId, webContents, 0);
-    }
-
-    /**
-     * Conditionally draws the given View ToEdge or ToNormal based on {@link
-     * EdgeToEdgeUtils#shouldDrawToEdge(Tab)}
-     *
-     * @param viewId The ID of the Root UI View.
-     * @param webContents The {@link WebContents} to notify of inset env() changes.
-     * @param suggestedPadding A fraction indicating the amount of padding (range 0 - 1).
-     */
-    private void maybeDrawToEdge(
-            int viewId, @Nullable WebContents webContents, float suggestedPadding) {
-        drawToEdge(
-                viewId,
-                shouldDrawToEdge(mCurrentTab) || totallyToEdge(),
-                webContents,
-                suggestedPadding);
+        Log.v(TAG, "maybeDrawToEdge? totally: %s", totallyToEdge());
+        drawToEdge(viewId, shouldDrawToEdge(mCurrentTab) || totallyToEdge(), webContents);
     }
 
     /**
@@ -248,30 +227,7 @@
      * @param webContents The {@link WebContents} to notify of inset env() changes.
      */
     private void drawToEdge(int viewId, boolean toEdge, @Nullable WebContents webContents) {
-        drawToEdge(viewId, toEdge, webContents, 0);
-    }
-
-    /**
-     * Conditionally draws the given View ToEdge or ToNormal based on the {@code toEdge} param.
-     *
-     * @param viewId The ID of the Root UI View.
-     * @param toEdge Whether to draw ToEdge.
-     * @param webContents The {@link WebContents} to notify of inset env() changes.
-     * @param suggestedPadding A suggested value for the padding of the bottom of the screen. Use 0
-     *     to pad all the way to the edge, and a positive non-zero value to pad that many pixels
-     *     from the edge.
-     */
-    private void drawToEdge(
-            int viewId, boolean toEdge, @Nullable WebContents webContents, float suggestedPadding) {
-        if (toEdge == mIsActivityToEdge && mPreviousSuggestedPadding == suggestedPadding) return;
-
-        if (toEdge == mIsActivityToEdge
-                && mPreviousSuggestedPadding != suggestedPadding
-                && mSystemInsets != null) {
-            adjustEdges(toEdge, viewId, webContents, suggestedPadding);
-            mPreviousSuggestedPadding = suggestedPadding;
-            return;
-        }
+        if (toEdge == mIsActivityToEdge) return;
 
         mIsActivityToEdge = toEdge;
         Log.v(TAG, "Switching %s", (toEdge ? "ToEdge" : "ToNormal"));
@@ -300,12 +256,12 @@
                                                     mActivity);
                             // Note that we cannot adjustEdges earlier since we need the system
                             // insets.
-                            adjustEdges(mIsActivityToEdge, viewId, webContents, suggestedPadding);
+                            adjustEdges(mIsActivityToEdge, viewId, webContents);
                         }
                         return windowInsets;
                     });
-        } else if (mSystemInsets != null) {
-            adjustEdges(toEdge, viewId, webContents, suggestedPadding);
+        } else {
+            adjustEdges(toEdge, viewId, webContents);
         }
     }
 
@@ -317,22 +273,14 @@
      * @param toEdge Whether to adjust the drawing environment ToEdge.
      * @param viewId The ID of the view to adjust.
      * @param webContents A {@link WebContents} to notify Blink of the adjusted insets.
-     * @param suggestedPadding A suggested value for the padding of the bottom of the screen. Use 0
-     *     to pad all the way to the edge, and a positive non-zero value to pad that many pixels
-     *     from the edge.
      */
-    private void adjustEdges(
-            boolean toEdge, int viewId, @Nullable WebContents webContents, float suggestedPadding) {
+    private void adjustEdges(boolean toEdge, int viewId, @Nullable WebContents webContents) {
         assert mSystemInsets != null : "Trying to adjustToEdge without mSystemInsets!";
 
         // Adjust the bottom padding to reflect whether ToEdge or ToNormal for the Gesture Nav Bar.
         // All the other edges need to be padded to prevent drawing under an edge that we
         // don't want drawn ToEdge (e.g. the Status Bar).
-        int bottomInset =
-                toEdge
-                        ? mSystemInsets.bottom - Math.round(suggestedPadding * mSystemInsets.bottom)
-                        : mSystemInsets.bottom;
-
+        int bottomInset = toEdge ? 0 : mSystemInsets.bottom;
         mEdgeToEdgeOSWrapper.setPadding(
                 mActivity.findViewById(viewId),
                 mSystemInsets.left,
@@ -354,10 +302,7 @@
         @ColorInt int navBarColor = toEdge ? Color.TRANSPARENT : Color.BLACK;
         mEdgeToEdgeOSWrapper.setNavigationBarColor(mActivity.getWindow(), navBarColor);
 
-        if (webContents != null) {
-            pushInsetsToBlink(
-                    toEdge, webContents, Math.round(suggestedPadding * mSystemInsets.bottom));
-        }
+        if (webContents != null) pushInsetsToBlink(toEdge, webContents);
     }
 
     /**
@@ -366,12 +311,12 @@
      * @param toEdge Whether we're drawing all the way to the edge of the screen.
      * @param webContents A {@link WebContents} that leads to a Blink Renderer.
      */
-    private void pushInsetsToBlink(
-            boolean toEdge, @NonNull WebContents webContents, int suggestedPadding) {
+    private void pushInsetsToBlink(boolean toEdge, @NonNull WebContents webContents) {
         // Push the insets back to the webpage if we have one.
         // TODO(https://crbug.com/1475820) Move this work into the nascent
         // SafeAreaInsetsTracker.
-        Rect insetsRect = new Rect(0, 0, 0, toEdge ? scale(suggestedPadding) : 0);
+        assert mSystemInsets != null : "Error, trying to notify Blink without system insets set";
+        Rect insetsRect = new Rect(0, 0, 0, toEdge ? scale(mSystemInsets.bottom) : 0);
         Log.v(TAG, "Pushing back insets to Blink %s", insetsRect);
         webContents.setDisplayCutoutSafeArea(insetsRect);
     }
@@ -432,8 +377,4 @@
     void setSystemInsetsForTesting(Insets systemInsetsForTesting) {
         mSystemInsets = systemInsetsForTesting;
     }
-
-    static void setTotallyEdgeToEdgeForTesting(boolean isEnabled) {
-        sEnableTotallyEdgeToEdgeForTesting = isEnabled;
-    }
 }
diff --git a/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/EdgeToEdgeControllerTest.java b/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/EdgeToEdgeControllerTest.java
index 86d59c3..c9b57a9 100644
--- a/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/EdgeToEdgeControllerTest.java
+++ b/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/EdgeToEdgeControllerTest.java
@@ -100,7 +100,6 @@
 
     @Mock private WindowInsetsCompat mWindowInsetsMock;
     @Mock private BrowserControlsStateProvider mBrowserControlsStateProvider;
-    @Captor private ArgumentCaptor<BrowserControlsStateProvider.Observer> mControlsObserverCaptor;
 
     @Implements(EdgeToEdgeControllerFactory.class)
     static class ShadowEdgeToEdgeControllerFactory extends EdgeToEdgeControllerFactory {
@@ -128,7 +127,6 @@
                         mBrowserControlsStateProvider);
         assertNotNull(mEdgeToEdgeControllerImpl);
         EdgeToEdgeControllerFactory.setHas3ButtonNavBar(false);
-        EdgeToEdgeControllerImpl.setTotallyEdgeToEdgeForTesting(false);
 
         doNothing().when(mTab).addObserver(any());
         when(mTab.getUserDataHost()).thenReturn(mTabDataHost);
@@ -429,8 +427,7 @@
     void assertToEdgeExpectations() {
         mWindowInsetsListenerCaptor.getValue().onApplyWindowInsets(mViewMock, mWindowInsetsMock);
         // Pad the top only, bottom is ToEdge.
-        verify(mOsWrapper)
-                .setPadding(any(), eq(0), intThat(Matchers.greaterThan(0)), eq(0), anyInt());
+        verify(mOsWrapper).setPadding(any(), eq(0), intThat(Matchers.greaterThan(0)), eq(0), eq(0));
         verify(mOsWrapper).setNavigationBarColor(any(), eq(Color.TRANSPARENT));
         verify(mOsWrapper).setDecorFitsSystemWindows(any(), eq(false));
         verify(mOsWrapper).setOnApplyWindowInsetsListener(any(), any());
@@ -459,29 +456,6 @@
         verify(tab, atLeastOnce()).getWebContents();
     }
 
-    /** Use a live controller implementation to activate TotallyEdgeToEdge. */
-    @Test
-    public void onObservingDifferentTab_TotallyEdgeToEdge() {
-        EdgeToEdgeControllerImpl.setTotallyEdgeToEdgeForTesting(true);
-        ObservableSupplierImpl liveSupplier = new ObservableSupplierImpl();
-        EdgeToEdgeControllerImpl liveController =
-                (EdgeToEdgeControllerImpl)
-                        EdgeToEdgeControllerFactory.create(
-                                mActivity, liveSupplier, mBrowserControlsStateProvider);
-        assertNotNull(liveController);
-        assertFalse(liveController.isToEdge());
-        when(mTab.isNativePage()).thenReturn(false);
-        verify(mBrowserControlsStateProvider).addObserver(mControlsObserverCaptor.capture());
-        liveSupplier.set(mTab);
-        final int unused = 0;
-        mControlsObserverCaptor
-                .getValue()
-                .onControlsOffsetChanged(100, unused, unused, unused, false);
-        shadowOf(Looper.getMainLooper()).idle();
-        verifyInteractions(mTab);
-        assertTrue(liveController.isToEdge());
-        // Check the Navigation Bar color, as an indicator that we really changed the window,
-        // since we didn't use the OS Wrapper mock.
-        assertEquals(Color.TRANSPARENT, mActivity.getWindow().getNavigationBarColor());
-    }
+    // TODO: Verify that the value of the updated insets returned from the
+    //  OnApplyWindowInsetsListener is correct.
 }
diff --git a/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/TotallyEdgeToEdge.java b/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/TotallyEdgeToEdge.java
index af91bc67..434158e 100644
--- a/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/TotallyEdgeToEdge.java
+++ b/chrome/browser/ui/android/edge_to_edge/internal/java/src/org/chromium/chrome/browser/ui/edge_to_edge/TotallyEdgeToEdge.java
@@ -5,36 +5,29 @@
 package org.chromium.chrome.browser.ui.edge_to_edge;
 
 import org.chromium.base.FeatureList;
+import org.chromium.base.Log;
 import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 
 /** Explores further ideas to activate EdgeToEdge in various circumstances. */
 public class TotallyEdgeToEdge {
-    /** Adjusts edges for Edge To Edge to a given suggested padding fraction. */
-    interface EdgeAdjustor {
-        /** Suggests an adjustment of drawing to edges to the suggested fraction (0-1.0). */
-        void adjustEdges(float suggestedPadding);
-    }
-
     private static final String TAG = "E2E_TotallyE2E";
     private final BrowserControlsStateProvider mBrowserControlsStateProvider;
     private boolean mShouldDrawEdgeToEdge;
     private BrowserControlsStateProvider.Observer mObserver;
-    private EdgeAdjustor mEdgeAdjustor;
+    private Runnable mRunnable;
 
     /**
      * Creates a controller to enable Edge To Edge under conditions worth exploring.
      *
      * @param browserControlsStateProvider Provider for the Browser Controls (Toolbar) state.
-     * @param edgeAdjustor A callback to activate when we should adjust ToEdge or ToNormal.
+     * @param runnable A callback to activate when we should switch ToEdge or ToNormal.
      */
     public TotallyEdgeToEdge(
-            BrowserControlsStateProvider browserControlsStateProvider, EdgeAdjustor edgeAdjustor) {
+            BrowserControlsStateProvider browserControlsStateProvider, Runnable runnable) {
         mBrowserControlsStateProvider = browserControlsStateProvider;
         mObserver =
                 new BrowserControlsStateProvider.Observer() {
-                    private int mMax;
-
                     @Override
                     public void onControlsOffsetChanged(
                             int topOffset,
@@ -42,13 +35,13 @@
                             int bottomOffset,
                             int bottomControlsMinHeightOffset,
                             boolean needsAnimate) {
-                        if (Math.abs(topOffset) > mMax) mMax = Math.abs(topOffset);
+                        Log.v(TAG, "topOffset changed to %s", topOffset);
                         mShouldDrawEdgeToEdge = topOffset != 0;
-                        mEdgeAdjustor.adjustEdges((Math.abs((float) topOffset) / mMax));
+                        mRunnable.run();
                     }
                 };
         browserControlsStateProvider.addObserver(mObserver);
-        mEdgeAdjustor = edgeAdjustor;
+        mRunnable = runnable;
     }
 
     /**
diff --git a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc
index aab7b3bf..13282d3 100644
--- a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc
+++ b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc
@@ -134,14 +134,6 @@
   content::TtsController::GetInstance()->Stop();
 }
 
-void AccessibilityControllerClient::OnTwoFingerTouchStart() {
-  AccessibilityManager::Get()->OnTwoFingerTouchStart();
-}
-
-void AccessibilityControllerClient::OnTwoFingerTouchStop() {
-  AccessibilityManager::Get()->OnTwoFingerTouchStop();
-}
-
 bool AccessibilityControllerClient::ShouldToggleSpokenFeedbackViaTouch() const {
   return AccessibilityManager::Get()->ShouldToggleSpokenFeedbackViaTouch();
 }
diff --git a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.h b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.h
index f1fea6ae..84e85cd 100644
--- a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.h
+++ b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.h
@@ -29,8 +29,6 @@
                                   gfx::PointF location) override;
   bool ToggleDictation() override;
   void SilenceSpokenFeedback() override;
-  void OnTwoFingerTouchStart() override;
-  void OnTwoFingerTouchStop() override;
   bool ShouldToggleSpokenFeedbackViaTouch() const override;
   void PlaySpokenFeedbackToggleCountdown(int tick_count) override;
   void RequestSelectToSpeakStateChange() override;
diff --git a/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc b/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
index 59b4afc..2231554 100644
--- a/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
+++ b/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
@@ -51,8 +51,6 @@
     return dictation_on_;
   }
   void SilenceSpokenFeedback() override { ++silence_spoken_feedback_count_; }
-  void OnTwoFingerTouchStart() override { ++on_two_finger_touch_start_count_; }
-  void OnTwoFingerTouchStop() override { ++on_two_finger_touch_stop_count_; }
   bool ShouldToggleSpokenFeedbackViaTouch() const override { return true; }
   void PlaySpokenFeedbackToggleCountdown(int tick_count) override {
     spoken_feedback_toggle_count_down_ = tick_count;
@@ -134,16 +132,6 @@
   client.SilenceSpokenFeedback();
   EXPECT_EQ(1, client.silence_spoken_feedback_count_);
 
-  // Tests OnTwoFingerTouchStart method call.
-  EXPECT_EQ(0, client.on_two_finger_touch_start_count_);
-  client.OnTwoFingerTouchStart();
-  EXPECT_EQ(1, client.on_two_finger_touch_start_count_);
-
-  // Tests OnTwoFingerTouchStop method call.
-  EXPECT_EQ(0, client.on_two_finger_touch_stop_count_);
-  client.OnTwoFingerTouchStop();
-  EXPECT_EQ(1, client.on_two_finger_touch_stop_count_);
-
   // Tests ShouldToggleSpokenFeedbackViaTouch method call.
   EXPECT_TRUE(client.ShouldToggleSpokenFeedbackViaTouch());
 
diff --git a/chrome/browser/ui/autofill/autofill_field_promo_controller_impl.cc b/chrome/browser/ui/autofill/autofill_field_promo_controller_impl.cc
index 0d0e78c..451d656 100644
--- a/chrome/browser/ui/autofill/autofill_field_promo_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_field_promo_controller_impl.cc
@@ -47,7 +47,7 @@
                    controller.promo_view_->OverlapsWithPictureInPictureWindow();
           },
           std::ref(*this));
-  promo_hide_helper_ = std::make_unique<AutofillPopupHideHelper>(
+  promo_hide_helper_.emplace(
       web_contents_, rfh->GetGlobalId(), std::move(hiding_params),
       std::move(hiding_callback), std::move(pip_detection_callback));
   promo_view_ = AutofillFieldPromoView::CreateAndShow(
diff --git a/chrome/browser/ui/autofill/autofill_field_promo_controller_impl.h b/chrome/browser/ui/autofill/autofill_field_promo_controller_impl.h
index d9a45ea..d89ccdda 100644
--- a/chrome/browser/ui/autofill/autofill_field_promo_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_field_promo_controller_impl.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_FIELD_PROMO_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_FIELD_PROMO_CONTROLLER_IMPL_H_
 
+#include <optional>
+
 #include "base/memory/raw_ref.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/autofill/autofill_field_promo_controller.h"
@@ -53,7 +55,7 @@
   const ui::ElementIdentifier promo_element_identifier_;
   base::WeakPtr<AutofillFieldPromoView> promo_view_;
   // This is a helper which detects events that should hide the promo.
-  std::unique_ptr<AutofillPopupHideHelper> promo_hide_helper_;
+  std::optional<AutofillPopupHideHelper> promo_hide_helper_;
 };
 
 }  // namespace autofill
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
index 8ad7ca2d..1e6ecb59 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
@@ -217,7 +217,7 @@
                    controller->view_->OverlapsWithPictureInPictureWindow();
           },
           GetWeakPtr());
-  popup_hide_helper_ = std::make_unique<AutofillPopupHideHelper>(
+  popup_hide_helper_.emplace(
       web_contents_.get(), rfh->GetGlobalId(), std::move(hiding_params),
       std::move(hiding_callback), std::move(pip_detection_callback));
 
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
index 73d3c32..047844fb 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
@@ -284,7 +284,7 @@
   base::WeakPtr<AutofillPopupControllerImpl> sub_popup_controller_;
 
   // This is a helper which detects events that should hide the popup.
-  std::unique_ptr<AutofillPopupHideHelper> popup_hide_helper_;
+  std::optional<AutofillPopupHideHelper> popup_hide_helper_;
 
   // AutofillPopupControllerImpl deletes itself. To simplify memory management,
   // we delete the object asynchronously.
diff --git a/chrome/browser/ui/chromeos/test_util.cc b/chrome/browser/ui/chromeos/test_util.cc
index 51ab1a5..408cfec 100644
--- a/chrome/browser/ui/chromeos/test_util.cc
+++ b/chrome/browser/ui/chromeos/test_util.cc
@@ -20,6 +20,7 @@
 #include "third_party/blink/public/mojom/frame/fullscreen.mojom.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
 
@@ -235,12 +236,9 @@
 }
 
 void ChromeOSBrowserUITest::DeactivateWidget(views::Widget* widget) {
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
-  views::test::WidgetActivationWaiter waiter(widget, false);
-#endif
   widget->Deactivate();
 #if BUILDFLAG(IS_CHROMEOS_LACROS)
-  waiter.Wait();
+  views::test::WaitForWidgetActive(widget, false);
 #endif
 }
 
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc
index fc33584..3c65180 100644
--- a/chrome/browser/ui/extensions/extension_action_view_controller.cc
+++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
@@ -219,6 +219,17 @@
   return base::UTF8ToUTF16(extension_->name());
 }
 
+std::u16string ExtensionActionViewController::GetActionTitle(
+    content::WebContents* web_contents) const {
+  if (!ExtensionIsValid()) {
+    return std::u16string();
+  }
+
+  std::string title = extension_action_->GetTitle(
+      sessions::SessionTabHelper::IdForTab(web_contents).id());
+  return base::UTF8ToUTF16(title);
+}
+
 std::u16string ExtensionActionViewController::GetAccessibleName(
     content::WebContents* web_contents) const {
   if (!ExtensionIsValid())
@@ -229,11 +240,9 @@
   if (!web_contents)
     return base::UTF8ToUTF16(extension()->name());
 
-  std::string title = extension_action()->GetTitle(
-      sessions::SessionTabHelper::IdForTab(web_contents).id());
-
-  std::u16string title_utf16 =
-      base::UTF8ToUTF16(title.empty() ? extension()->name() : title);
+  std::u16string action_title = GetActionTitle(web_contents);
+  std::u16string accessible_name =
+      action_title.empty() ? GetActionName() : action_title;
 
   // Include a "host access" portion of the tooltip if the extension has active
   // or pending interaction with the site.
@@ -253,22 +262,21 @@
   }
 
   if (site_interaction_description_id != -1) {
-    title_utf16 = base::StrCat(
-        {title_utf16, u"\n",
+    accessible_name = base::StrCat(
+        {accessible_name, u"\n",
          l10n_util::GetStringUTF16(site_interaction_description_id)});
   }
 
-  return title_utf16;
+  return accessible_name;
 }
 
 std::u16string ExtensionActionViewController::GetTooltip(
     content::WebContents* web_contents) const {
   if (base::FeatureList::IsEnabled(
           extensions_features::kExtensionsMenuAccessControl)) {
-    std::string extension_title = extension_action()->GetTitle(
-        sessions::SessionTabHelper::IdForTab(web_contents).id());
-    std::u16string extension_tooltip_title = base::UTF8ToUTF16(
-        extension_title.empty() ? extension()->name() : extension_title);
+    std::u16string action_title = GetActionTitle(web_contents);
+    std::u16string tooltip =
+        action_title.empty() ? GetActionName() : action_title;
 
     url::Origin origin =
         web_contents->GetPrimaryMainFrame()->GetLastCommittedOrigin();
@@ -299,11 +307,10 @@
     }
 
     return tooltip_site_access_id == -1
-               ? extension_tooltip_title
-               : base::JoinString(
-                     {extension_tooltip_title,
-                      l10n_util::GetStringUTF16(tooltip_site_access_id)},
-                     u"\n");
+               ? tooltip
+               : base::JoinString({tooltip, l10n_util::GetStringUTF16(
+                                                tooltip_site_access_id)},
+                                  u"\n");
   }
 
   return GetAccessibleName(web_contents);
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.h b/chrome/browser/ui/extensions/extension_action_view_controller.h
index 044631be..e5021a4 100644
--- a/chrome/browser/ui/extensions/extension_action_view_controller.h
+++ b/chrome/browser/ui/extensions/extension_action_view_controller.h
@@ -70,6 +70,8 @@
   ui::ImageModel GetIcon(content::WebContents* web_contents,
                          const gfx::Size& size) override;
   std::u16string GetActionName() const override;
+  std::u16string GetActionTitle(
+      content::WebContents* web_contents) const override;
   std::u16string GetAccessibleName(
       content::WebContents* web_contents) const override;
   std::u16string GetTooltip(content::WebContents* web_contents) const override;
diff --git a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc
index ca98e92..2b04be75 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc
+++ b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc
@@ -39,6 +39,11 @@
   return action_name_;
 }
 
+std::u16string TestToolbarActionViewController::GetActionTitle(
+    content::WebContents* web_contents) const {
+  return action_title_;
+}
+
 std::u16string TestToolbarActionViewController::GetAccessibleName(
     content::WebContents* web_contents) const {
   return accessible_name_;
@@ -118,6 +123,12 @@
   UpdateDelegate();
 }
 
+void TestToolbarActionViewController::SetActionTitle(
+    const std::u16string& title) {
+  action_title_ = title;
+  UpdateDelegate();
+}
+
 void TestToolbarActionViewController::SetAccessibleName(
     const std::u16string& name) {
   accessible_name_ = name;
diff --git a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
index e161d80..50373bf 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
+++ b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
@@ -28,6 +28,8 @@
   ui::ImageModel GetIcon(content::WebContents* web_contents,
                          const gfx::Size& size) override;
   std::u16string GetActionName() const override;
+  std::u16string GetActionTitle(
+      content::WebContents* web_contents) const override;
   std::u16string GetAccessibleName(
       content::WebContents* web_contents) const override;
   std::u16string GetTooltip(content::WebContents* web_contents) const override;
@@ -53,6 +55,7 @@
 
   // Configure the test controller. These also call UpdateDelegate().
   void SetActionName(const std::u16string& name);
+  void SetActionTitle(const std::u16string& title);
   void SetAccessibleName(const std::u16string& name);
   void SetTooltip(const std::u16string& tooltip);
   void SetEnabled(bool is_enabled);
@@ -72,6 +75,9 @@
   // Action name for the controller.
   std::u16string action_name_;
 
+  // Action title for the controller.
+  std::u16string action_title_;
+
   // The optional accessible name and tooltip; by default these are empty.
   std::u16string accessible_name_;
   std::u16string tooltip_;
diff --git a/chrome/browser/ui/toolbar/toolbar_action_view_controller.h b/chrome/browser/ui/toolbar/toolbar_action_view_controller.h
index e1cf134..407404b7 100644
--- a/chrome/browser/ui/toolbar/toolbar_action_view_controller.h
+++ b/chrome/browser/ui/toolbar/toolbar_action_view_controller.h
@@ -107,10 +107,14 @@
   virtual ui::ImageModel GetIcon(content::WebContents* web_contents,
                                  const gfx::Size& size) = 0;
 
-  // Returns the name of the action, which can be separate from the accessible
-  // name or name for the tooltip.
+  // Returns the name of the action.
   virtual std::u16string GetActionName() const = 0;
 
+  // Returns the title of the action on the given `web_contents`, which may be
+  // different than the action's name.
+  virtual std::u16string GetActionTitle(
+      content::WebContents* web_contents) const = 0;
+
   // Returns the accessible name to use for the given |web_contents|.
   // May be passed null, or a |web_contents| that returns -1 for
   // |sessions::SessionTabHelper::IdForTab(..)|.
diff --git a/chrome/browser/ui/views/accessibility/caption_bubble_controller_views_browsertest.cc b/chrome/browser/ui/views/accessibility/caption_bubble_controller_views_browsertest.cc
index d4aa26d..9e112f6 100644
--- a/chrome/browser/ui/views/accessibility/caption_bubble_controller_views_browsertest.cc
+++ b/chrome/browser/ui/views/accessibility/caption_bubble_controller_views_browsertest.cc
@@ -40,6 +40,7 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ -1200,9 +1201,8 @@
   EXPECT_TRUE(IsWidgetVisible());
 
   // Test that widget doesn't hide when focused.
-  views::test::WidgetActivationWaiter waiter(GetCaptionWidget(), true);
   GetCaptionWidget()->Activate();
-  waiter.Wait();
+  views::test::WaitForWidgetActive(GetCaptionWidget(), true);
   test_task_runner->FastForwardBy(base::Seconds(10));
   EXPECT_TRUE(IsWidgetVisible());
 
diff --git a/chrome/browser/ui/views/menu_interactive_uitest.cc b/chrome/browser/ui/views/menu_interactive_uitest.cc
index c3f8eeb..6a90c28 100644
--- a/chrome/browser/ui/views/menu_interactive_uitest.cc
+++ b/chrome/browser/ui/views/menu_interactive_uitest.cc
@@ -28,6 +28,7 @@
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/test/ax_event_counter.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
 
@@ -142,9 +143,8 @@
 #endif
   widget->Init(std::move(params));
   widget->Show();
-  views::test::WidgetActivationWaiter waiter(widget, true);
   widget->Activate();
-  waiter.Wait();
+  views::test::WaitForWidgetActive(widget, true);
 
   // Create a focused test button, used to assert that it has accessibility
   // focus before and after menu item is active, but not during.
diff --git a/chrome/browser/ui/views/permissions/permission_bubble_interactive_uitest.cc b/chrome/browser/ui/views/permissions/permission_bubble_interactive_uitest.cc
index e3c35f39..29d73c0 100644
--- a/chrome/browser/ui/views/permissions/permission_bubble_interactive_uitest.cc
+++ b/chrome/browser/ui/views/permissions/permission_bubble_interactive_uitest.cc
@@ -26,6 +26,7 @@
 #include "ui/base/test/ui_controls.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/views/test/button_test_api.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 
 enum ChipFeatureConfig {
@@ -53,8 +54,7 @@
     SCOPED_TRACE(message);
     EXPECT_TRUE(widget);
 
-    views::test::WidgetActivationWaiter waiter(widget, true);
-    waiter.Wait();
+    views::test::WaitForWidgetActive(widget, true);
   }
 
   // Send Ctrl/Cmd+keycode in the key window to the browser.
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
index 314bb4b..d66db1e3 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
@@ -93,6 +93,7 @@
 #include "ui/events/event_utils.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/webview/webview.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 
 #if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -189,7 +190,7 @@
     views::Widget* menu_widget = profile_menu_view()->GetWidget();
     ASSERT_TRUE(menu_widget);
     if (menu_widget->CanActivate()) {
-      views::test::WidgetActivationWaiter(menu_widget, /*active=*/true).Wait();
+      views::test::WaitForWidgetActive(menu_widget, /*active=*/true);
     } else {
       LOG(ERROR) << "menu_widget can not be activated";
     }
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_ui_browsertest.cc b/chrome/browser/ui/views/profiles/profile_menu_view_ui_browsertest.cc
index f4734f1..80658de 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view_ui_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view_ui_browsertest.cc
@@ -26,6 +26,7 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/views/bubble/bubble_dialog_model_host.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/any_widget_observer.h"
 
@@ -295,7 +296,7 @@
     views::Widget* menu_widget = profile_menu_view()->GetWidget();
     ASSERT_TRUE(menu_widget);
     if (menu_widget->CanActivate()) {
-      views::test::WidgetActivationWaiter(menu_widget, /*active=*/true).Wait();
+      views::test::WaitForWidgetActive(menu_widget, /*active=*/true);
     } else {
       LOG(ERROR) << "menu_widget can not be activated";
     }
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_interactive_uitest.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_interactive_uitest.cc
index 83d3e4ca..c227d3e 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_interactive_uitest.cc
@@ -24,6 +24,7 @@
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/policy_constants.h"
 #include "content/public/test/browser_test.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/any_widget_observer.h"
 
@@ -139,10 +140,9 @@
 
   // Minimizes `browser_view` and waits for it to be deactivated.
   static void MinimizeBrowser(BrowserView* browser_view) {
-    views::test::WidgetActivationWaiter waiter(browser_view->GetWidget(),
-                                               /*active=*/false);
     browser_view->Minimize();
-    waiter.Wait();
+    views::test::WaitForWidgetActive(browser_view->GetWidget(),
+                                     /*active=*/false);
     // Pump all pending UI events so that the window manager isn't racing with
     // the test.
     base::RunLoop().RunUntilIdle();
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
index 4d615fe..4c9f7d6 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
@@ -30,6 +30,7 @@
 #include "net/test/test_data_directory.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 
 using ::testing::Mock;
@@ -199,8 +200,7 @@
     gfx::NativeWindow window = browser_1_->window()->GetNativeWindow();
     views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
     ASSERT_NE(nullptr, widget);
-    views::test::WidgetActivationWaiter waiter(widget, true);
-    waiter.Wait();
+    views::test::WaitForWidgetActive(widget, true);
 
     auth_requestor_1_ =
         new StrictMock<SSLClientAuthRequestorMock>(cert_request_info_1_);
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc
index e799bb40..28c224f 100644
--- a/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc
@@ -55,6 +55,7 @@
 #include "ui/events/types/event_type.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "url/gurl.h"
 
@@ -332,10 +333,9 @@
 
   // Activate the active browser and wait for the inactive browser to be
   // inactive.
-  views::test::WidgetActivationWaiter waiter(
-      BrowserView::GetBrowserViewForBrowser(inactive_window)->frame(), false);
   BrowserView::GetBrowserViewForBrowser(active_window)->Activate();
-  waiter.Wait();
+  views::test::WaitForWidgetActive(
+      BrowserView::GetBrowserViewForBrowser(inactive_window)->frame(), false);
   ASSERT_FALSE(
       BrowserView::GetBrowserViewForBrowser(inactive_window)->IsActive());
 
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc
index c202095..d5243c5 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc
@@ -23,6 +23,7 @@
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/layout/flex_layout.h"
 #include "ui/views/style/typography.h"
+#include "ui/views/view_class_properties.h"
 
 namespace {
 
@@ -179,6 +180,11 @@
       CONTEXT_TAB_HOVER_CARD_TITLE, views::style::STYLE_BODY_3_EMPHASIS,
       /*color_id=*/std::nullopt,
       gfx::Insets::VH(kVerticalMargin, kHorizontalMargin)));
+  action_title_label_ = AddChildView(create_label(
+      views::style::CONTEXT_DIALOG_BODY_TEXT, views::style::STYLE_BODY_4,
+      /*color_id=*/kColorTabHoverCardSecondaryText,
+      gfx::Insets::TLBR(0, kHorizontalMargin, kVerticalMargin,
+                        kHorizontalMargin)));
 
   site_access_separator_ = AddChildView(create_separator());
   site_access_title_label_ = AddChildView(create_label(
@@ -215,12 +221,28 @@
 }
 
 void ToolbarActionHoverCardBubbleView::UpdateCardContent(
-    const ToolbarActionViewController* action_controller,
+    const std::u16string& extension_name,
+    const std::u16string& action_title,
+    ToolbarActionViewController::HoverCardState state,
     content::WebContents* web_contents) {
-  title_label_->SetData(
-      {action_controller->GetActionName(), /*is_filename=*/false});
+  title_label_->SetData({extension_name, /*is_filename=*/false});
 
-  HoverCardState state = action_controller->GetHoverCardState(web_contents);
+  // We need to adjust the bottom margin of `title_label_` depending on
+  // `action_title_` visibility.
+  if (action_title.empty()) {
+    title_label_->SetProperty(
+        views::kMarginsKey,
+        gfx::Insets::VH(kVerticalMargin, kHorizontalMargin));
+    action_title_label_->SetVisible(false);
+  } else {
+    title_label_->SetProperty(
+        views::kMarginsKey,
+        gfx::Insets::TLBR(kVerticalMargin, kHorizontalMargin, 0,
+                          kHorizontalMargin));
+    action_title_label_->SetData({action_title, /*is_filename=*/false});
+    action_title_label_->SetVisible(true);
+  }
+
   bool show_site_access_labels =
       state.site_access !=
       HoverCardState::SiteAccess::kExtensionDoesNotWantAccess;
@@ -246,6 +268,7 @@
 
 void ToolbarActionHoverCardBubbleView::SetTextFade(double percent) {
   title_label_->SetFade(percent);
+  action_title_label_->SetFade(percent);
   site_access_title_label_->SetFade(percent);
   site_access_description_label_->SetFade(percent);
   policy_label_->SetFade(percent);
@@ -256,6 +279,15 @@
   return title_label_->GetText();
 }
 
+std::u16string ToolbarActionHoverCardBubbleView::GetActionTitleTextForTesting()
+    const {
+  return action_title_label_->GetText();
+}
+
+bool ToolbarActionHoverCardBubbleView::IsActionTitleVisible() const {
+  return action_title_label_->GetVisible();
+}
+
 bool ToolbarActionHoverCardBubbleView::IsSiteAccessSeparatorVisible() const {
   return site_access_separator_->GetVisible();
 }
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.h b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.h
index 57c34624..8ab150e 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.h
@@ -32,8 +32,10 @@
       const ToolbarActionHoverCardBubbleView&) = delete;
   ~ToolbarActionHoverCardBubbleView() override;
 
-  // Updates the hover card content for `action_controller` in `web_contents`.
-  void UpdateCardContent(const ToolbarActionViewController* action_controller,
+  // Updates the hover card content with the provided values in `web_contents`.
+  void UpdateCardContent(const std::u16string& extension_name,
+                         const std::u16string& action_title,
+                         ToolbarActionViewController::HoverCardState state,
                          content::WebContents* web_contents);
 
   // Update the text fade to the given percent, which should be between 0 and 1.
@@ -41,6 +43,8 @@
 
   // Accessors used by tests.
   std::u16string GetTitleTextForTesting() const;
+  std::u16string GetActionTitleTextForTesting() const;
+  bool IsActionTitleVisible() const;
   bool IsSiteAccessSeparatorVisible() const;
   bool IsSiteAccessTitleVisible() const;
   bool IsSiteAccessDescriptionVisible() const;
@@ -53,7 +57,9 @@
   class FadeLabel;
   class FootnoteView;
 
+  // TODO(emiliapaz): rename to `extension_name_label_`.
   raw_ptr<FadeLabelView> title_label_ = nullptr;
+  raw_ptr<FadeLabelView> action_title_label_ = nullptr;
   raw_ptr<FadeLabelView> site_access_title_label_ = nullptr;
   raw_ptr<FadeLabelView> site_access_description_label_ = nullptr;
   raw_ptr<FadeLabelView> policy_label_ = nullptr;
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view_interactive_uitest.cc
index 15854cd7..90c3ab5 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view_interactive_uitest.cc
@@ -17,7 +17,10 @@
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/policy_constants.h"
+#include "components/sessions/content/session_tab_helper.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test.h"
+#include "extensions/browser/extension_action_manager.h"
 #include "extensions/common/extension_features.h"
 #include "ui/events/types/event_type.h"
 #include "ui/gfx/animation/animation_test_api.h"
@@ -211,12 +214,14 @@
 
   // Install four extensions with different policy and site access permissions
   // to test all the possible footnote combinations.
-  auto simple_extension = InstallExtension("Extension A");
-  auto force_installed_extension = ForceInstallExtension("Extension B");
-  auto extension_with_host_permissions =
-      InstallExtensionWithHostPermissions("Extension C", "<all_urls>");
+  auto simple_extension = InstallExtension("Simple extension");
+  auto force_installed_extension =
+      ForceInstallExtension("Force installed extension");
+  auto extension_with_host_permissions = InstallExtensionWithHostPermissions(
+      "Extension with host permissions", "<all_urls>");
   auto force_pinned_extension_with_host_permissions =
-      InstallExtensionWithHostPermissions("Extension D", "<all_urls>");
+      InstallExtensionWithHostPermissions(
+          "Force pinned extension with host permissions", "<all_urls>");
 
   PinExtension(simple_extension->id());
   PinExtension(force_installed_extension->id());
@@ -241,8 +246,7 @@
   ASSERT_TRUE(widget);
   EXPECT_TRUE(widget->IsVisible());
   EXPECT_EQ(hover_card()->GetAnchorView(), simple_action);
-  EXPECT_EQ(hover_card()->GetTitleTextForTesting(),
-            simple_action->view_controller()->GetActionName());
+  EXPECT_EQ(hover_card()->GetTitleTextForTesting(), u"Simple extension");
   EXPECT_FALSE(hover_card()->IsSiteAccessSeparatorVisible());
   EXPECT_FALSE(hover_card()->IsSiteAccessTitleVisible());
   EXPECT_FALSE(hover_card()->IsSiteAccessDescriptionVisible());
@@ -262,7 +266,7 @@
   EXPECT_TRUE(widget->IsVisible());
   EXPECT_EQ(hover_card()->GetAnchorView(), force_installed_action);
   EXPECT_EQ(hover_card()->GetTitleTextForTesting(),
-            force_installed_action->view_controller()->GetActionName());
+            u"Force installed extension");
   EXPECT_FALSE(hover_card()->IsSiteAccessSeparatorVisible());
   EXPECT_FALSE(hover_card()->IsSiteAccessTitleVisible());
   EXPECT_FALSE(hover_card()->IsSiteAccessDescriptionVisible());
@@ -281,7 +285,7 @@
   EXPECT_TRUE(widget->IsVisible());
   EXPECT_EQ(hover_card()->GetAnchorView(), action_with_host_permissions);
   EXPECT_EQ(hover_card()->GetTitleTextForTesting(),
-            action_with_host_permissions->view_controller()->GetActionName());
+            u"Extension with host permissions");
   EXPECT_TRUE(hover_card()->IsSiteAccessSeparatorVisible());
   EXPECT_TRUE(hover_card()->IsSiteAccessTitleVisible());
   EXPECT_TRUE(hover_card()->IsSiteAccessDescriptionVisible());
@@ -301,8 +305,7 @@
   EXPECT_EQ(hover_card()->GetAnchorView(),
             force_pinned_action_with_host_permissions);
   EXPECT_EQ(hover_card()->GetTitleTextForTesting(),
-            force_pinned_action_with_host_permissions->view_controller()
-                ->GetActionName());
+            u"Force pinned extension with host permissions");
   EXPECT_TRUE(hover_card()->IsSiteAccessSeparatorVisible());
   EXPECT_TRUE(hover_card()->IsSiteAccessTitleVisible());
   EXPECT_TRUE(hover_card()->IsSiteAccessDescriptionVisible());
@@ -310,6 +313,56 @@
   EXPECT_TRUE(hover_card()->IsPolicyLabelVisible());
 }
 
+// Verify hover card content is dynamically updated when toolbar action title is
+// updated.
+IN_PROC_BROWSER_TEST_F(ToolbarActionHoverCardBubbleViewUITest,
+                       WidgetContentDynamicallyUpdated) {
+  ASSERT_TRUE(embedded_test_server()->Start());
+
+  auto extension = InstallExtension("Extension name");
+  PinExtension(extension->id());
+
+  // Verify extension is pinned
+  ToolbarActionView* action_view =
+      GetExtensionsToolbarContainer()->GetViewForId(extension->id());
+  ASSERT_TRUE(action_view);
+
+  // Hover over the extension and verify card anchors to its action.
+  HoverMouseOverActionView(action_view);
+  views::Widget* const widget = hover_card()->GetWidget();
+  views::test::WidgetVisibleWaiter(widget).Wait();
+  ASSERT_TRUE(widget);
+  EXPECT_TRUE(widget->IsVisible());
+  EXPECT_EQ(hover_card()->GetAnchorView(), action_view);
+
+  // Verify card title contains the extension name and action title is not
+  // visible.
+  EXPECT_EQ(hover_card()->GetTitleTextForTesting(), u"Extension name");
+  EXPECT_FALSE(hover_card()->IsActionTitleVisible());
+
+  // Update the extension action's title for the current tab.
+  extensions::ExtensionAction* action =
+      extensions::ExtensionActionManager::Get(profile())->GetExtensionAction(
+          *extension);
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_TRUE(action);
+  int tab_id = sessions::SessionTabHelper::IdForTab(web_contents).id();
+  action->SetTitle(tab_id, "Action title");
+  extensions::ExtensionActionAPI::Get(profile())->NotifyChange(
+      action, web_contents, profile());
+
+  // Verify hover card is still visible.
+  ASSERT_TRUE(widget);
+  EXPECT_TRUE(widget->IsVisible());
+  EXPECT_EQ(hover_card()->GetAnchorView(), action_view);
+
+  // Verify card contains the extension name and action title.
+  EXPECT_EQ(hover_card()->GetTitleTextForTesting(), u"Extension name");
+  EXPECT_TRUE(hover_card()->IsActionTitleVisible());
+  EXPECT_EQ(hover_card()->GetActionTitleTextForTesting(), u"Action title");
+}
+
 // Verify hover card is not visible when mouse moves inside the extensions
 // container to a button that is not a toolbar icon view (which has its own 'on
 // mouse moved' event listener).
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc
index 7394ec3a..3afcd61 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc
@@ -11,6 +11,7 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_hover_card_types.h"
+#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/views/extensions/extensions_toolbar_container.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
@@ -200,12 +201,25 @@
   content::WebContents* web_contents = action_view->GetCurrentWebContents();
   DCHECK(web_contents);
 
-  // If the hover card is transitioning between tabs, we need to do a
+  // If the hover card is transitioning between extensions, we need to do a
   // cross-fade.
-  if (hover_card_->GetAnchorView() != action_view)
+  if (hover_card_->GetAnchorView() != action_view) {
     hover_card_->SetTextFade(0.0);
+  }
 
-  hover_card_->UpdateCardContent(action_view->view_controller(), web_contents);
+  std::u16string extension_name =
+      action_view->view_controller()->GetActionName();
+  std::u16string action_title =
+      action_view->view_controller()->GetActionTitle(web_contents);
+  // Hover card only uses the action title when it's different than the
+  // extension name.
+  action_title =
+      extension_name == action_title ? std::u16string() : action_title;
+  ToolbarActionViewController::HoverCardState state =
+      action_view->view_controller()->GetHoverCardState(web_contents);
+
+  hover_card_->UpdateCardContent(extension_name, action_title, state,
+                                 web_contents);
 }
 
 void ToolbarActionHoverCardController::CreateHoverCard(
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
index 5100e0d..51886a4 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
@@ -41,6 +41,7 @@
 #include "ui/base/test/ui_controls.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/focus/focus_manager.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ -67,8 +68,7 @@
 
   // Test relies on browser window activation, while platform such as Linux's
   // window activation is asynchronous.
-  views::test::WidgetActivationWaiter waiter(widget, true);
-  waiter.Wait();
+  views::test::WaitForWidgetActive(widget, true);
 
   // Send focus to the toolbar as if the user pressed Alt+Shift+T. This should
   // happen after the browser window activation.
diff --git a/chrome/browser/ui/views/web_apps/isolated_web_apps/isolated_web_app_installer_view_impl.cc b/chrome/browser/ui/views/web_apps/isolated_web_apps/isolated_web_app_installer_view_impl.cc
index abf026a..8556af0 100644
--- a/chrome/browser/ui/views/web_apps/isolated_web_apps/isolated_web_app_installer_view_impl.cc
+++ b/chrome/browser/ui/views/web_apps/isolated_web_apps/isolated_web_app_installer_view_impl.cc
@@ -200,8 +200,16 @@
     SetInsideBorderInsets(views::LayoutProvider::Get()->GetInsetsMetric(
         views::InsetsMetric::INSETS_DIALOG));
     SetCollapseMarginsSpacing(true);
+    SetAccessibleRole(ax::mojom::Role::kMain);
 
-    icon_ = AddChildView(std::make_unique<NonAccessibleImageView>());
+    auto* header = AddChildView(std::make_unique<views::BoxLayoutView>());
+    header->SetOrientation(views::BoxLayout::Orientation::kVertical);
+    header->SetDefaultFlex(0);
+    header->SetAccessibleRole(
+        ax::mojom::Role::kRegion,
+        l10n_util::GetStringUTF16(IDS_IWA_INSTALLER_BODY_SCREENREADER_NAME));
+
+    icon_ = header->AddChildView(std::make_unique<NonAccessibleImageView>());
     icon_->SetHorizontalAlignment(views::ImageView::Alignment::kLeading);
     icon_->SetImageSize(gfx::Size(kIconSize, kIconSize));
     icon_->SetProperty(
@@ -209,11 +217,12 @@
         BottomPadding(views::DISTANCE_UNRELATED_CONTROL_VERTICAL));
     SetIcon(icon_model);
 
-    title_label_ = AddChildView(CreateLabelWithContextAndStyle(
+    title_label_ = header->AddChildView(CreateLabelWithContextAndStyle(
         views::style::CONTEXT_DIALOG_TITLE, views::style::STYLE_PRIMARY));
+    title_label_->SetAccessibleRole(ax::mojom::Role::kHeading);
     SetTitle(title);
 
-    subtitle_label_ = AddChildView(CreateLabelWithContextAndStyle(
+    subtitle_label_ = header->AddChildView(CreateLabelWithContextAndStyle(
         views::style::CONTEXT_DIALOG_BODY_TEXT, views::style::STYLE_SECONDARY));
     SetSubtitle(subtitle_id, subtitle_param, subtitle_link_callback);
   }
@@ -246,7 +255,8 @@
   }
 
   template <typename T>
-  T* SetContentsView(std::unique_ptr<T> contents_view) {
+  T* SetContentsView(std::unique_ptr<T> contents_view,
+                     std::optional<int> region_name_id) {
     CHECK(!contents_wrapper_);
     contents_wrapper_ = AddChildView(std::make_unique<views::BoxLayoutView>());
     contents_wrapper_->SetOrientation(views::BoxLayout::Orientation::kVertical);
@@ -257,6 +267,13 @@
         gfx::Insets::VH(ChromeLayoutProvider::Get()->GetDistanceMetric(
                             views::DISTANCE_UNRELATED_CONTROL_VERTICAL),
                         0));
+    if (region_name_id.has_value()) {
+      contents_wrapper_->SetAccessibleRole(
+          ax::mojom::Role::kRegion,
+          l10n_util::GetStringUTF16(region_name_id.value()));
+    } else {
+      contents_wrapper_->SetAccessibleRole(ax::mojom::Role::kRegion);
+    }
     SetFlexForView(contents_wrapper_, 1);
     return contents_wrapper_->AddChildView(std::move(contents_view));
   }
@@ -304,7 +321,8 @@
     auto progress_bar =
         std::make_unique<AnnotatedProgressBar>(l10n_util::GetPluralStringFUTF16(
             IDS_IWA_INSTALLER_VERIFICATION_STATUS, 0));
-    progress_bar_ = SetContentsView(std::move(progress_bar));
+    progress_bar_ = SetContentsView(
+        std::move(progress_bar), IDS_IWA_INSTALLER_PROGRESS_SCREENREADER_NAME);
   }
 
   void UpdateProgress(double percent) {
@@ -334,7 +352,8 @@
         {IDS_IWA_INSTALLER_SHOW_METADATA_APP_NAME_LABEL, u""},
         {IDS_IWA_INSTALLER_SHOW_METADATA_APP_VERSION_LABEL, u""},
     };
-    info_pane_ = SetContentsView(std::make_unique<InfoPane>(info));
+    info_pane_ = SetContentsView(std::make_unique<InfoPane>(info),
+                                 IDS_IWA_INSTALLER_DETAILS_SCREENREADER_NAME);
   }
 
   void UpdateInfoPaneContents(
@@ -361,7 +380,8 @@
             IDS_IWA_INSTALLER_INSTALL_SUBTITLE) {
     auto progress_bar = std::make_unique<AnnotatedProgressBar>(
         l10n_util::GetStringUTF16(IDS_IWA_INSTALLER_INSTALL_PROGRESS));
-    progress_bar_ = SetContentsView(std::move(progress_bar));
+    progress_bar_ = SetContentsView(
+        std::move(progress_bar), IDS_IWA_INSTALLER_PROGRESS_SCREENREADER_NAME);
   }
 
   void UpdateProgress(double percent) {
@@ -387,7 +407,7 @@
             IDS_IWA_INSTALLER_SUCCESS_SUBTITLE) {
     auto image = std::make_unique<NonAccessibleImageView>();
     image->SetImage(ui::ImageModel::FromResourceId(IDR_IWA_INSTALL_SUCCESS));
-    SetContentsView(std::move(image));
+    SetContentsView(std::move(image), /*region_name_id=*/std::nullopt);
   }
 };
 
diff --git a/chrome/browser/ui/webui/ash/app_install/app_install_dialog_browsertest.cc b/chrome/browser/ui/webui/ash/app_install/app_install_dialog_browsertest.cc
index 374ba64..15d055e4 100644
--- a/chrome/browser/ui/webui/ash/app_install/app_install_dialog_browsertest.cc
+++ b/chrome/browser/ui/webui/ash/app_install/app_install_dialog_browsertest.cc
@@ -76,12 +76,29 @@
 
   content::WebContents* web_contents = GetWebContentsFromDialog();
 
+  EXPECT_TRUE(content::ExecJs(web_contents,
+                              "document.querySelector('app-install-dialog')."
+                              "shadowRoot.querySelector('#title') === 'Install "
+                              "app to your Chromebook'"));
+
   // Click the install button.
   EXPECT_TRUE(
       content::ExecJs(web_contents,
                       "document.querySelector('app-install-dialog')."
                       "shadowRoot.querySelector('.action-button').click()"));
 
+  // Make sure the button goes through the 'Installing' state.
+  while (!content::EvalJs(
+              web_contents,
+              "document.querySelector('app-install-dialog').shadowRoot."
+              "querySelector('.action-button').label.includes('Installing')")
+              .ExtractBool()) {
+  }
+  EXPECT_TRUE(content::ExecJs(
+      web_contents,
+      "document.querySelector('app-install-dialog')."
+      "shadowRoot.querySelector('#title') === 'Installing app...'"));
+
   // Wait for the button text to say "Open app", which means it knows the app
   // was installed successfully.
   while (!content::EvalJs(
@@ -90,6 +107,10 @@
               "querySelector('.action-button').label.includes('Open app')")
               .ExtractBool()) {
   }
+  EXPECT_TRUE(content::ExecJs(
+      web_contents,
+      "document.querySelector('app-install-dialog')."
+      "shadowRoot.querySelector('#title') === 'App installed'"));
 
   // Click the open app button and expect the dialog was closed.
   content::WebContentsDestroyedWatcher watcher(web_contents);
diff --git a/chrome/browser/ui/webui/ash/login/app_downloading_screen_handler.cc b/chrome/browser/ui/webui/ash/login/app_downloading_screen_handler.cc
index b5e564c..fb9f3ec 100644
--- a/chrome/browser/ui/webui/ash/login/app_downloading_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/app_downloading_screen_handler.cc
@@ -47,4 +47,9 @@
   ShowInWebUI(std::move(data));
 }
 
+base::WeakPtr<AppDownloadingScreenView>
+AppDownloadingScreenHandler::AsWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/app_downloading_screen_handler.h b/chrome/browser/ui/webui/ash/login/app_downloading_screen_handler.h
index d5d325d..5230802e 100644
--- a/chrome/browser/ui/webui/ash/login/app_downloading_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/app_downloading_screen_handler.h
@@ -10,8 +10,7 @@
 
 namespace ash {
 
-class AppDownloadingScreenView
-    : public base::SupportsWeakPtr<AppDownloadingScreenView> {
+class AppDownloadingScreenView {
  public:
   inline constexpr static StaticOobeScreenId kScreenId{"app-downloading",
                                                        "AppDownloadingScreen"};
@@ -20,11 +19,14 @@
 
   // Shows the contents of the screen.
   virtual void Show() = 0;
+
+  // Gets a WeakPtr to the instance.
+  virtual base::WeakPtr<AppDownloadingScreenView> AsWeakPtr() = 0;
 };
 
 // The sole implementation of the AppDownloadingScreenView, using WebUI.
-class AppDownloadingScreenHandler : public BaseScreenHandler,
-                                    public AppDownloadingScreenView {
+class AppDownloadingScreenHandler final : public BaseScreenHandler,
+                                          public AppDownloadingScreenView {
  public:
   using TView = AppDownloadingScreenView;
 
@@ -41,7 +43,11 @@
       ::login::LocalizedValuesBuilder* builder) override;
 
   // AppDownloadingScreenView:
-  void Show() final;
+  void Show() override;
+  base::WeakPtr<AppDownloadingScreenView> AsWeakPtr() override;
+
+ private:
+  base::WeakPtrFactory<AppDownloadingScreenView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc b/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc
index 51fec3a..b4a023bd 100644
--- a/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc
@@ -204,6 +204,11 @@
   ShowInWebUI();
 }
 
+base::WeakPtr<AssistantOptInFlowScreenView>
+AssistantOptInFlowScreenHandler::AsWeakPtr() {
+  return weak_factory_.GetWeakPtr();
+}
+
 void AssistantOptInFlowScreenHandler::OnListeningHotword() {
   CallExternalAPI("onVoiceMatchUpdate", "listen");
 }
diff --git a/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.h b/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.h
index 9f6eada..97aad83 100644
--- a/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.h
@@ -23,8 +23,7 @@
 
 // Interface for dependency injection between AssistantOptInFlowScreen
 // and its WebUI representation.
-class AssistantOptInFlowScreenView
-    : public base::SupportsWeakPtr<AssistantOptInFlowScreenView> {
+class AssistantOptInFlowScreenView {
  public:
   inline constexpr static StaticOobeScreenId kScreenId{
       "assistant-optin-flow", "AssistantOptInFlowScreen"};
@@ -36,12 +35,13 @@
   virtual ~AssistantOptInFlowScreenView() = default;
 
   virtual void Show() = 0;
+  virtual base::WeakPtr<AssistantOptInFlowScreenView> AsWeakPtr() = 0;
 
  protected:
   AssistantOptInFlowScreenView() = default;
 };
 
-class AssistantOptInFlowScreenHandler
+class AssistantOptInFlowScreenHandler final
     : public BaseScreenHandler,
       public AssistantOptInFlowScreenView,
       public AssistantStateObserver,
@@ -78,6 +78,7 @@
 
   // AssistantOptInFlowScreenView:
   void Show() override;
+  base::WeakPtr<AssistantOptInFlowScreenView> AsWeakPtr() override;
 
   // assistant::SpeakerIdEnrollmentClient:
   void OnListeningHotword() override;
diff --git a/chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.cc b/chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.cc
index 57ebe97..804a227 100644
--- a/chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.cc
@@ -48,6 +48,10 @@
   CallExternalAPI("onSetupSucceeded");
 }
 
+base::WeakPtr<DemoSetupScreenView> DemoSetupScreenHandler::AsWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 void DemoSetupScreenHandler::DeclareLocalizedValues(
     ::login::LocalizedValuesBuilder* builder) {
   builder->Add("demoSetupProgressScreenTitle",
diff --git a/chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.h b/chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.h
index 1763576..bb92e8557 100644
--- a/chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.h
@@ -13,7 +13,7 @@
 namespace ash {
 
 // Interface of the demo mode setup screen view.
-class DemoSetupScreenView : public base::SupportsWeakPtr<DemoSetupScreenView> {
+class DemoSetupScreenView {
  public:
   inline constexpr static StaticOobeScreenId kScreenId{"demo-setup",
                                                        "DemoSetupScreen"};
@@ -33,12 +33,15 @@
   // Handles setup failure.
   virtual void OnSetupFailed(
       const DemoSetupController::DemoSetupError& error) = 0;
+
+  // Gets a WeakPtr to the instance.
+  virtual base::WeakPtr<DemoSetupScreenView> AsWeakPtr() = 0;
 };
 
 // WebUI implementation of DemoSetupScreenView. It controls UI, receives UI
 // events and notifies the Delegate.
-class DemoSetupScreenHandler : public BaseScreenHandler,
-                               public DemoSetupScreenView {
+class DemoSetupScreenHandler final : public BaseScreenHandler,
+                                     public DemoSetupScreenView {
  public:
   using TView = DemoSetupScreenView;
 
@@ -55,6 +58,7 @@
       DemoSetupController::DemoSetupStep current_step) override;
   void OnSetupFailed(const DemoSetupController::DemoSetupError& error) override;
   void OnSetupSucceeded() override;
+  base::WeakPtr<DemoSetupScreenView> AsWeakPtr() override;
 
   // BaseScreenHandler:
   void DeclareLocalizedValues(
@@ -62,6 +66,9 @@
 
   // BaseWebUIHandler:
   void GetAdditionalParameters(base::Value::Dict* parameters) override;
+
+ private:
+  base::WeakPtrFactory<DemoSetupScreenView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc
index a0a1bd2..aad5be5 100644
--- a/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc
@@ -54,4 +54,8 @@
   ShowInWebUI(std::move(data));
 }
 
+base::WeakPtr<DisplaySizeScreenView> DisplaySizeScreenHandler::AsWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/display_size_screen_handler.h b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.h
index ef89bf8..84a2825 100644
--- a/chrome/browser/ui/webui/ash/login/display_size_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.h
@@ -13,8 +13,7 @@
 
 // Interface for dependency injection between DisplaySizeScreen and its
 // WebUI representation.
-class DisplaySizeScreenView
-    : public base::SupportsWeakPtr<DisplaySizeScreenView> {
+class DisplaySizeScreenView {
  public:
   inline constexpr static StaticOobeScreenId kScreenId{"display-size",
                                                        "DisplaySizeScreen"};
@@ -23,10 +22,13 @@
 
   // Shows the contents of the screen.
   virtual void Show(base::Value::Dict data) = 0;
+
+  // Gets a WeakPtr to the instance.
+  virtual base::WeakPtr<DisplaySizeScreenView> AsWeakPtr() = 0;
 };
 
-class DisplaySizeScreenHandler : public BaseScreenHandler,
-                                 public DisplaySizeScreenView {
+class DisplaySizeScreenHandler final : public BaseScreenHandler,
+                                       public DisplaySizeScreenView {
  public:
   using TView = DisplaySizeScreenView;
 
@@ -43,6 +45,10 @@
 
   // DisplaySizeScreenView:
   void Show(base::Value::Dict data) override;
+  base::WeakPtr<DisplaySizeScreenView> AsWeakPtr() override;
+
+ private:
+  base::WeakPtrFactory<DisplaySizeScreenView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/fake_update_required_screen_handler.cc b/chrome/browser/ui/webui/ash/login/fake_update_required_screen_handler.cc
index 3012496..1ea454b 100644
--- a/chrome/browser/ui/webui/ash/login/fake_update_required_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/fake_update_required_screen_handler.cc
@@ -6,9 +6,16 @@
 
 namespace ash {
 
+FakeUpdateRequiredScreenHandler::FakeUpdateRequiredScreenHandler() = default;
+FakeUpdateRequiredScreenHandler::~FakeUpdateRequiredScreenHandler() = default;
+
 void FakeUpdateRequiredScreenHandler::SetUIState(
     UpdateRequiredView::UIState ui_state) {
   ui_state_ = ui_state;
 }
 
+base::WeakPtr<UpdateRequiredView> FakeUpdateRequiredScreenHandler::AsWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/fake_update_required_screen_handler.h b/chrome/browser/ui/webui/ash/login/fake_update_required_screen_handler.h
index 94bc8b0..a220d1d 100644
--- a/chrome/browser/ui/webui/ash/login/fake_update_required_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/fake_update_required_screen_handler.h
@@ -12,20 +12,18 @@
 
 namespace ash {
 
-class FakeUpdateRequiredScreenHandler : public UpdateRequiredView {
+class FakeUpdateRequiredScreenHandler final : public UpdateRequiredView {
  public:
-  FakeUpdateRequiredScreenHandler() = default;
+  FakeUpdateRequiredScreenHandler();
 
   FakeUpdateRequiredScreenHandler(const FakeUpdateRequiredScreenHandler&) =
       delete;
   FakeUpdateRequiredScreenHandler& operator=(
       const FakeUpdateRequiredScreenHandler&) = delete;
 
-  ~FakeUpdateRequiredScreenHandler() override {}
+  ~FakeUpdateRequiredScreenHandler() override;
 
   UpdateRequiredView::UIState ui_state() { return ui_state_; }
-
- private:
   void Show() override {}
 
   void SetIsConnected(bool connected) override {}
@@ -39,8 +37,12 @@
                                   const std::u16string& deviceName) override {}
   void SetEolMessage(const std::string& eolMessage) override {}
   void SetIsUserDataPresent(bool data_present) override {}
+  base::WeakPtr<UpdateRequiredView> AsWeakPtr() override;
 
+ private:
   UpdateRequiredView::UIState ui_state_;
+
+  base::WeakPtrFactory<UpdateRequiredView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/network_screen_handler.cc b/chrome/browser/ui/webui/ash/login/network_screen_handler.cc
index 2fdcf3c..a35ccc4 100644
--- a/chrome/browser/ui/webui/ash/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/network_screen_handler.cc
@@ -65,4 +65,8 @@
   CallExternalAPI("setQuickStartVisible");
 }
 
+base::WeakPtr<NetworkScreenView> NetworkScreenHandler::AsWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/network_screen_handler.h b/chrome/browser/ui/webui/ash/login/network_screen_handler.h
index 60f4e254..ce721d13 100644
--- a/chrome/browser/ui/webui/ash/login/network_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/network_screen_handler.h
@@ -14,7 +14,7 @@
 namespace ash {
 
 // Interface of network screen. Owned by NetworkScreen.
-class NetworkScreenView : public base::SupportsWeakPtr<NetworkScreenView> {
+class NetworkScreenView {
  public:
   inline constexpr static StaticOobeScreenId kScreenId{"network-selection",
                                                        "NetworkScreen"};
@@ -31,12 +31,15 @@
   virtual void ClearErrors() = 0;
 
   virtual void SetQuickStartEnabled() = 0;
+
+  // Gets a WeakPtr to the instance.
+  virtual base::WeakPtr<NetworkScreenView> AsWeakPtr() = 0;
 };
 
 // WebUI implementation of NetworkScreenView. It is used to interact with
 // the OOBE network selection screen.
-class NetworkScreenHandler : public NetworkScreenView,
-                             public BaseScreenHandler {
+class NetworkScreenHandler final : public NetworkScreenView,
+                                   public BaseScreenHandler {
  public:
   using TView = NetworkScreenView;
 
@@ -53,11 +56,15 @@
   void ShowError(const std::u16string& message) override;
   void ClearErrors() override;
   void SetQuickStartEnabled() override;
+  base::WeakPtr<NetworkScreenView> AsWeakPtr() override;
 
   // BaseScreenHandler:
   void DeclareLocalizedValues(
       ::login::LocalizedValuesBuilder* builder) override;
   void GetAdditionalParameters(base::Value::Dict* dict) override;
+
+ private:
+  base::WeakPtrFactory<NetworkScreenView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/offline_login_screen_handler.cc b/chrome/browser/ui/webui/ash/login/offline_login_screen_handler.cc
index 2a4c497..c2b5ca8 100644
--- a/chrome/browser/ui/webui/ash/login/offline_login_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/offline_login_screen_handler.cc
@@ -59,4 +59,8 @@
   CallExternalAPI("showPasswordMismatchMessage");
 }
 
+base::WeakPtr<OfflineLoginView> OfflineLoginScreenHandler::AsWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/offline_login_screen_handler.h b/chrome/browser/ui/webui/ash/login/offline_login_screen_handler.h
index 12d3d9b9..edc6926 100644
--- a/chrome/browser/ui/webui/ash/login/offline_login_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/offline_login_screen_handler.h
@@ -11,7 +11,7 @@
 
 class OfflineLoginScreen;
 
-class OfflineLoginView : public base::SupportsWeakPtr<OfflineLoginView> {
+class OfflineLoginView {
  public:
   inline constexpr static StaticOobeScreenId kScreenId{"offline-login",
                                                        "OfflineLoginScreen"};
@@ -36,10 +36,13 @@
 
   // Shows error message for not matching email/password pair.
   virtual void ShowPasswordMismatchMessage() = 0;
+
+  // Gets a WeakPtr to the instance.
+  virtual base::WeakPtr<OfflineLoginView> AsWeakPtr() = 0;
 };
 
-class OfflineLoginScreenHandler : public BaseScreenHandler,
-                                  public OfflineLoginView {
+class OfflineLoginScreenHandler final : public BaseScreenHandler,
+                                        public OfflineLoginView {
  public:
   using TView = OfflineLoginView;
   OfflineLoginScreenHandler();
@@ -60,10 +63,14 @@
   void ShowPasswordPage() override;
   void ShowOnlineRequiredDialog() override;
   void ShowPasswordMismatchMessage() override;
+  base::WeakPtr<OfflineLoginView> AsWeakPtr() override;
 
   // BaseScreenHandler:
   void DeclareLocalizedValues(
       ::login::LocalizedValuesBuilder* builder) override;
+
+ private:
+  base::WeakPtrFactory<OfflineLoginView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/os_install_screen_handler.cc b/chrome/browser/ui/webui/ash/login/os_install_screen_handler.cc
index 54815186..9fcacecec 100644
--- a/chrome/browser/ui/webui/ash/login/os_install_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/os_install_screen_handler.cc
@@ -126,4 +126,8 @@
           l10n_util::GetStringUTF16(IDS_INSTALLED_PRODUCT_OS_NAME)));
 }
 
+base::WeakPtr<OsInstallScreenView> OsInstallScreenHandler::AsWeakPtr() {
+  return weak_factory_.GetWeakPtr();
+}
+
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/os_install_screen_handler.h b/chrome/browser/ui/webui/ash/login/os_install_screen_handler.h
index 30a13b7..dc1259e 100644
--- a/chrome/browser/ui/webui/ash/login/os_install_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/os_install_screen_handler.h
@@ -24,7 +24,7 @@
 
 // Interface for dependency injection between OsInstallScreen and its
 // WebUI representation.
-class OsInstallScreenView : public base::SupportsWeakPtr<OsInstallScreenView> {
+class OsInstallScreenView {
  public:
   inline constexpr static StaticOobeScreenId kScreenId{"os-install",
                                                        "OsInstallScreen"};
@@ -38,10 +38,11 @@
   virtual void SetStatus(OsInstallClient::Status status) = 0;
   virtual void SetServiceLogs(const std::string& service_log) = 0;
   virtual void UpdateCountdownStringWithTime(base::TimeDelta time_left) = 0;
+  virtual base::WeakPtr<OsInstallScreenView> AsWeakPtr() = 0;
 };
 
-class OsInstallScreenHandler : public BaseScreenHandler,
-                               public OsInstallScreenView {
+class OsInstallScreenHandler final : public BaseScreenHandler,
+                                     public OsInstallScreenView {
  public:
   using TView = OsInstallScreenView;
 
@@ -61,6 +62,7 @@
   void SetStatus(OsInstallClient::Status status) override;
   void SetServiceLogs(const std::string& service_log) override;
   void UpdateCountdownStringWithTime(base::TimeDelta time_left) override;
+  base::WeakPtr<OsInstallScreenView> AsWeakPtr() override;
 
   base::WeakPtrFactory<OsInstallScreenHandler> weak_factory_{this};
 };
diff --git a/chrome/browser/ui/webui/ash/login/tpm_error_screen_handler.cc b/chrome/browser/ui/webui/ash/login/tpm_error_screen_handler.cc
index 68ce84f4..1429a2c 100644
--- a/chrome/browser/ui/webui/ash/login/tpm_error_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/tpm_error_screen_handler.cc
@@ -49,4 +49,8 @@
   CallExternalAPI("setStep", std::string(kTPMErrorDbusStep));
 }
 
+base::WeakPtr<TpmErrorView> TpmErrorScreenHandler::AsWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/tpm_error_screen_handler.h b/chrome/browser/ui/webui/ash/login/tpm_error_screen_handler.h
index c8029b6..262a1d6 100644
--- a/chrome/browser/ui/webui/ash/login/tpm_error_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/tpm_error_screen_handler.h
@@ -12,7 +12,7 @@
 
 // Interface for dependency injection between TpmErrorScreen and its
 // WebUI representation.
-class TpmErrorView : public base::SupportsWeakPtr<TpmErrorView> {
+class TpmErrorView {
  public:
   inline constexpr static StaticOobeScreenId kScreenId{"tpm-error-message",
                                                        "TPMErrorMessageScreen"};
@@ -25,9 +25,13 @@
   // Sets corresponding error message when taking tpm ownership return an error.
   virtual void SetTPMOwnedErrorStep() = 0;
   virtual void SetTPMDbusErrorStep() = 0;
+
+  // Gets a WeakPtr to the instance.
+  virtual base::WeakPtr<TpmErrorView> AsWeakPtr() = 0;
 };
 
-class TpmErrorScreenHandler : public TpmErrorView, public BaseScreenHandler {
+class TpmErrorScreenHandler final : public TpmErrorView,
+                                    public BaseScreenHandler {
  public:
   using TView = TpmErrorView;
 
@@ -40,10 +44,14 @@
   void Show() override;
   void SetTPMOwnedErrorStep() override;
   void SetTPMDbusErrorStep() override;
+  base::WeakPtr<TpmErrorView> AsWeakPtr() override;
 
   // BaseScreenHandler:
   void DeclareLocalizedValues(
       ::login::LocalizedValuesBuilder* builder) override;
+
+ private:
+  base::WeakPtrFactory<TpmErrorView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/update_required_screen_handler.cc b/chrome/browser/ui/webui/ash/login/update_required_screen_handler.cc
index a0278257..0509a9c 100644
--- a/chrome/browser/ui/webui/ash/login/update_required_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/update_required_screen_handler.cc
@@ -132,4 +132,8 @@
   CallExternalAPI("setIsUserDataPresent", data_present);
 }
 
+base::WeakPtr<UpdateRequiredView> UpdateRequiredScreenHandler::AsWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/update_required_screen_handler.h b/chrome/browser/ui/webui/ash/login/update_required_screen_handler.h
index f17c7d8..55d6a2c 100644
--- a/chrome/browser/ui/webui/ash/login/update_required_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/update_required_screen_handler.h
@@ -17,7 +17,7 @@
 // Interface for dependency injection between UpdateRequiredScreen and its
 // WebUI representation.
 
-class UpdateRequiredView : public base::SupportsWeakPtr<UpdateRequiredView> {
+class UpdateRequiredView {
  public:
   enum UIState {
     UPDATE_REQUIRED_MESSAGE = 0,   // 'System update required' message.
@@ -57,10 +57,13 @@
                                           const std::u16string& deviceName) = 0;
   virtual void SetEolMessage(const std::string& eolMessage) = 0;
   virtual void SetIsUserDataPresent(bool deleted) = 0;
+
+  // Gets a WeakPtr to the instance.
+  virtual base::WeakPtr<UpdateRequiredView> AsWeakPtr() = 0;
 };
 
-class UpdateRequiredScreenHandler : public UpdateRequiredView,
-                                    public BaseScreenHandler {
+class UpdateRequiredScreenHandler final : public UpdateRequiredView,
+                                          public BaseScreenHandler {
  public:
   using TView = UpdateRequiredView;
 
@@ -86,6 +89,7 @@
                                   const std::u16string& deviceName) override;
   void SetEolMessage(const std::string& eolMessage) override;
   void SetIsUserDataPresent(bool data_present) override;
+  base::WeakPtr<UpdateRequiredView> AsWeakPtr() override;
 
   // BaseScreenHandler:
   void DeclareLocalizedValues(
@@ -93,6 +97,9 @@
 
   // The domain name for which update required screen is being shown.
   std::string domain_;
+
+ private:
+  base::WeakPtrFactory<UpdateRequiredView> weak_ptr_factory_{this};
 };
 
 }  // namespace ash
diff --git a/chrome/browser/ui/webui/ash/settings/pages/apps/apps_section.cc b/chrome/browser/ui/webui/ash/settings/pages/apps/apps_section.cc
index 2cd806e..112c36e7 100644
--- a/chrome/browser/ui/webui/ash/settings/pages/apps/apps_section.cc
+++ b/chrome/browser/ui/webui/ash/settings/pages/apps/apps_section.cc
@@ -304,8 +304,6 @@
       {"appManagementIntentSettingsTitle",
        IDS_APP_MANAGEMENT_INTENT_SETTINGS_TITLE},
       {"appManagementIntentSharingOpenAppLabel",
-       IDS_APP_MANAGEMENT_INTENT_SHARING_APP_OPEN},
-      {"appManagementIntentSharingOpenAppLabel",
        kIsRevampEnabled ? IDS_OS_SETTINGS_REVAMP_OPEN_IN_APP_TITLE
                         : IDS_APP_MANAGEMENT_INTENT_SHARING_APP_OPEN},
       {"appManagementIntentSharingOpenBrowserLabel",
diff --git a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_app_browsertest.cc b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_app_browsertest.cc
index ec32452..5059160 100644
--- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_app_browsertest.cc
+++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_app_browsertest.cc
@@ -161,10 +161,6 @@
   ASSERT_TRUE(RunTest("update_content_clear_container.js"));
 }
 
-IN_PROC_BROWSER_TEST_F(ReadAnythingAppTest, UpdateContent_Selection) {
-  ASSERT_TRUE(RunTest("update_content_selection.js"));
-}
-
 IN_PROC_BROWSER_TEST_F(ReadAnythingAppTest, UpdateContent_Selection_Backwards) {
   ASSERT_TRUE(RunTest("update_content_selection_backwards.js"));
 }
diff --git a/chrome/browser/ui/webui/tab_search/tab_search_ui.cc b/chrome/browser/ui/webui/tab_search/tab_search_ui.cc
index ad7fc5a..78d436cc 100644
--- a/chrome/browser/ui/webui/tab_search/tab_search_ui.cc
+++ b/chrome/browser/ui/webui/tab_search/tab_search_ui.cc
@@ -73,6 +73,7 @@
       {"tabSearchTabName", IDS_TAB_SEARCH_TAB_NAME},
       // Tab organization UI strings
       {"createGroup", IDS_TAB_ORGANIZATION_CREATE_GROUP},
+      {"createGroups", IDS_TAB_ORGANIZATION_CREATE_GROUPS},
       {"dismiss", IDS_TAB_ORGANIZATION_DISMISS},
       {"failureBodyGenericPreLink",
        IDS_TAB_ORGANIZATION_FAILURE_BODY_GENERIC_PRE_LINK},
diff --git a/chrome/browser/webauthn/enclave_manager.cc b/chrome/browser/webauthn/enclave_manager.cc
index e0302f4..b857a16 100644
--- a/chrome/browser/webauthn/enclave_manager.cc
+++ b/chrome/browser/webauthn/enclave_manager.cc
@@ -12,7 +12,7 @@
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/functional/overloaded.h"
-#include "base/memory/scoped_refptr.h"
+#include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "base/strings/strcat.h"
 #include "base/strings/stringprintf.h"
@@ -37,6 +37,8 @@
 #include "components/trusted_vault/securebox.h"
 #include "components/trusted_vault/trusted_vault_connection.h"
 #include "components/trusted_vault/trusted_vault_server_constants.h"
+#include "components/unexportable_keys/ref_counted_unexportable_signing_key.h"
+#include "components/unexportable_keys/unexportable_key_id.h"
 #include "crypto/aead.h"
 #include "crypto/hkdf.h"
 #include "crypto/random.h"
@@ -262,10 +264,10 @@
 // wrapped asymmetric key which will be used to join the security domain.
 cbor::Value BuildRegistrationMessage(
     const std::string& device_id,
-    crypto::UnexportableSigningKey* hardware_key) {
+    const crypto::UnexportableSigningKey& hardware_key) {
   cbor::Value::MapValue pub_keys;
   pub_keys.emplace(enclave::kHardwareKey,
-                   hardware_key->GetSubjectPublicKeyInfo());
+                   hardware_key.GetSubjectPublicKeyInfo());
 
   cbor::Value::MapValue request1;
   request1.emplace(enclave::kRequestCommandKey, enclave::kRegisterCommandName);
@@ -1162,33 +1164,41 @@
     CHECK(absl::holds_alternative<KeyReady>(event)) << ToString(event);
 
     bool state_dirty = false;
+
+    auto uv_key = std::move(absl::get_if<KeyReady>(&event)->value().first);
     manager_->user_verifying_key_ =
-        std::move(absl::get_if<KeyReady>(&event)->value().first);
-    manager_->hardware_key_ =
-        std::move(absl::get_if<KeyReady>(&event)->value().second);
+        (uv_key == nullptr)
+            ? nullptr
+            : base::MakeRefCounted<crypto::RefCountedUserVerifyingSigningKey>(
+                  std::move(uv_key));
+
+    manager_->hardware_key_ = base::MakeRefCounted<
+        unexportable_keys::RefCountedUnexportableSigningKey>(
+        std::move(absl::get_if<KeyReady>(&event)->value().second),
+        unexportable_keys::UnexportableKeyId());
 
     EnclaveLocalState::User* const user_state = user_;
     if (manager_->user_verifying_key_) {
       const std::vector<uint8_t> uv_public_key =
-          manager_->user_verifying_key_->GetPublicKey();
+          manager_->user_verifying_key_->key().GetPublicKey();
       const std::string uv_public_key_str = VecToString(uv_public_key);
       if (user_state->uv_public_key() != uv_public_key_str) {
         user_state->set_uv_public_key(uv_public_key_str);
         user_state->set_wrapped_uv_private_key(UserVerifyingLabelToString(
-            manager_->user_verifying_key_->GetKeyLabel()));
+            manager_->user_verifying_key_->key().GetKeyLabel()));
         state_dirty = true;
       }
     }
 
     const std::vector<uint8_t> spki =
-        manager_->hardware_key_->GetSubjectPublicKeyInfo();
+        manager_->hardware_key_->key().GetSubjectPublicKeyInfo();
     const std::string spki_str = VecToString(spki);
     if (user_state->hardware_public_key() != spki_str) {
       std::array<uint8_t, crypto::kSHA256Length> device_id =
           crypto::SHA256Hash(spki);
       user_state->set_hardware_public_key(spki_str);
       user_state->set_wrapped_hardware_private_key(
-          VecToString(manager_->hardware_key_->GetWrappedKey()));
+          VecToString(manager_->hardware_key_->key().GetWrappedKey()));
       user_state->set_device_id(VecToString(device_id));
       state_dirty = true;
     }
@@ -1217,7 +1227,7 @@
     enclave::Transact(manager_->network_context_, enclave::GetEnclaveIdentity(),
                       std::move(token),
                       BuildRegistrationMessage(user_->device_id(),
-                                               manager_->hardware_key_.get()),
+                                               manager_->hardware_key_->key()),
                       enclave::SigningCallback(),
                       base::BindOnce(&StateMachine::OnEnclaveResponse,
                                      weak_ptr_factory_.GetWeakPtr()));
@@ -1804,41 +1814,46 @@
 }
 
 void EnclaveManager::GetHardwareKeyForSignature(
-    base::OnceCallback<void(crypto::UnexportableSigningKey*)>
-        signing_callback) {
+    base::OnceCallback<void(
+        scoped_refptr<unexportable_keys::RefCountedUnexportableSigningKey>)>
+        callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!user_ || user_->wrapped_hardware_private_key().empty()) {
-    std::move(signing_callback).Run(nullptr);
+    std::move(callback).Run(nullptr);
     return;
   }
 
   if (hardware_key_) {
-    std::move(signing_callback).Run(hardware_key_.get());
+    std::move(callback).Run(hardware_key_);
     return;
   }
 
   auto key_callback = base::BindOnce(
       [](base::WeakPtr<EnclaveManager> enclave_manager,
          CoreAccountId account_id,
-         base::OnceCallback<void(crypto::UnexportableSigningKey*)>
-             signing_callback,
+         base::OnceCallback<void(
+             scoped_refptr<
+                 unexportable_keys::RefCountedUnexportableSigningKey>)>
+             callback,
          std::unique_ptr<crypto::UnexportableSigningKey> key) {
         if (!enclave_manager ||
             enclave_manager->primary_account_info_->account_id != account_id) {
-          std::move(signing_callback).Run(nullptr);
+          std::move(callback).Run(nullptr);
           return;
         }
         DCHECK_CALLED_ON_VALID_SEQUENCE(enclave_manager->sequence_checker_);
         if (!key) {
           // TODO(enclave): The key is gone. Clear registration state.
-          std::move(signing_callback).Run(nullptr);
+          std::move(callback).Run(nullptr);
           return;
         }
-        enclave_manager->hardware_key_ = std::move(key);
-        std::move(signing_callback).Run(enclave_manager->hardware_key_.get());
+        enclave_manager->hardware_key_ = base::MakeRefCounted<
+            unexportable_keys::RefCountedUnexportableSigningKey>(
+            std::move(key), unexportable_keys::UnexportableKeyId());
+        std::move(callback).Run(enclave_manager->hardware_key_);
       },
       weak_ptr_factory_.GetWeakPtr(), primary_account_info_->account_id,
-      std::move(signing_callback));
+      std::move(callback));
 
   // Retrieve the key on a non-UI thread, and post a task back to the current
   // thread that invokes `key_callback` with the obtained key.
@@ -1877,7 +1892,8 @@
                enclave::SignedMessage message_to_be_signed,
                base::OnceCallback<void(std::optional<enclave::ClientSignature>)>
                    result_callback,
-               crypto::UnexportableSigningKey* key) {
+               scoped_refptr<
+                   unexportable_keys::RefCountedUnexportableSigningKey> key) {
               if (!key) {
                 std::move(result_callback).Run(std::nullopt);
                 return;
@@ -1888,10 +1904,11 @@
                   base::BindOnce(
                       [](std::string device_id,
                          enclave::SignedMessage message_to_be_signed,
-                         crypto::UnexportableSigningKey* key)
-                          -> std::optional<enclave::ClientSignature> {
+                         scoped_refptr<unexportable_keys::
+                                           RefCountedUnexportableSigningKey>
+                             key) -> std::optional<enclave::ClientSignature> {
                         std::optional<std::vector<uint8_t>> signature =
-                            key->SignSlowly(message_to_be_signed);
+                            key->key().SignSlowly(message_to_be_signed);
                         if (!signature) {
                           return std::nullopt;
                         }
@@ -1916,16 +1933,16 @@
 }
 
 void EnclaveManager::GetUserVerifyingKeyForSignature(
-    base::OnceCallback<void(crypto::UserVerifyingSigningKey*)>
-        signing_callback) {
+    base::OnceCallback<void(
+        scoped_refptr<crypto::RefCountedUserVerifyingSigningKey>)> callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!user_ || user_->wrapped_uv_private_key().empty()) {
-    std::move(signing_callback).Run(nullptr);
+    std::move(callback).Run(nullptr);
     return;
   }
 
   if (user_verifying_key_) {
-    std::move(signing_callback).Run(user_verifying_key_.get());
+    std::move(callback).Run(user_verifying_key_);
     return;
   }
 
@@ -1933,7 +1950,7 @@
   if (!user_verifying_key_provider) {
     // This indicates the platform key provider was available, but now is not.
     // TODO(enclave): Clear registration state.
-    std::move(signing_callback).Run(nullptr);
+    std::move(callback).Run(nullptr);
     return;
   }
 
@@ -1944,26 +1961,28 @@
       [](base::WeakPtr<EnclaveManager> enclave_manager,
          CoreAccountId account_id,
          std::unique_ptr<crypto::UserVerifyingKeyProvider> provider,
-         base::OnceCallback<void(crypto::UserVerifyingSigningKey*)>
-             signing_callback,
+         base::OnceCallback<void(
+             scoped_refptr<crypto::RefCountedUserVerifyingSigningKey>)>
+             callback,
          std::unique_ptr<crypto::UserVerifyingSigningKey> key) {
         provider.reset();
         if (!enclave_manager ||
             enclave_manager->primary_account_info_->account_id != account_id) {
-          std::move(signing_callback).Run(nullptr);
+          std::move(callback).Run(nullptr);
           return;
         }
         if (!key) {
           // TODO(enclave): The key is gone. Clear registration state.
-          std::move(signing_callback).Run(nullptr);
+          std::move(callback).Run(nullptr);
           return;
         }
-        enclave_manager->user_verifying_key_ = std::move(key);
-        std::move(signing_callback)
-            .Run(enclave_manager->user_verifying_key_.get());
+        enclave_manager->user_verifying_key_ =
+            base::MakeRefCounted<crypto::RefCountedUserVerifyingSigningKey>(
+                std::move(key));
+        std::move(callback).Run(enclave_manager->user_verifying_key_);
       },
       weak_ptr_factory_.GetWeakPtr(), primary_account_info_->account_id,
-      std::move(user_verifying_key_provider), std::move(signing_callback));
+      std::move(user_verifying_key_provider), std::move(callback));
 
   auto key_label =
       UserVerifyingKeyLabelFromString(user_->wrapped_uv_private_key());
@@ -1994,13 +2013,14 @@
                enclave::SignedMessage message_to_be_signed,
                base::OnceCallback<void(std::optional<enclave::ClientSignature>)>
                    result_callback,
-               crypto::UserVerifyingSigningKey* uv_signing_key) {
+               scoped_refptr<crypto::RefCountedUserVerifyingSigningKey>
+                   uv_signing_key) {
               if (!uv_signing_key) {
                 std::move(result_callback).Run(std::nullopt);
                 return;
               }
-              uv_signing_key
-                  ->Sign(
+              uv_signing_key->key()
+                  .Sign(
                       message_to_be_signed,
                       base::BindOnce(
                           [](std::string device_id,
diff --git a/chrome/browser/webauthn/enclave_manager.h b/chrome/browser/webauthn/enclave_manager.h
index 96aed6f..ff873d3d 100644
--- a/chrome/browser/webauthn/enclave_manager.h
+++ b/chrome/browser/webauthn/enclave_manager.h
@@ -21,8 +21,7 @@
 #include "services/network/public/mojom/network_context.mojom-forward.h"
 
 namespace crypto {
-class UnexportableSigningKey;
-class UserVerifyingSigningKey;
+class RefCountedUserVerifyingSigningKey;
 }  // namespace crypto
 
 namespace network {
@@ -34,6 +33,10 @@
 class PrimaryAccountAccessTokenFetcher;
 }  // namespace signin
 
+namespace unexportable_keys {
+class RefCountedUnexportableSigningKey;
+}
+
 namespace webauthn_pb {
 class EnclaveLocalState;
 class EnclaveLocalState_User;
@@ -178,11 +181,12 @@
   // If the key fails to load, the callback will be invoked with nullptr and
   // the device's enclave registration will be reset.
   void GetHardwareKeyForSignature(
-      base::OnceCallback<void(crypto::UnexportableSigningKey*)>
-          signing_callback);
+      base::OnceCallback<void(
+          scoped_refptr<unexportable_keys::RefCountedUnexportableSigningKey>)>
+          callback);
   void GetUserVerifyingKeyForSignature(
-      base::OnceCallback<void(crypto::UserVerifyingSigningKey*)>
-          signing_callback);
+      base::OnceCallback<void(
+          scoped_refptr<crypto::RefCountedUserVerifyingSigningKey>)> callback);
 
   const base::FilePath file_path_;
   const raw_ptr<signin::IdentityManager> identity_manager_;
@@ -205,10 +209,9 @@
   std::unique_ptr<PendingActions> pending_actions_;
 
   // Allow keys to persist across sequences because loading them is slow.
-  // TODO(enclave): Make these scoped_refptrs instead, because they are
-  // used asynchronously by system APIs.
-  std::unique_ptr<crypto::UserVerifyingSigningKey> user_verifying_key_;
-  std::unique_ptr<crypto::UnexportableSigningKey> hardware_key_;
+  scoped_refptr<crypto::RefCountedUserVerifyingSigningKey> user_verifying_key_;
+  scoped_refptr<unexportable_keys::RefCountedUnexportableSigningKey>
+      hardware_key_;
 
   unsigned store_keys_count_ = 0;
 
diff --git a/chrome/build/android-arm32.pgo.txt b/chrome/build/android-arm32.pgo.txt
index 31175cd3..a7f2d83 100644
--- a/chrome/build/android-arm32.pgo.txt
+++ b/chrome/build/android-arm32.pgo.txt
@@ -1 +1 @@
-chrome-android32-main-1709143178-65dac0521eb92bb53d035f9de5c0765be3bd6ef9-9a354d5fa97fbe84ba3e505ef4efbb4252c24d52.profdata
+chrome-android32-main-1709164492-6288f66c85f9dc6799707634bc3a1860e9d514b2-19f774aa7739fac564fc3816b1c5d1f5596db9ab.profdata
diff --git a/chrome/build/android-arm64.pgo.txt b/chrome/build/android-arm64.pgo.txt
index e0188bb..a3b255e 100644
--- a/chrome/build/android-arm64.pgo.txt
+++ b/chrome/build/android-arm64.pgo.txt
@@ -1 +1 @@
-chrome-android64-main-1708926528-992620d1af7c4535ec04740351ebee2c1fad3db5-a0d0eea908a503fce041d3898ea7efc5ec6d9d76.profdata
+chrome-android64-main-1709164492-a67274d9d49053edd12d639acde708873ac499fc-19f774aa7739fac564fc3816b1c5d1f5596db9ab.profdata
diff --git a/chrome/build/lacros64.pgo.txt b/chrome/build/lacros64.pgo.txt
index 52d39c2..aafb52e 100644
--- a/chrome/build/lacros64.pgo.txt
+++ b/chrome/build/lacros64.pgo.txt
@@ -1 +1 @@
-chrome-chromeos-amd64-generic-main-1709121404-bd960e9e1bd6d75b3d2b4783dc3bbf4a68ad9206-f6623eb6d142f3e4d94215f828ee6bb0385b1c28.profdata
+chrome-chromeos-amd64-generic-main-1709165066-f387441f648140474013ded2e54060d388c767ea-6117e6581f4d9ba29be59a80f033d762eb21b27b.profdata
diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt
index f56bc98b..bc4c572 100644
--- a/chrome/build/mac-arm.pgo.txt
+++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@
-chrome-mac-arm-main-1709157524-f6b6dfc6ae299d0dbef25106b443325b21029d5d-84122957866874d9eab68741e6e14b979bd64cfe.profdata
+chrome-mac-arm-main-1709178867-df03373861caa8b82efa8359359cd07254332c76-6046afcc87040c3b54b2c48838f0b797c71f510c.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt
index 6e34914..9eae478 100644
--- a/chrome/build/mac.pgo.txt
+++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@
-chrome-mac-main-1709143178-83784e174694060e494b01fa4ef429f19e7e27d0-9a354d5fa97fbe84ba3e505ef4efbb4252c24d52.profdata
+chrome-mac-main-1709164492-206dd0714e97f2cc11a2279e72dcfe214277a020-19f774aa7739fac564fc3816b1c5d1f5596db9ab.profdata
diff --git a/chrome/build/win-arm64.pgo.txt b/chrome/build/win-arm64.pgo.txt
index 3cbc27a..79a11d01 100644
--- a/chrome/build/win-arm64.pgo.txt
+++ b/chrome/build/win-arm64.pgo.txt
@@ -1 +1 @@
-chrome-win-arm64-main-1709143178-5e3924fbe75cc7359b75bbbb82eb6d205d601aca-9a354d5fa97fbe84ba3e505ef4efbb4252c24d52.profdata
+chrome-win-arm64-main-1709164492-de17ea76f0d4d78c8045ececd53014373fd50ecc-19f774aa7739fac564fc3816b1c5d1f5596db9ab.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt
index 219b860..8c97a93 100644
--- a/chrome/build/win32.pgo.txt
+++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@
-chrome-win32-main-1709143178-d5cf5b1a8b09287988dcfcce1162f5cc08907840-9a354d5fa97fbe84ba3e505ef4efbb4252c24d52.profdata
+chrome-win32-main-1709164492-253bd6167de3270ba7ff11b7de3142addf91a091-19f774aa7739fac564fc3816b1c5d1f5596db9ab.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt
index 682479d1..f4e8fba 100644
--- a/chrome/build/win64.pgo.txt
+++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@
-chrome-win64-main-1709143178-9e0fbd476d29c700234355aa3ceb5004fda2d907-9a354d5fa97fbe84ba3e505ef4efbb4252c24d52.profdata
+chrome-win64-main-1709164492-273b526152379e597770e53a70c963e24842c057-19f774aa7739fac564fc3816b1c5d1f5596db9ab.profdata
diff --git a/chrome/common/extensions/api/autotest_private.idl b/chrome/common/extensions/api/autotest_private.idl
index 8860bff..aecc3028 100644
--- a/chrome/common/extensions/api/autotest_private.idl
+++ b/chrome/common/extensions/api/autotest_private.idl
@@ -290,7 +290,6 @@
     Unavailable,
     Stopped,
     PreparingForLaunch,
-    WaitingOwnerFetch,
     PreLaunched,
     Starting,
     Running,
diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chrome/renderer/accessibility/read_anything_app_controller.cc
index 6dda0d3..b9a5bb0 100644
--- a/chrome/renderer/accessibility/read_anything_app_controller.cc
+++ b/chrome/renderer/accessibility/read_anything_app_controller.cc
@@ -43,6 +43,7 @@
 #include "ui/accessibility/ax_tree_serializer.h"
 #include "ui/accessibility/ax_tree_update.h"
 #include "ui/accessibility/mojom/ax_event.mojom.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/url_util.h"
 #include "v8/include/v8-context.h"
@@ -53,6 +54,8 @@
 
 namespace {
 
+constexpr char kUndeterminedLocale[] = "und";
+
 // The following methods convert v8::Value types to an AXTreeUpdate. This is not
 // a complete conversion (thus way gin::Converter<ui::AXTreeUpdate> is not used
 // or implemented) but just converting the bare minimum data types needed for
@@ -789,8 +792,9 @@
                  &ReadAnythingAppController::MovePositionToPreviousGranularity)
       .SetMethod("requestImageDataUrl",
                  &ReadAnythingAppController::RequestImageDataUrl)
-      .SetMethod("getImageDataUrl",
-                 &ReadAnythingAppController::GetImageDataUrl);
+      .SetMethod("getImageDataUrl", &ReadAnythingAppController::GetImageDataUrl)
+      .SetMethod("getDisplayNameForLocale",
+                 &ReadAnythingAppController::GetDisplayNameForLocale);
 }
 
 ui::AXNodeID ReadAnythingAppController::RootId() const {
@@ -1087,6 +1091,31 @@
   return model_.GetImageDataUrl(node_id);
 }
 
+const std::string ReadAnythingAppController::GetDisplayNameForLocale(
+    const std::string& locale,
+    const std::string& display_locale) const {
+  bool found_valid_result = false;
+  std::string locale_result;
+  if (l10n_util::IsValidLocaleSyntax(locale) &&
+      l10n_util::IsValidLocaleSyntax(display_locale)) {
+    locale_result = base::UTF16ToUTF8(l10n_util::GetDisplayNameForLocale(
+        locale, display_locale, /*is_for_ui=*/true));
+    // Check for valid locales before getting the display name.
+    // The ICU Locale class returns "und" for undetermined locales, and
+    // returns the locale string directly if it has no translation.
+    // Treat these cases as invalid results.
+    found_valid_result =
+        locale_result != kUndeterminedLocale && locale_result != locale;
+  }
+
+  // Return an empty string to communicate there's no display name.
+  if (!found_valid_result) {
+    locale_result = std::string();
+  }
+
+  return locale_result;
+}
+
 const std::string& ReadAnythingAppController::GetLanguageCodeForSpeech() const {
   // TODO(crbug.com/1474951): Instead of returning the default browser language
   // we should use the page language.
diff --git a/chrome/renderer/accessibility/read_anything_app_controller.h b/chrome/renderer/accessibility/read_anything_app_controller.h
index 0da0a9e..59593d05 100644
--- a/chrome/renderer/accessibility/read_anything_app_controller.h
+++ b/chrome/renderer/accessibility/read_anything_app_controller.h
@@ -192,6 +192,10 @@
   // supported for speech.
   const std::string& GetLanguageCodeForSpeech() const;
 
+  const std::string GetDisplayNameForLocale(
+      const std::string& locale,
+      const std::string& display_locale) const;
+
   void Distill();
   void Draw();
   void DrawSelection();
diff --git a/chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc b/chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc
index 8369667..40c613e 100644
--- a/chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc
+++ b/chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc
@@ -330,6 +330,11 @@
     return controller_->GetChildren(ax_node_id);
   }
 
+  std::string GetDisplayNameForLocale(std::string locale,
+                                      std::string display_locale) {
+    return controller_->GetDisplayNameForLocale(locale, display_locale);
+  }
+
   std::string GetDataFontCss(ui::AXNodeID ax_node_id) {
     return controller_->GetDataFontCss(ax_node_id);
   }
@@ -984,6 +989,16 @@
   EXPECT_EQ("", GetTextContent(3));
 }
 
+TEST_F(ReadAnythingAppControllerTest, GetDisplayNameForLocale) {
+  EXPECT_EQ(GetDisplayNameForLocale("en-US", "en"), "English (United States)");
+  EXPECT_EQ(GetDisplayNameForLocale("en-US", "es"), "inglés (Estados Unidos)");
+  EXPECT_EQ(GetDisplayNameForLocale("en-US", "en-US"),
+            "English (United States)");
+  EXPECT_EQ(GetDisplayNameForLocale("en-UK", "en"), "English (United Kingdom)");
+  EXPECT_EQ(GetDisplayNameForLocale("en-UK", "foo5"), "");
+  EXPECT_EQ(GetDisplayNameForLocale("foo", "en"), "");
+}
+
 TEST_F(ReadAnythingAppControllerTest, GetUrl) {
   std::string http_url = "http://www.google.com";
   std::string https_url = "https://www.google.com";
diff --git a/chrome/test/base/chromeos/crosier/ash_integration_test.cc b/chrome/test/base/chromeos/crosier/ash_integration_test.cc
index f603d21..0a9f6f28 100644
--- a/chrome/test/base/chromeos/crosier/ash_integration_test.cc
+++ b/chrome/test/base/chromeos/crosier/ash_integration_test.cc
@@ -57,7 +57,7 @@
   // test uses BrowserManager::Get() to install the fake waiter (e.g. in
   // SetUpOnMainThread) often the existing device ownership waiter has already
   // been called and its too late to install the fake.
-  crosapi::BrowserManager::SkipDeviceOwnershipWaitForTesting(true);
+  crosapi::BrowserLauncher::SkipDeviceOwnershipWaitForTesting(true);
 }
 
 void AshIntegrationTest::WaitForAshFullyStarted() {
diff --git a/chrome/test/data/pdf/basic_plugin_test.ts b/chrome/test/data/pdf/basic_plugin_test.ts
index bf0777f4..5937dfd2 100644
--- a/chrome/test/data/pdf/basic_plugin_test.ts
+++ b/chrome/test/data/pdf/basic_plugin_test.ts
@@ -7,6 +7,8 @@
 import {PluginController} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {pressAndReleaseKeyOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 
+import {checkPdfTitleIsExpectedTitle} from './test_util.js';
+
 function getSelectedText(client: PdfScriptingApi): Promise<string> {
   return new Promise((resolve) => client.getSelectedText(resolve));
 }
@@ -112,7 +114,7 @@
    * Test that the filename is used as the title.pdf.
    */
   function testHasCorrectTitle() {
-    chrome.test.assertEq('test.pdf', document.title);
+    chrome.test.assertTrue(checkPdfTitleIsExpectedTitle('test.pdf'));
     chrome.test.succeed();
   },
 ]);
diff --git a/chrome/test/data/pdf/layout_test.ts b/chrome/test/data/pdf/layout_test.ts
index 3054a559..8965fb41 100644
--- a/chrome/test/data/pdf/layout_test.ts
+++ b/chrome/test/data/pdf/layout_test.ts
@@ -48,8 +48,9 @@
   ],
 };
 
-if (document.title in perLayoutTests) {
-  chrome.test.runTests(tests.concat(perLayoutTests[document.title]!));
+const viewer = document.body.querySelector<PdfViewerElement>('#viewer')!;
+if (viewer.pdfTitle in perLayoutTests) {
+  chrome.test.runTests(tests.concat(perLayoutTests[viewer.pdfTitle]!));
 } else {
-  chrome.test.fail(document.title);
+  chrome.test.fail(viewer.pdfTitle);
 }
diff --git a/chrome/test/data/pdf/test_util.ts b/chrome/test/data/pdf/test_util.ts
index 52e36e8..05726d0 100644
--- a/chrome/test/data/pdf/test_util.ts
+++ b/chrome/test/data/pdf/test_util.ts
@@ -4,7 +4,7 @@
 
 // Utilities that are used in multiple tests.
 
-import type {Bookmark, DocumentDimensions, LayoutOptions} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
+import type {Bookmark, DocumentDimensions, LayoutOptions, PdfViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {Viewport} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
@@ -230,6 +230,24 @@
 }
 
 /**
+ * Checks if the PDF title matches the expected title.
+ * @param expectedTitle The expected title of the PDF.
+ * @return True if the PDF title matches the expected title, false otherwise.
+ */
+export function checkPdfTitleIsExpectedTitle(expectedTitle: string): boolean {
+  const viewer = document.body.querySelector<PdfViewerElement>('#viewer')!;
+  // Tab title is updated only when document.title is called in a top-level
+  // document (`main_frame` of `WebContents`). For OOPIF PDF viewer, the current
+  // document is the child of a top-level document, hence document.title is not
+  // set and therefore validation is unnecessary.
+  if (!viewer.isPdfOopifEnabled && expectedTitle !== document.title) {
+    return false;
+  }
+
+  return expectedTitle === viewer.pdfTitle;
+}
+
+/**
  * Create a viewport with basic default zoom values.
  * @param sizer The element which represents the size of the document in the
  *     viewport.
diff --git a/chrome/test/data/pdf/title_test.ts b/chrome/test/data/pdf/title_test.ts
index 843961b5..48f88ee 100644
--- a/chrome/test/data/pdf/title_test.ts
+++ b/chrome/test/data/pdf/title_test.ts
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {checkPdfTitleIsExpectedTitle} from './test_util.js';
+
 chrome.test.runTests([
   /**
    * Test that the correct title is displayed for test-title.pdf.
    */
   function testHasCorrectTitle() {
-    chrome.test.assertEq('PDF title test', document.title);
+    chrome.test.assertTrue(checkPdfTitleIsExpectedTitle('PDF title test'));
 
     chrome.test.succeed();
   },
diff --git a/chrome/test/data/pdf/whitespace_title_test.ts b/chrome/test/data/pdf/whitespace_title_test.ts
index 0e48a97..da02b2b5 100644
--- a/chrome/test/data/pdf/whitespace_title_test.ts
+++ b/chrome/test/data/pdf/whitespace_title_test.ts
@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {checkPdfTitleIsExpectedTitle} from './test_util.js';
+
 chrome.test.runTests([
   /**
    * Test that the correct title is displayed for test-whitespace-title.pdf.
    */
   function testHasCorrectTitle() {
-    chrome.test.assertEq('test-whitespace-title.pdf', document.title);
+    chrome.test.assertTrue(
+        checkPdfTitleIsExpectedTitle('test-whitespace-title.pdf'));
 
     chrome.test.succeed();
   },
diff --git a/chrome/test/data/webui/side_panel/read_anything/BUILD.gn b/chrome/test/data/webui/side_panel/read_anything/BUILD.gn
index 6b85d8d6..05d7c0b 100644
--- a/chrome/test/data/webui/side_panel/read_anything/BUILD.gn
+++ b/chrome/test/data/webui/side_panel/read_anything/BUILD.gn
@@ -20,6 +20,7 @@
     "app_font_change_test.ts",
     "test_color_updater_browser_proxy.ts",
     "read_aloud_links_toggled.ts",
+    "update_content_selection.ts",
   ]
 
   ts_definitions = [
diff --git a/chrome/test/data/webui/side_panel/read_anything/read_anything_browsertest.cc b/chrome/test/data/webui/side_panel/read_anything/read_anything_browsertest.cc
index caea016c..914b064 100644
--- a/chrome/test/data/webui/side_panel/read_anything/read_anything_browsertest.cc
+++ b/chrome/test/data/webui/side_panel/read_anything/read_anything_browsertest.cc
@@ -82,6 +82,11 @@
                    "mocha.run()");
 }
 
+IN_PROC_BROWSER_TEST_F(ReadAnythingMochaTest, UpdateContentSelection) {
+  RunSidePanelTest("side_panel/read_anything/update_content_selection.js",
+                   "mocha.run()");
+}
+
 // Integration tests that need the actual Read Aloud flag enabled because they
 // use the full C++ pipeline
 class ReadAloudMochaTest : public ReadAnythingMochaBrowserTest {
diff --git a/chrome/test/data/webui/side_panel/read_anything/update_content_selection.js b/chrome/test/data/webui/side_panel/read_anything/update_content_selection.js
deleted file mode 100644
index cc3207e..0000000
--- a/chrome/test/data/webui/side_panel/read_anything/update_content_selection.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2023 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// out/Debug/browser_tests \
-//    --gtest_filter=ReadAnythingAppTest.UpdateContent_Selection
-
-// Do not call the real `onConnected()`. As defined in
-// ReadAnythingAppController, onConnected creates mojo pipes to connect to the
-// rest of the Read Anything feature, which we are not testing here.
-(() => {
-  chrome.readingMode.onConnected = () => {};
-
-  const readAnythingApp =
-      document.querySelector('read-anything-app').shadowRoot;
-  const container = readAnythingApp.getElementById('container');
-  let result = true;
-
-  const assertEquals = (actual, expected) => {
-    const isEqual = actual === expected;
-    if (!isEqual) {
-      console.error(
-          'Expected: ' + JSON.stringify(expected) + ', ' +
-          'Actual: ' + JSON.stringify(actual));
-    }
-    result = result && isEqual;
-    return isEqual;
-  };
-
-  const assertContainerInnerHTML = (expected) => {
-    const actual = container.innerHTML;
-    assertEquals(actual, expected);
-  };
-
-  const setOnSelectionChangeForTest = () => {
-    // This is called by readAnythingApp onselectionchange. It is usually
-    // implemented by ReadAnythingAppController which forwards these
-    // arguments to the browser process in the form of an
-    // AXEventNotificationDetail. Instead, we capture the arguments here and
-    // verify their values. Since onselectionchange is called
-    // asynchronously, the test must wait for this function to be called;
-    // therefore we fire a custom event on-selection-change-for-text here
-    // for the test to await.
-    chrome.readingMode.onSelectionChange =
-        (anchorNodeId, anchorOffset, focusNodeId, focusOffset) => {
-          readAnythingApp.dispatchEvent(
-              new CustomEvent('on-selection-change-for-test', {
-                detail: {
-                  anchorNodeId: anchorNodeId,
-                  anchorOffset: anchorOffset,
-                  focusNodeId: focusNodeId,
-                  focusOffset: focusOffset,
-                },
-              }));
-        };
-  };
-
-  // root htmlTag='#document' id=1
-  // ++paragraph htmlTag='p' id=2
-  // ++++staticText name='Hello' id=3
-  // ++paragraph htmlTag='p' id=4
-  // ++++staticText name='World' id=5
-  // ++paragraph htmlTag='p' id=6
-  // ++++staticText name='Friend' id=7
-  // ++++staticText name='!' id=8
-  const axTree = {
-    rootId: 1,
-    nodes: [
-      {
-        id: 1,
-        role: 'rootWebArea',
-        htmlTag: '#document',
-        childIds: [2, 4, 6],
-      },
-      {
-        id: 2,
-        role: 'paragraph',
-        htmlTag: 'p',
-        childIds: [3],
-      },
-      {
-        id: 3,
-        role: 'staticText',
-        name: 'Hello',
-      },
-      {
-        id: 4,
-        role: 'paragraph',
-        htmlTag: 'p',
-        childIds: [5],
-      },
-      {
-        id: 5,
-        role: 'staticText',
-        name: 'World',
-      },
-      {
-        id: 6,
-        role: 'paragraph',
-        htmlTag: 'p',
-        childIds: [7, 8],
-      },
-      {
-        id: 7,
-        role: 'staticText',
-        name: 'Friend',
-      },
-      {
-        id: 8,
-        role: 'staticText',
-        name: '!',
-      },
-    ],
-    selection: {
-      anchor_object_id: 5,
-      focus_object_id: 7,
-      anchor_offset: 1,
-      focus_offset: 2,
-      is_backward: false,
-    },
-  };
-  setOnSelectionChangeForTest();
-  chrome.readingMode.setContentForTesting(axTree, []);
-  // The expected string contains the complete text of each node in the
-  // selection.
-  const expected = '<div><p>World</p><p>Friend!</p></div>';
-  assertContainerInnerHTML(expected);
-  const selection = readAnythingApp.getSelection();
-  assertEquals(selection.anchorNode.textContent, 'World');
-  assertEquals(selection.focusNode.textContent, 'Friend');
-  assertEquals(selection.anchorOffset, 1);
-  assertEquals(selection.focusOffset, 2);
-
-  return result;
-})();
diff --git a/chrome/test/data/webui/side_panel/read_anything/update_content_selection.ts b/chrome/test/data/webui/side_panel/read_anything/update_content_selection.ts
new file mode 100644
index 0000000..854bc9e7
--- /dev/null
+++ b/chrome/test/data/webui/side_panel/read_anything/update_content_selection.ts
@@ -0,0 +1,133 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import 'chrome-untrusted://read-anything-side-panel.top-chrome/read_anything_toolbar.js';
+
+import {BrowserProxy} from '//resources/cr_components/color_change_listener/browser_proxy.js';
+import type {ReadAnythingElement} from 'chrome-untrusted://read-anything-side-panel.top-chrome/app.js';
+import {assertEquals} from 'chrome-untrusted://webui-test/chai_assert.js';
+
+import {TestColorUpdaterBrowserProxy} from './test_color_updater_browser_proxy.js';
+
+suite('UpdateContentSelection', () => {
+  let app: ReadAnythingElement;
+  let testBrowserProxy: TestColorUpdaterBrowserProxy;
+
+  // root htmlTag='#document' id=1
+  // ++paragraph htmlTag='p' id=2
+  // ++++staticText name='Hello' id=3
+  // ++paragraph htmlTag='p' id=4
+  // ++++staticText name='World' id=5
+  // ++paragraph htmlTag='p' id=6
+  // ++++staticText name='Friend' id=7
+  // ++++staticText name='!' id=8
+  const axTree = {
+    rootId: 1,
+    nodes: [
+      {
+        id: 1,
+        role: 'rootWebArea',
+        htmlTag: '#document',
+        childIds: [2, 4, 6],
+      },
+      {
+        id: 2,
+        role: 'paragraph',
+        htmlTag: 'p',
+        childIds: [3],
+      },
+      {
+        id: 3,
+        role: 'staticText',
+        name: 'Hello',
+      },
+      {
+        id: 4,
+        role: 'paragraph',
+        htmlTag: 'p',
+        childIds: [5],
+      },
+      {
+        id: 5,
+        role: 'staticText',
+        name: 'World',
+      },
+      {
+        id: 6,
+        role: 'paragraph',
+        htmlTag: 'p',
+        childIds: [7, 8],
+      },
+      {
+        id: 7,
+        role: 'staticText',
+        name: 'Friend',
+      },
+      {
+        id: 8,
+        role: 'staticText',
+        name: '!',
+      },
+    ],
+    selection: {
+      anchor_object_id: 5,
+      focus_object_id: 7,
+      anchor_offset: 1,
+      focus_offset: 2,
+      is_backward: false,
+    },
+  };
+
+  /**
+   * Suppresses harmless ResizeObserver errors due to a browser bug.
+   * yaqs/2300708289911980032
+   */
+  function suppressInnocuousErrors() {
+    const onerror = window.onerror;
+    window.onerror = (message, url, lineNumber, column, error) => {
+      if ([
+            'ResizeObserver loop limit exceeded',
+            'ResizeObserver loop completed with undelivered notifications.',
+          ].includes(message.toString())) {
+        console.info('Suppressed ResizeObserver error: ', message);
+        return;
+      }
+      if (onerror) {
+        onerror.apply(window, [message, url, lineNumber, column, error]);
+      }
+    };
+  }
+
+  setup(() => {
+    suppressInnocuousErrors();
+    testBrowserProxy = new TestColorUpdaterBrowserProxy();
+    BrowserProxy.setInstance(testBrowserProxy);
+    document.body.innerHTML = window.trustedTypes!.emptyHTML;
+    // Do not call the real `onConnected()`. As defined in
+    // ReadAnythingAppController, onConnected creates mojo pipes to connect to
+    // the rest of the Read Anything feature, which we are not testing here.
+    chrome.readingMode.onConnected = () => {};
+
+    app = document.createElement('read-anything-app');
+    document.body.appendChild(app);
+    chrome.readingMode.setContentForTesting(axTree, []);
+  });
+
+  suite('WithSelection', () => {
+    test('InnerHtmlCorrect', () => {
+      const expected = '<div><p>World</p><p>Friend!</p></div>';
+      const innerHTML = app.$.container.innerHTML;
+      assertEquals(innerHTML, expected);
+    });
+
+    test('CorrectContentSelected', () => {
+      // Calling shadowRoot.getSelection directly is not supported in TS tests,
+      // so use a helper to get the selection from the app instead.
+      const selection = app.getSelection();
+      assertEquals(selection.anchorNode.textContent, 'World');
+      assertEquals(selection.focusNode.textContent, 'Friend');
+      assertEquals(selection.anchorOffset, 1);
+      assertEquals(selection.focusOffset, 2);
+    });
+  });
+});
diff --git a/chrome/test/data/webui/tab_search/tab_organization_page_test.ts b/chrome/test/data/webui/tab_search/tab_organization_page_test.ts
index 00919ab..579d0e8 100644
--- a/chrome/test/data/webui/tab_search/tab_organization_page_test.ts
+++ b/chrome/test/data/webui/tab_search/tab_organization_page_test.ts
@@ -277,7 +277,10 @@
     assertTrue(!!results);
     const group = results.shadowRoot!.querySelector('tab-organization-group');
     assertTrue(!!group);
-    const createGroupButton = group.shadowRoot!.querySelector('cr-button');
+    const actions =
+        group.shadowRoot!.querySelector('tab-organization-results-actions');
+    assertTrue(!!actions);
+    const createGroupButton = actions.shadowRoot!.querySelector('cr-button');
     assertTrue(!!createGroupButton);
     createGroupButton.click();
     await flushTasks();
@@ -318,6 +321,7 @@
     loadTimeData.overrideValues({
       tabOrganizationRefreshButtonEnabled: true,
       rejectFinalSuggestion: rejectFinalSuggestion,
+      multiTabOrganizationEnabled: false,
     });
 
     await tabOrganizationPageSetup();
@@ -333,7 +337,10 @@
     assertTrue(!!results);
     const group = results.shadowRoot!.querySelector('tab-organization-group');
     assertTrue(!!group);
-    const refreshButton = group.shadowRoot!.querySelector('cr-button');
+    const actions =
+        group.shadowRoot!.querySelector('tab-organization-results-actions');
+    assertTrue(!!actions);
+    const refreshButton = actions.shadowRoot!.querySelector('cr-button');
     assertTrue(!!refreshButton);
     assertTrue(refreshButton.innerHTML.includes(rejectFinalSuggestion));
     refreshButton.click();
@@ -350,6 +357,7 @@
         loadTimeData.overrideValues({
           tabOrganizationRefreshButtonEnabled: true,
           rejectSuggestion: rejectSuggestion,
+          multiTabOrganizationEnabled: false,
         });
 
         await tabOrganizationPageSetup();
@@ -390,7 +398,10 @@
         const group =
             results.shadowRoot!.querySelector('tab-organization-group');
         assertTrue(!!group);
-        const refreshButton = group.shadowRoot!.querySelector('cr-button');
+        const actions =
+            group.shadowRoot!.querySelector('tab-organization-results-actions');
+        assertTrue(!!actions);
+        const refreshButton = actions.shadowRoot!.querySelector('cr-button');
         assertTrue(!!refreshButton);
         assertTrue(refreshButton.innerHTML.includes(rejectSuggestion));
       });
diff --git a/chrome/updater/test/integration_test_commands_system.cc b/chrome/updater/test/integration_test_commands_system.cc
index 22fe0f2..bc05698 100644
--- a/chrome/updater/test/integration_test_commands_system.cc
+++ b/chrome/updater/test/integration_test_commands_system.cc
@@ -190,11 +190,12 @@
   }
 
   void ExpectVersionActive(const std::string& version) const override {
-    RunCommand("expect_version_active", {Param("version", version)});
+    RunCommand("expect_version_active", {Param("updater_version", version)});
   }
 
   void ExpectVersionNotActive(const std::string& version) const override {
-    RunCommand("expect_version_not_active", {Param("version", version)});
+    RunCommand("expect_version_not_active",
+               {Param("updater_version", version)});
   }
 
   void ExpectActive(const std::string& app_id) const override {
@@ -247,8 +248,9 @@
 
   void ExpectAppVersion(const std::string& app_id,
                         const base::Version& version) const override {
-    RunCommand("expect_app_version", {Param("app_id", app_id),
-                                      Param("version", version.GetString())});
+    RunCommand(
+        "expect_app_version",
+        {Param("app_id", app_id), Param("app_version", version.GetString())});
   }
 
   void SetActive(const std::string& app_id) const override {
@@ -310,7 +312,7 @@
   void InstallApp(const std::string& app_id,
                   const base::Version& version) const override {
     RunCommand("install_app", {Param("app_id", app_id),
-                               Param("version", version.GetString())});
+                               Param("app_version", version.GetString())});
   }
 
   bool WaitForUpdaterExit() const override {
@@ -441,9 +443,9 @@
 
   void RunRecoveryComponent(const std::string& app_id,
                             const base::Version& version) const override {
-    RunCommand(
-        "run_recovery_component",
-        {Param("app_id", app_id), Param("version", version.GetString())});
+    RunCommand("run_recovery_component",
+               {Param("app_id", app_id),
+                Param("browser_version", version.GetString())});
   }
 
   void SetLastChecked(const base::Time& time) const override {
diff --git a/chrome/updater/test/integration_tests_helper.cc b/chrome/updater/test/integration_tests_helper.cc
index b0cf819..08deda22 100644
--- a/chrome/updater/test/integration_tests_helper.cc
+++ b/chrome/updater/test/integration_tests_helper.cc
@@ -310,7 +310,7 @@
                                         WithSystemScope(Wrap(&ExpectAppTag))))},
           {"expect_app_version",
            WithSwitch(
-               "version",
+               "app_version",
                WithSwitch("app_id", WithSystemScope(Wrap(&ExpectAppVersion))))},
           {"expect_candidate_uninstalled",
            WithSystemScope(Wrap(&ExpectCandidateUninstalled))},
@@ -354,9 +354,10 @@
            WithSwitch("app_id", WithSystemScope(Wrap(&RunHandoff)))},
 #endif  // BUILDFLAG(IS_WIN)
           {"expect_version_active",
-           WithSwitch("version", WithSystemScope(Wrap(&ExpectVersionActive)))},
+           WithSwitch("updater_version",
+                      WithSystemScope(Wrap(&ExpectVersionActive)))},
           {"expect_version_not_active",
-           WithSwitch("version",
+           WithSwitch("updater_version",
                       WithSystemScope(Wrap(&ExpectVersionNotActive)))},
           {"install", WithSystemScope(Wrap(&Install))},
           {"install_updater_and_app",
@@ -395,8 +396,8 @@
           {"delete_file",
            (WithSwitch("path", WithSystemScope(Wrap(&DeleteFile))))},
           {"install_app",
-           WithSwitch("version", WithSwitch("app_id", WithSystemScope(
-                                                          Wrap(&InstallApp))))},
+           WithSwitch("app_version", WithSwitch("app_id", WithSystemScope(Wrap(
+                                                              &InstallApp))))},
           {"install_app_via_service",
            WithSwitch("expected_final_values",
                       WithSwitch("app_id", WithSystemScope(
@@ -441,7 +442,7 @@
           {"expect_legacy_updater_migrated",
            WithSystemScope(Wrap(&ExpectLegacyUpdaterMigrated))},
           {"run_recovery_component",
-           WithSwitch("version",
+           WithSwitch("browser_version",
                       WithSwitch("app_id", WithSystemScope(
                                                Wrap(&RunRecoveryComponent))))},
           {"set_last_checked",
diff --git a/chrome/updater/tools/BUILD.gn b/chrome/updater/tools/BUILD.gn
index 51296f9..5a2b5f93 100644
--- a/chrome/updater/tools/BUILD.gn
+++ b/chrome/updater/tools/BUILD.gn
@@ -56,16 +56,6 @@
     "//chrome/updater:base",
     "//chrome/updater:constants_prod",
     "//chrome/updater:external_constants",
-  ]
-}
-
-executable("dm_policy_dump") {
-  sources = [ "dm_policy_dump.cc" ]
-  deps = [
-    "//base",
-    "//chrome/updater:base",
-    "//chrome/updater:constants_prod",
-    "//chrome/updater:external_constants",
     "//chrome/updater/protos:omaha_proto",
     "//components/policy/proto",
   ]
diff --git a/chrome/updater/tools/dm_policy_dump.cc b/chrome/updater/tools/dm_policy_dump.cc
deleted file mode 100644
index 84fba23b..0000000
--- a/chrome/updater/tools/dm_policy_dump.cc
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2023 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <iostream>
-#include <memory>
-#include <string>
-
-#include "base/base64.h"
-#include "base/files/file_enumerator.h"
-#include "base/files/file_path.h"
-#include "base/memory/scoped_refptr.h"
-#include "chrome/updater/device_management/dm_cached_policy_info.h"
-#include "chrome/updater/device_management/dm_storage.h"
-#include "chrome/updater/protos/omaha_settings.pb.h"
-#include "components/policy/proto/device_management_backend.pb.h"
-
-namespace updater {
-namespace {
-
-std::string UpdateValueAsString(
-    ::wireless_android_enterprise_devicemanagement::UpdateValue value) {
-  switch (value) {
-    case ::wireless_android_enterprise_devicemanagement::UPDATES_DISABLED:
-      return "Disabled";
-    case ::wireless_android_enterprise_devicemanagement::MANUAL_UPDATES_ONLY:
-      return "Manual Updates Only";
-    case ::wireless_android_enterprise_devicemanagement::AUTOMATIC_UPDATES_ONLY:
-      return "Automatic Updates Only";
-    case ::wireless_android_enterprise_devicemanagement::UPDATES_ENABLED:
-    default:
-      return "Enabled";
-  }
-}
-
-std::string InstallDefaultValueAsString(
-    ::wireless_android_enterprise_devicemanagement::InstallDefaultValue value) {
-  switch (value) {
-    case ::wireless_android_enterprise_devicemanagement::
-        INSTALL_DEFAULT_DISABLED:
-      return "Disabled";
-    case ::wireless_android_enterprise_devicemanagement::
-        INSTALL_DEFAULT_ENABLED_MACHINE_ONLY:
-      return "Enabled Machine Only";
-    case ::wireless_android_enterprise_devicemanagement::
-        INSTALL_DEFAULT_ENABLED:
-    default:
-      return "Enabled";
-  }
-}
-
-std::string InstallValueAsString(
-    ::wireless_android_enterprise_devicemanagement::InstallValue value) {
-  switch (value) {
-    case ::wireless_android_enterprise_devicemanagement::INSTALL_DISABLED:
-      return "Disabled";
-    case ::wireless_android_enterprise_devicemanagement::
-        INSTALL_ENABLED_MACHINE_ONLY:
-      return "Enabled Machine Only";
-    case ::wireless_android_enterprise_devicemanagement::INSTALL_FORCED:
-      return "Forced";
-    case ::wireless_android_enterprise_devicemanagement::INSTALL_ENABLED:
-    default:
-      return "Enabled";
-  }
-}
-
-void PrintPolicies() {
-  scoped_refptr<DMStorage> storage = GetDefaultDMStorage();
-  if (!storage) {
-    std::cerr << "Failed to instantiate DM storage instance." << std::endl;
-    return;
-  }
-
-  std::cout << "-------------------------------------------------" << std::endl;
-  std::cout << "Device ID: " << storage->GetDeviceID() << std::endl;
-  std::cout << "Enrollment token: " << storage->GetEnrollmentToken()
-            << std::endl;
-  std::cout << "DM token: " << storage->GetDmToken() << std::endl;
-  std::cout << "-------------------------------------------------" << std::endl;
-
-  std::unique_ptr<CachedPolicyInfo> cached_info =
-      storage->GetCachedPolicyInfo();
-  if (cached_info) {
-    std::cout << "Cached policy info (for subsequent policy fetch):"
-              << std::endl;
-    if (cached_info->has_key_version()) {
-      std::cout << "  Key version: " << cached_info->key_version() << std::endl;
-      std::cout << "  Key size: " << cached_info->public_key().size()
-                << std::endl;
-    }
-    std::cout << "  Timestamp: " << cached_info->timestamp() << std::endl;
-  }
-  std::cout << "-------------------------------------------------" << std::endl;
-
-  std::unique_ptr<
-      ::wireless_android_enterprise_devicemanagement::OmahaSettingsClientProto>
-      omaha_settings = storage->GetOmahaPolicySettings();
-  if (omaha_settings) {
-    bool has_global_policy = false;
-    std::cout << "Global policies:" << std::endl;
-    if (omaha_settings->has_install_default()) {
-      std::cout << "  InstallDefault: "
-                << InstallDefaultValueAsString(
-                       omaha_settings->install_default())
-                << "(" << omaha_settings->install_default() << ")" << std::endl;
-      has_global_policy = true;
-    }
-    if (omaha_settings->has_update_default()) {
-      std::cout << "  UpdateDefault: "
-                << UpdateValueAsString(omaha_settings->update_default()) << "("
-                << omaha_settings->update_default() << ")" << std::endl;
-      has_global_policy = true;
-    }
-    if (omaha_settings->has_auto_update_check_period_minutes()) {
-      std::cout << "  Auto-update check period minutes: "
-                << omaha_settings->auto_update_check_period_minutes()
-                << std::endl;
-      has_global_policy = true;
-    }
-    if (omaha_settings->has_updates_suppressed()) {
-      std::cout << "  Update suppressed: " << std::endl
-                << "      Start Hour: "
-                << omaha_settings->updates_suppressed().start_hour()
-                << std::endl
-                << "      Start Minute: "
-                << omaha_settings->updates_suppressed().start_minute()
-                << std::endl
-                << "      Durantion Minute: "
-                << omaha_settings->updates_suppressed().duration_min()
-                << std::endl;
-      has_global_policy = true;
-    }
-    if (omaha_settings->has_proxy_mode()) {
-      std::cout << "  Proxy Mode: " << omaha_settings->proxy_mode()
-                << std::endl;
-      has_global_policy = true;
-    }
-    if (omaha_settings->has_proxy_pac_url()) {
-      std::cout << "  Proxy PacURL: " << omaha_settings->proxy_pac_url()
-                << std::endl;
-      has_global_policy = true;
-    }
-    if (omaha_settings->has_proxy_server()) {
-      std::cout << "  Proxy Server: " << omaha_settings->proxy_server()
-                << std::endl;
-      has_global_policy = true;
-    }
-    if (omaha_settings->has_download_preference()) {
-      std::cout << "  DownloadPreference: "
-                << omaha_settings->download_preference() << std::endl;
-      has_global_policy = true;
-    }
-    if (!has_global_policy) {
-      std::cout << "  (No policy)" << std::endl;
-    }
-
-    for (const auto& app_settings : omaha_settings->application_settings()) {
-      bool has_policy = false;
-      if (app_settings.has_app_guid()) {
-        std::cout << "App : " << app_settings.app_guid();
-        if (app_settings.has_bundle_identifier()) {
-          std::cout << "(" << app_settings.bundle_identifier() << ")";
-        }
-        std::cout << std::endl;
-      }
-      if (app_settings.has_install()) {
-        std::cout << "  Install : "
-                  << InstallValueAsString(app_settings.install()) << "("
-                  << app_settings.install() << ")" << std::endl;
-        has_policy = true;
-      }
-      if (app_settings.has_update()) {
-        std::cout << "  Update : " << UpdateValueAsString(app_settings.update())
-                  << "(" << app_settings.update() << ")" << std::endl;
-        has_policy = true;
-      }
-      if (app_settings.has_rollback_to_target_version()) {
-        std::cout << "  RollbackToTargetVersionAllowed : "
-                  << app_settings.rollback_to_target_version() << std::endl;
-        has_policy = true;
-      }
-      if (app_settings.has_target_version_prefix()) {
-        std::cout << "  TargetVersionPrefix : "
-                  << app_settings.target_version_prefix() << std::endl;
-        has_policy = true;
-      }
-      if (app_settings.has_target_channel()) {
-        std::cout << "  TargetChannel : " << app_settings.target_channel()
-                  << std::endl;
-        has_policy = true;
-      }
-      if (app_settings.has_gcpw_application_settings()) {
-        std::cout << "  DomainsAllowedToLogin: ";
-        for (const auto& domain : app_settings.gcpw_application_settings()
-                                      .domains_allowed_to_login()) {
-          std::cout << domain << ", ";
-          has_policy = true;
-        }
-        std::cout << std::endl;
-      }
-      if (!has_policy) {
-        std::cout << "  (No policy)" << std::endl;
-      }
-    }
-  }
-  std::cout << "-------------------------------------------------" << std::endl;
-  std::cout << "Downloaded policy types:" << std::endl;
-  base::FileEnumerator(storage->policy_cache_folder(), false,
-                       base::FileEnumerator::DIRECTORIES)
-      .ForEach([](const base::FilePath& name) {
-        std::string policy_type;
-        if (base::Base64Decode(name.BaseName().MaybeAsASCII(), &policy_type)) {
-          std::cout << "  " << policy_type << std::endl;
-        }
-      });
-  std::cout << std::endl;
-}
-
-}  // namespace
-}  // namespace updater
-
-int main(int argc, char* argv[]) {
-  updater::PrintPolicies();
-}
diff --git a/chrome/updater/tools/updater_util.cc b/chrome/updater/tools/updater_util.cc
index fb7e2a9..5e7fc9f9 100644
--- a/chrome/updater/tools/updater_util.cc
+++ b/chrome/updater/tools/updater_util.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <iomanip>
 #include <iostream>
 #include <map>
 #include <string>
@@ -9,7 +10,9 @@
 #include <vector>
 
 #include "base/at_exit.h"
+#include "base/base64.h"
 #include "base/command_line.h"
+#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/functional/bind.h"
@@ -28,12 +31,17 @@
 #include "chrome/updater/app/app.h"
 #include "chrome/updater/configurator.h"
 #include "chrome/updater/constants.h"
+#include "chrome/updater/device_management/dm_cached_policy_info.h"
+#include "chrome/updater/device_management/dm_message.h"
+#include "chrome/updater/device_management/dm_storage.h"
 #include "chrome/updater/external_constants_default.h"
 #include "chrome/updater/ipc/ipc_support.h"
 #include "chrome/updater/policy/service.h"
 #include "chrome/updater/prefs.h"
+#include "chrome/updater/protos/omaha_settings.pb.h"
 #include "chrome/updater/service_proxy_factory.h"
 #include "chrome/updater/update_service.h"
+#include "components/policy/proto/device_management_backend.pb.h"
 
 namespace updater::tools {
 
@@ -42,9 +50,245 @@
 constexpr char kListAppsSwitch[] = "list-apps";
 constexpr char kListUpdateSwitch[] = "list-update";
 constexpr char kListPoliciesSwitch[] = "list-policies";
+constexpr char kListCBCMPoliciesSwitch[] = "list-cbcm-policies";
 constexpr char kJSONFormatSwitch[] = "json";
 constexpr char kUpdateSwitch[] = "update";
 
+namespace updater_policy {
+
+namespace edm = ::wireless_android_enterprise_devicemanagement;
+
+std::string UpdateValueAsString(edm::UpdateValue value) {
+  switch (value) {
+    case edm::UPDATES_DISABLED:
+      return "Disabled";
+    case edm::MANUAL_UPDATES_ONLY:
+      return "Manual Updates Only";
+    case edm::AUTOMATIC_UPDATES_ONLY:
+      return "Automatic Updates Only";
+    case edm::UPDATES_ENABLED:
+    default:
+      return "Enabled";
+  }
+}
+
+std::string InstallDefaultValueAsString(edm::InstallDefaultValue value) {
+  switch (value) {
+    case edm::INSTALL_DEFAULT_DISABLED:
+      return "Disabled";
+    case edm::INSTALL_DEFAULT_ENABLED_MACHINE_ONLY:
+      return "Enabled Machine Only";
+    case edm::INSTALL_DEFAULT_ENABLED:
+    default:
+      return "Enabled";
+  }
+}
+
+std::string InstallValueAsString(edm::InstallValue value) {
+  switch (value) {
+    case edm::INSTALL_DISABLED:
+      return "Disabled";
+    case edm::INSTALL_ENABLED_MACHINE_ONLY:
+      return "Enabled Machine Only";
+    case edm::INSTALL_FORCED:
+      return "Forced";
+    case edm::INSTALL_ENABLED:
+    default:
+      return "Enabled";
+  }
+}
+
+std::unique_ptr<edm::OmahaSettingsClientProto> GetOmahaPolicySettings() {
+  std::string encoded_omaha_policy_type =
+      base::Base64Encode(kGoogleUpdatePolicyType);
+
+  base::FilePath omaha_policy_file = GetDefaultDMStorage()
+                                         ->policy_cache_folder()
+                                         .AppendASCII(encoded_omaha_policy_type)
+                                         .AppendASCII("PolicyFetchResponse");
+  std::string response_data;
+  ::enterprise_management::PolicyFetchResponse response;
+  ::enterprise_management::PolicyData policy_data;
+  auto omaha_settings = std::make_unique<edm::OmahaSettingsClientProto>();
+  if (!base::PathExists(omaha_policy_file) ||
+      !base::ReadFileToString(omaha_policy_file, &response_data) ||
+      response_data.empty() || !response.ParseFromString(response_data) ||
+      !policy_data.ParseFromString(response.policy_data()) ||
+      !policy_data.has_policy_value() ||
+      !omaha_settings->ParseFromString(policy_data.policy_value())) {
+    VLOG(1) << "No Omaha policies.";
+    return nullptr;
+  }
+
+  return omaha_settings;
+}
+
+void PrintCachedPolicyInfo(const CachedPolicyInfo& cached_info) {
+  constexpr size_t kPrintWidth = 16;
+
+  std::cout << "Cached policy info:" << std::endl;
+  std::cout << "  Key version: " << cached_info.key_version() << std::endl;
+  std::cout << "  Timestamp: " << cached_info.timestamp() << std::endl;
+  std::cout << "  Key data (" << cached_info.public_key().size()
+            << " bytes): " << std::endl;
+  const std::string key = cached_info.public_key();
+  for (size_t i = 0; i < key.size(); ++i) {
+    std::cout << std::setfill('0') << std::setw(2) << std::hex
+              << static_cast<unsigned int>(0xff & key[i]) << ' ';
+    if (i % kPrintWidth == kPrintWidth - 1) {
+      std::cout << std::endl;
+    }
+  }
+  std::cout << std::endl;
+}
+
+void PrintCBCMPolicies() {
+  scoped_refptr<DMStorage> storage = GetDefaultDMStorage();
+  if (!storage) {
+    std::cerr << "Failed to instantiate DM storage instance." << std::endl;
+    return;
+  }
+
+  std::cout << "-------------------------------------------------" << std::endl;
+  std::cout << "Device ID: " << storage->GetDeviceID() << std::endl;
+  std::cout << "Enrollment token: " << storage->GetEnrollmentToken()
+            << std::endl;
+  std::cout << "DM token: " << storage->GetDmToken() << std::endl;
+  std::cout << "-------------------------------------------------" << std::endl;
+
+  std::unique_ptr<CachedPolicyInfo> cached_info =
+      storage->GetCachedPolicyInfo();
+  if (cached_info) {
+    PrintCachedPolicyInfo(*cached_info);
+    std::cout << "-------------------------------------------------"
+              << std::endl;
+  }
+
+  std::unique_ptr<edm::OmahaSettingsClientProto> omaha_settings =
+      GetOmahaPolicySettings();
+  if (omaha_settings) {
+    bool has_global_policy = false;
+    std::cout << "Global policies:" << std::endl;
+    if (omaha_settings->has_install_default()) {
+      std::cout << "  InstallDefault: "
+                << InstallDefaultValueAsString(
+                       omaha_settings->install_default())
+                << "(" << omaha_settings->install_default() << ")" << std::endl;
+      has_global_policy = true;
+    }
+    if (omaha_settings->has_update_default()) {
+      std::cout << "  UpdateDefault: "
+                << UpdateValueAsString(omaha_settings->update_default()) << "("
+                << omaha_settings->update_default() << ")" << std::endl;
+      has_global_policy = true;
+    }
+    if (omaha_settings->has_auto_update_check_period_minutes()) {
+      std::cout << "  Auto-update check period minutes: "
+                << omaha_settings->auto_update_check_period_minutes()
+                << std::endl;
+      has_global_policy = true;
+    }
+    if (omaha_settings->has_updates_suppressed()) {
+      std::cout << "  Update suppressed: " << std::endl
+                << "      Start Hour: "
+                << omaha_settings->updates_suppressed().start_hour()
+                << std::endl
+                << "      Start Minute: "
+                << omaha_settings->updates_suppressed().start_minute()
+                << std::endl
+                << "      Duration Minute: "
+                << omaha_settings->updates_suppressed().duration_min()
+                << std::endl;
+      has_global_policy = true;
+    }
+    if (omaha_settings->has_proxy_mode()) {
+      std::cout << "  Proxy Mode: " << omaha_settings->proxy_mode()
+                << std::endl;
+      has_global_policy = true;
+    }
+    if (omaha_settings->has_proxy_pac_url()) {
+      std::cout << "  Proxy PacURL: " << omaha_settings->proxy_pac_url()
+                << std::endl;
+      has_global_policy = true;
+    }
+    if (omaha_settings->has_proxy_server()) {
+      std::cout << "  Proxy Server: " << omaha_settings->proxy_server()
+                << std::endl;
+      has_global_policy = true;
+    }
+    if (omaha_settings->has_download_preference()) {
+      std::cout << "  DownloadPreference: "
+                << omaha_settings->download_preference() << std::endl;
+      has_global_policy = true;
+    }
+    if (!has_global_policy) {
+      std::cout << "  (No policy)" << std::endl;
+    }
+
+    for (const auto& app_settings : omaha_settings->application_settings()) {
+      bool has_policy = false;
+      if (app_settings.has_app_guid()) {
+        std::cout << "App : " << app_settings.app_guid();
+        if (app_settings.has_bundle_identifier()) {
+          std::cout << "(" << app_settings.bundle_identifier() << ")";
+        }
+        std::cout << std::endl;
+      }
+      if (app_settings.has_install()) {
+        std::cout << "  Install : "
+                  << InstallValueAsString(app_settings.install()) << "("
+                  << app_settings.install() << ")" << std::endl;
+        has_policy = true;
+      }
+      if (app_settings.has_update()) {
+        std::cout << "  Update : " << UpdateValueAsString(app_settings.update())
+                  << "(" << app_settings.update() << ")" << std::endl;
+        has_policy = true;
+      }
+      if (app_settings.has_rollback_to_target_version()) {
+        std::cout << "  RollbackToTargetVersionAllowed : "
+                  << app_settings.rollback_to_target_version() << std::endl;
+        has_policy = true;
+      }
+      if (app_settings.has_target_version_prefix()) {
+        std::cout << "  TargetVersionPrefix : "
+                  << app_settings.target_version_prefix() << std::endl;
+        has_policy = true;
+      }
+      if (app_settings.has_target_channel()) {
+        std::cout << "  TargetChannel : " << app_settings.target_channel()
+                  << std::endl;
+        has_policy = true;
+      }
+      if (app_settings.has_gcpw_application_settings()) {
+        std::cout << "  DomainsAllowedToLogin: ";
+        for (const auto& domain : app_settings.gcpw_application_settings()
+                                      .domains_allowed_to_login()) {
+          std::cout << domain << ", ";
+          has_policy = true;
+        }
+        std::cout << std::endl;
+      }
+      if (!has_policy) {
+        std::cout << "  (No policy)" << std::endl;
+      }
+    }
+  }
+  std::cout << "-------------------------------------------------" << std::endl;
+  std::cout << "Downloaded CBCM policy types:" << std::endl;
+  base::FileEnumerator(storage->policy_cache_folder(), false,
+                       base::FileEnumerator::DIRECTORIES)
+      .ForEach([](const base::FilePath& name) {
+        std::string policy_type;
+        if (base::Base64Decode(name.BaseName().MaybeAsASCII(), &policy_type)) {
+          std::cout << "  " << policy_type << std::endl;
+        }
+      });
+  std::cout << std::endl;
+}
+
+}  // namespace updater_policy
+
 UpdaterScope Scope() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(kSystemSwitch)
              ? UpdaterScope::kSystem
@@ -168,6 +412,7 @@
   void ListUpdate();
   void Update();
   void ListPolicies();
+  void ListCBCMPolicies();
 
   void FindApp(const std::string& app_id,
                base::OnceCallback<void(scoped_refptr<AppState>)> callback);
@@ -187,15 +432,16 @@
             << base::CommandLine::ForCurrentProcess()->GetProgram().BaseName()
             << " [action...] [parameters...]" << R"(
     Actions:
-        --update            Update app(s).
-        --list-apps         List all registered apps.
-        --list-update       List update for an app (skip update install).
-        --list-policies     List all currently effective enterprise policies.
+        --update              Update app(s).
+        --list-apps           List all registered apps.
+        --list-update         List update for an app (skip update install).
+        --list-policies       List all currently effective enterprise policies.
+        --list-cbcm-policies  List downloaded CBCM policies.
     Action parameters:
-        --background        Use background priority.
-        --product           ProductID.
-        --system            Use the system scope.
-        --json              Use JSON as output format where applicable.)"
+        --background          Use background priority.
+        --product             ProductID.
+        --system              Use the system scope.
+        --json                Use JSON as output format where applicable.)"
             << std::endl;
   Shutdown(error_message.empty() ? 0 : 1);
 }
@@ -359,13 +605,20 @@
       base::BindOnce(&UpdaterUtilApp::Shutdown, this, 0));
 }
 
+void UpdaterUtilApp::ListCBCMPolicies() {
+  base::ThreadPool::PostTaskAndReply(
+      FROM_HERE, {base::MayBlock(), base::WithBaseSyncPrimitives()},
+      base::BindOnce(&updater_policy::PrintCBCMPolicies),
+      base::BindOnce(&UpdaterUtilApp::Shutdown, this, 0));
+}
+
 void UpdaterUtilApp::FirstTaskRun() {
   const std::map<std::string, void (UpdaterUtilApp::*)()> commands = {
       {kListAppsSwitch, &UpdaterUtilApp::ListApps},
       {kListUpdateSwitch, &UpdaterUtilApp::ListUpdate},
       {kUpdateSwitch, &UpdaterUtilApp::Update},
       {kListPoliciesSwitch, &UpdaterUtilApp::ListPolicies},
-  };
+      {kListCBCMPoliciesSwitch, &UpdaterUtilApp::ListCBCMPolicies}};
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   for (const auto& [switch_name, func] : commands) {
diff --git a/clank b/clank
index 6722cfc..ed4b774 160000
--- a/clank
+++ b/clank
@@ -1 +1 @@
-Subproject commit 6722cfca9cc136161f35d110d60e7f3ef184febf
+Subproject commit ed4b774419588a1496c267e4b9ba422d20ea8552
diff --git a/components/autofill/content/renderer/form_tracker.cc b/components/autofill/content/renderer/form_tracker.cc
index 2043058f..ba4c40db 100644
--- a/components/autofill/content/renderer/form_tracker.cc
+++ b/components/autofill/content/renderer/form_tracker.cc
@@ -213,10 +213,12 @@
     return;
 
   ResetLastInteractedElements();
-  if (element.Form().IsNull())
+  if (blink::WebFormElement form = form_util::GetOwningForm(element);
+      !form.IsNull()) {
+    last_interacted_form_ = FormRef(form);
+  } else {
     last_interacted_formless_element_ = FieldRef(element);
-  else
-    last_interacted_form_ = FormRef(element.Form());
+  }
   // TODO(crbug.com/1483242): Investigate if this is necessary: if it is,
   // document the reason, if not, remove.
   TrackElement(mojom::SubmissionSource::DOM_MUTATION_AFTER_AUTOFILL);
@@ -233,13 +235,14 @@
     return;
   }
 
-  if (element.Form().IsNull()) {
-    last_interacted_formless_element_ = FieldRef(element);
+  blink::WebFormElement form = form_util::GetOwningForm(element);
+  if (!form.IsNull()) {
+    last_interacted_form_ = FormRef(form);
   } else {
-    last_interacted_form_ = FormRef(element.Form());
+    last_interacted_formless_element_ = FieldRef(element);
   }
   for (auto& observer : observers_) {
-    observer.OnProvisionallySaveForm(element.Form(), element, change_source);
+    observer.OnProvisionallySaveForm(form, element, change_source);
   }
 }
 
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ChromeDialog.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ChromeDialog.java
index 1101da1..5ea5464 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ChromeDialog.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ChromeDialog.java
@@ -10,6 +10,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
 import android.view.ViewStub;
 import android.widget.LinearLayout;
 
@@ -63,7 +64,7 @@
                     AutomotiveUtils.getAutomotiveLayoutWithBackButtonToolbar(mContext));
             setAutomotiveToolbarBackButtonAction();
             LinearLayout linearLayout = findViewById(R.id.automotive_base_linear_layout);
-            linearLayout.addView(view);
+            linearLayout.addView(view, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         } else {
             super.setContentView(view);
         }
@@ -76,8 +77,7 @@
                     AutomotiveUtils.getAutomotiveLayoutWithBackButtonToolbar(mContext));
             setAutomotiveToolbarBackButtonAction();
             LinearLayout linearLayout = findViewById(R.id.automotive_base_linear_layout);
-            linearLayout.setLayoutParams(params);
-            linearLayout.addView(view);
+            linearLayout.addView(view, params);
         } else {
             super.setContentView(view, params);
         }
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/FullscreenAlertDialog.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/FullscreenAlertDialog.java
index 29eb2c1..2dcb353de 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/FullscreenAlertDialog.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/FullscreenAlertDialog.java
@@ -9,6 +9,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.ViewStub;
 
@@ -135,7 +136,8 @@
                                                                 mContext),
                                                 null);
                 mAutomotiveToolbar = automotiveLayout.findViewById(R.id.back_button_toolbar);
-                automotiveLayout.addView(view);
+                automotiveLayout.addView(
+                        view, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
                 super.setView(automotiveLayout);
             } else {
                 super.setView(view);
diff --git a/components/exo/data_exchange_delegate.h b/components/exo/data_exchange_delegate.h
index 4f70efb..36cd828 100644
--- a/components/exo/data_exchange_delegate.h
+++ b/components/exo/data_exchange_delegate.h
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/functional/callback.h"
-#include "base/memory/scoped_refptr.h"
 
 namespace aura {
 class Window;
@@ -17,7 +16,6 @@
 
 namespace base {
 class Pickle;
-class RefCountedMemory;
 }  // namespace base
 
 namespace ui {
@@ -38,35 +36,14 @@
   virtual ui::EndpointType GetDataTransferEndpointType(
       aura::Window* window) const = 0;
 
-  // Read filenames from text/uri-list |data| which was provided by |source|
-  // endpoint. Translates paths from source to host format.
-  virtual std::vector<ui::FileInfo> GetFilenames(
-      ui::EndpointType source,
-      const std::vector<uint8_t>& data) const = 0;
-
   // Returns the mime type which is used by |target| endpoint for a list of
   // file path URIs.
   virtual std::string GetMimeTypeForUriList(ui::EndpointType target) const = 0;
 
-  // Sends the given list of |files| to |target| endpoint. Translates paths from
-  // host format to the target and performs any required file sharing for VMs.
-  using SendDataCallback =
-      base::OnceCallback<void(scoped_refptr<base::RefCountedMemory>)>;
-  virtual void SendFileInfo(ui::EndpointType target,
-                            const std::vector<ui::FileInfo>& files,
-                            SendDataCallback callback) const = 0;
-
   // Takes in |pickle| constructed by the web contents view and returns true if
   // it contains any valid filesystem URLs.
   virtual bool HasUrlsInPickle(const base::Pickle& pickle) const = 0;
 
-  // Takes in |pickle| constructed by the web contents view containing
-  // filesystem URLs. Provides translations for the specified |target| endpoint
-  // and performs any required file sharing for VMs.
-  virtual void SendPickle(ui::EndpointType target,
-                          const base::Pickle& pickle,
-                          SendDataCallback callback) = 0;
-
   // Reads pickle for FilesApp fs/sources with newline-separated filesystem
   // URLs. Validates that |source| is FilesApp.
   virtual std::vector<ui::FileInfo> ParseFileSystemSources(
diff --git a/components/exo/data_offer.cc b/components/exo/data_offer.cc
index 401d63fe..a8c2da7 100644
--- a/components/exo/data_offer.cc
+++ b/components/exo/data_offer.cc
@@ -23,6 +23,7 @@
 #include "components/exo/data_exchange_delegate.h"
 #include "components/exo/data_offer_delegate.h"
 #include "components/exo/data_offer_observer.h"
+#include "components/exo/security_delegate.h"
 #include "net/base/filename_util.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/clipboard_buffer.h"
@@ -265,9 +266,9 @@
   if (!filenames.empty()) {
     data_callbacks_.emplace(
         uri_list_mime_type,
-        base::BindOnce(&DataExchangeDelegate::SendFileInfo,
-                       base::Unretained(data_exchange_delegate), endpoint_type,
-                       std::move(filenames)));
+        base::BindOnce(&SecurityDelegate::SendFileInfo,
+                       base::Unretained(delegate_->GetSecurityDelegate()),
+                       endpoint_type, std::move(filenames)));
     delegate_->OnOffer(uri_list_mime_type);
     return;
   }
@@ -276,9 +277,9 @@
       data_exchange_delegate->HasUrlsInPickle(pickle)) {
     data_callbacks_.emplace(
         uri_list_mime_type,
-        base::BindOnce(&DataExchangeDelegate::SendPickle,
-                       base::Unretained(data_exchange_delegate), endpoint_type,
-                       pickle));
+        base::BindOnce(&SecurityDelegate::SendPickle,
+                       base::Unretained(delegate_->GetSecurityDelegate()),
+                       endpoint_type, pickle));
     delegate_->OnOffer(uri_list_mime_type);
     return;
   }
@@ -406,9 +407,9 @@
     delegate_->OnOffer(std::string(ui::kMimeTypeURIList));
     data_callbacks_.emplace(
         std::string(ui::kMimeTypeURIList),
-        base::BindOnce(&DataExchangeDelegate::SendFileInfo,
-                       base::Unretained(data_exchange_delegate), endpoint_type,
-                       std::move(filenames)));
+        base::BindOnce(&SecurityDelegate::SendFileInfo,
+                       base::Unretained(delegate_->GetSecurityDelegate()),
+                       endpoint_type, std::move(filenames)));
   }
 }
 
diff --git a/components/exo/data_offer_unittest.cc b/components/exo/data_offer_unittest.cc
index 5a78dd3..a7a7a72 100644
--- a/components/exo/data_offer_unittest.cc
+++ b/components/exo/data_offer_unittest.cc
@@ -25,6 +25,7 @@
 #include "components/exo/test/exo_test_base.h"
 #include "components/exo/test/exo_test_data_exchange_delegate.h"
 #include "components/exo/test/test_data_offer_delegate.h"
+#include "components/exo/test/test_security_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/variant.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -350,7 +351,7 @@
   std::vector<GURL> urls;
   urls.push_back(
       GURL("content://org.chromium.arc.chromecontentprovider/path/to/file1"));
-  data_exchange_delegate.RunSendPickleCallback(urls);
+  delegate.GetSecurityDelegate()->RunSendPickleCallback(urls);
 
   std::string result1;
   ASSERT_TRUE(ReadString(std::move(read_pipe1), &result1));
@@ -389,7 +390,7 @@
   // Run callback with an empty URL.
   std::vector<GURL> urls;
   urls.push_back(GURL(""));
-  data_exchange_delegate.RunSendPickleCallback(urls);
+  delegate.GetSecurityDelegate()->RunSendPickleCallback(urls);
 
   std::u16string result;
   ASSERT_TRUE(ReadString16(std::move(read_pipe), &result));
diff --git a/components/exo/data_source.cc b/components/exo/data_source.cc
index 4f1d1bf0..52a4279 100644
--- a/components/exo/data_source.cc
+++ b/components/exo/data_source.cc
@@ -19,6 +19,7 @@
 #include "components/exo/data_source_delegate.h"
 #include "components/exo/data_source_observer.h"
 #include "components/exo/mime_utils.h"
+#include "components/exo/security_delegate.h"
 #include "net/base/mime_util.h"
 #include "third_party/blink/public/common/mime_util/mime_util.h"
 #include "third_party/icu/source/common/unicode/ucnv.h"
@@ -214,6 +215,12 @@
   delegate_->OnDndFinished();
 }
 
+std::vector<ui::FileInfo> DataSource::GetFilenames(
+    ui::EndpointType source,
+    const std::vector<uint8_t>& data) const {
+  return delegate_->GetSecurityDelegate()->GetFilenames(source, data);
+}
+
 void DataSource::ReadDataForTesting(const std::string& mime_type,
                                     ReadDataCallback callback,
                                     base::RepeatingClosure failure_callback) {
diff --git a/components/exo/data_source.h b/components/exo/data_source.h
index fac9dc6a..b0986f9 100644
--- a/components/exo/data_source.h
+++ b/components/exo/data_source.h
@@ -14,6 +14,11 @@
 #include "base/observer_list.h"
 #include "components/exo/surface.h"
 
+namespace ui {
+struct FileInfo;
+enum class EndpointType;
+}  // namespace ui
+
 namespace exo {
 
 class DataSourceDelegate;
@@ -99,6 +104,12 @@
       ReadDataCallback web_custom_data_reader,
       base::RepeatingClosure failure_callback);
 
+  // Read filenames and translate paths in `data` from the `source` format
+  // to local paths.
+  std::vector<ui::FileInfo> GetFilenames(
+      ui::EndpointType source,
+      const std::vector<uint8_t>& data) const;
+
   void ReadDataForTesting(
       const std::string& mime_type,
       ReadDataCallback callback,
diff --git a/components/exo/drag_drop_operation.cc b/components/exo/drag_drop_operation.cc
index 9d2815f..bde4911 100644
--- a/components/exo/drag_drop_operation.cc
+++ b/components/exo/drag_drop_operation.cc
@@ -321,7 +321,7 @@
     const std::string& mime_type,
     const std::vector<uint8_t>& data) {
   DCHECK(os_exchange_data_);
-  os_exchange_data_->SetFilenames(data_exchange_delegate->GetFilenames(
+  os_exchange_data_->SetFilenames(source_->get()->GetFilenames(
       data_exchange_delegate->GetDataTransferEndpointType(source), data));
   mime_type_ = mime_type;
   counter_.Run();
diff --git a/components/exo/seat.cc b/components/exo/seat.cc
index 85fb0d4..85a4b2e 100644
--- a/components/exo/seat.cc
+++ b/components/exo/seat.cc
@@ -345,9 +345,11 @@
     base::OnceClosure callback,
     const std::string& mime_type,
     const std::vector<uint8_t>& data) {
-  std::vector<ui::FileInfo> filenames =
-      data_exchange_delegate_->GetFilenames(source, data);
-  writer->WriteFilenames(ui::FileInfosToURIList(filenames));
+  if (selection_source_) {
+    std::vector<ui::FileInfo> filenames =
+        selection_source_->get()->GetFilenames(source, data);
+    writer->WriteFilenames(ui::FileInfosToURIList(filenames));
+  }
   std::move(callback).Run();
 }
 
diff --git a/components/exo/security_delegate.h b/components/exo/security_delegate.h
index 1b118bb..6fc940e 100644
--- a/components/exo/security_delegate.h
+++ b/components/exo/security_delegate.h
@@ -7,11 +7,26 @@
 
 #include <memory>
 #include <string>
+#include <vector>
+
+#include "base/files/file_path.h"
+#include "base/functional/callback.h"
+#include "base/memory/scoped_refptr.h"
 
 namespace aura {
 class Window;
 }
 
+namespace base {
+class Pickle;
+class RefCountedMemory;
+}  // namespace base
+
+namespace ui {
+struct FileInfo;
+enum class EndpointType;
+}  // namespace ui
+
 namespace exo {
 
 // Each wayland server managed by exo, including the default server, will have a
@@ -61,6 +76,27 @@
   // own window bounds, as they may not be able to compute them correctly
   // (accounting for the size of the window decorations).
   virtual SetBoundsPolicy CanSetBounds(aura::Window* window) const = 0;
+
+  // Read filenames from text/uri-list |data| which was provided by `source`
+  // endpoint. Translates paths from source to host format.
+  virtual std::vector<ui::FileInfo> GetFilenames(
+      ui::EndpointType source,
+      const std::vector<uint8_t>& data) const = 0;
+
+  // Sends the given list of `files` to `target` endpoint. Translates paths from
+  // host format to the target and performs any required file sharing for VMs.
+  using SendDataCallback =
+      base::OnceCallback<void(scoped_refptr<base::RefCountedMemory>)>;
+  virtual void SendFileInfo(ui::EndpointType target,
+                            const std::vector<ui::FileInfo>& files,
+                            SendDataCallback callback) const = 0;
+
+  // Takes in `pickle` constructed by the web contents view containing
+  // filesystem URLs. Provides translations for the specified `target` endpoint
+  // and performs any required file sharing for VMs.
+  virtual void SendPickle(ui::EndpointType target,
+                          const base::Pickle& pickle,
+                          SendDataCallback callback) = 0;
 };
 
 }  // namespace exo
diff --git a/components/exo/test/exo_test_data_exchange_delegate.cc b/components/exo/test/exo_test_data_exchange_delegate.cc
index 34146bb..71595f74 100644
--- a/components/exo/test/exo_test_data_exchange_delegate.cc
+++ b/components/exo/test/exo_test_data_exchange_delegate.cc
@@ -8,19 +8,8 @@
 #include <utility>
 #include <vector>
 
-#include "base/files/file_util.h"
-#include "base/functional/callback.h"
-#include "base/memory/ref_counted_memory.h"
 #include "base/pickle.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
-#include "components/exo/test/test_data_source_delegate.h"
-#include "net/base/filename_util.h"
-#include "ui/base/clipboard/clipboard.h"
-#include "ui/base/clipboard/clipboard_format_type.h"
 #include "ui/base/clipboard/file_info.h"
-#include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
-#include "url/gurl.h"
 
 namespace exo {
 
@@ -33,58 +22,16 @@
   return endpoint_type_;
 }
 
-std::vector<ui::FileInfo> TestDataExchangeDelegate::GetFilenames(
-    ui::EndpointType source,
-    const std::vector<uint8_t>& data) const {
-  std::string lines(data.begin(), data.end());
-  std::vector<ui::FileInfo> filenames;
-  for (const base::StringPiece& line : base::SplitStringPiece(
-           lines, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
-    base::FilePath path;
-    if (net::FileURLToFilePath(GURL(line), &path))
-      filenames.push_back(ui::FileInfo(std::move(path), base::FilePath()));
-  }
-  return filenames;
-}
-
 std::string TestDataExchangeDelegate::GetMimeTypeForUriList(
     ui::EndpointType target) const {
   return "text/uri-list";
 }
 
-void TestDataExchangeDelegate::SendFileInfo(
-    ui::EndpointType target,
-    const std::vector<ui::FileInfo>& files,
-    SendDataCallback callback) const {
-  std::vector<std::string> lines;
-  for (const auto& file : files) {
-    lines.push_back("file://" + file.path.value());
-  }
-  std::move(callback).Run(base::MakeRefCounted<base::RefCountedString>(
-      base::JoinString(lines, "\r\n")));
-}
-
 bool TestDataExchangeDelegate::HasUrlsInPickle(
     const base::Pickle& pickle) const {
   return true;
 }
 
-void TestDataExchangeDelegate::SendPickle(ui::EndpointType target,
-                                          const base::Pickle& pickle,
-                                          SendDataCallback callback) {
-  send_pickle_callback_ = std::move(callback);
-}
-
-void TestDataExchangeDelegate::RunSendPickleCallback(std::vector<GURL> urls) {
-  std::vector<std::string> lines;
-  for (const auto& url : urls) {
-    lines.push_back(url.spec());
-  }
-  std::move(send_pickle_callback_)
-      .Run(base::MakeRefCounted<base::RefCountedString>(
-          base::JoinString(lines, "\r\n")));
-}
-
 std::vector<ui::FileInfo> TestDataExchangeDelegate::ParseFileSystemSources(
     const ui::DataTransferEndpoint* source,
     const base::Pickle& pickle) const {
diff --git a/components/exo/test/exo_test_data_exchange_delegate.h b/components/exo/test/exo_test_data_exchange_delegate.h
index 2a717797..df071ba 100644
--- a/components/exo/test/exo_test_data_exchange_delegate.h
+++ b/components/exo/test/exo_test_data_exchange_delegate.h
@@ -9,8 +9,6 @@
 
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
 
-class GURL;
-
 namespace exo {
 
 class TestDataExchangeDelegate : public DataExchangeDelegate {
@@ -23,30 +21,18 @@
   // DataExchangeDelegate:
   ui::EndpointType GetDataTransferEndpointType(
       aura::Window* window) const override;
-  std::vector<ui::FileInfo> GetFilenames(
-      ui::EndpointType source,
-      const std::vector<uint8_t>& data) const override;
   std::string GetMimeTypeForUriList(ui::EndpointType target) const override;
-  void SendFileInfo(ui::EndpointType target,
-                    const std::vector<ui::FileInfo>& files,
-                    SendDataCallback callback) const override;
   bool HasUrlsInPickle(const base::Pickle& pickle) const override;
-  void SendPickle(ui::EndpointType target,
-                  const base::Pickle& pickle,
-                  SendDataCallback callback) override;
   std::vector<ui::FileInfo> ParseFileSystemSources(
       const ui::DataTransferEndpoint* source,
       const base::Pickle& pickle) const override;
 
-  void RunSendPickleCallback(std::vector<GURL> urls);
-
   void set_endpoint_type(ui::EndpointType endpoint_type) {
     endpoint_type_ = endpoint_type;
   }
 
  private:
   ui::EndpointType endpoint_type_ = ui::EndpointType::kUnknownVm;
-  SendDataCallback send_pickle_callback_;
 };
 
 }  // namespace exo
diff --git a/components/exo/test/mock_security_delegate.h b/components/exo/test/mock_security_delegate.h
index d94ac6f..f7dea0d 100644
--- a/components/exo/test/mock_security_delegate.h
+++ b/components/exo/test/mock_security_delegate.h
@@ -8,6 +8,7 @@
 #include "components/exo/security_delegate.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
+#include "ui/base/clipboard/file_info.h"
 
 namespace exo::test {
 
@@ -22,6 +23,22 @@
               CanSetBounds,
               (aura::Window * window),
               (const, override));
+  MOCK_METHOD(std::vector<ui::FileInfo>,
+              GetFilenames,
+              (ui::EndpointType source, const std::vector<uint8_t>& data),
+              (const, override));
+  MOCK_METHOD(void,
+              SendFileInfo,
+              (ui::EndpointType target,
+               const std::vector<ui::FileInfo>& files,
+               SendDataCallback callback),
+              (const, override));
+  MOCK_METHOD(void,
+              SendPickle,
+              (ui::EndpointType target,
+               const base::Pickle& pickle,
+               SendDataCallback callback),
+              (override));
 };
 
 }  // namespace exo::test
diff --git a/components/exo/test/test_data_offer_delegate.cc b/components/exo/test/test_data_offer_delegate.cc
index 4af01ae..1c25cdc 100644
--- a/components/exo/test/test_data_offer_delegate.cc
+++ b/components/exo/test/test_data_offer_delegate.cc
@@ -23,7 +23,7 @@
   dnd_action_ = dnd_action;
 }
 
-SecurityDelegate* TestDataOfferDelegate::GetSecurityDelegate() const {
+TestSecurityDelegate* TestDataOfferDelegate::GetSecurityDelegate() const {
   return security_delegate_.get();
 }
 
diff --git a/components/exo/test/test_data_offer_delegate.h b/components/exo/test/test_data_offer_delegate.h
index 2fa6a068..4a5910c 100644
--- a/components/exo/test/test_data_offer_delegate.h
+++ b/components/exo/test/test_data_offer_delegate.h
@@ -35,13 +35,13 @@
     return source_actions_;
   }
   DndAction dnd_action() const { return dnd_action_; }
-  SecurityDelegate* GetSecurityDelegate() const override;
+  TestSecurityDelegate* GetSecurityDelegate() const override;
 
  private:
   base::flat_set<std::string> mime_types_;
   base::flat_set<DndAction> source_actions_;
   DndAction dnd_action_ = DndAction::kNone;
-  std::unique_ptr<SecurityDelegate> security_delegate_ =
+  std::unique_ptr<TestSecurityDelegate> security_delegate_ =
       std::make_unique<TestSecurityDelegate>();
 };
 
diff --git a/components/exo/test/test_security_delegate.cc b/components/exo/test/test_security_delegate.cc
index c113561..5cb0b6c2 100644
--- a/components/exo/test/test_security_delegate.cc
+++ b/components/exo/test/test_security_delegate.cc
@@ -4,10 +4,18 @@
 
 #include "components/exo/test/test_security_delegate.h"
 
+#include <vector>
+
+#include "base/functional/callback.h"
+#include "base/memory/ref_counted_memory.h"
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "chromeos/ui/base/window_properties.h"
 #include "components/exo/security_delegate.h"
 #include "components/exo/shell_surface_util.h"
+#include "net/base/filename_util.h"
 #include "ui/aura/window.h"
+#include "ui/base/clipboard/file_info.h"
 
 namespace exo::test {
 
@@ -28,9 +36,51 @@
   return policy_;
 }
 
+std::vector<ui::FileInfo> TestSecurityDelegate::GetFilenames(
+    ui::EndpointType source,
+    const std::vector<uint8_t>& data) const {
+  std::string lines(data.begin(), data.end());
+  std::vector<ui::FileInfo> filenames;
+  for (const base::StringPiece& line : base::SplitStringPiece(
+           lines, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
+    base::FilePath path;
+    if (net::FileURLToFilePath(GURL(line), &path)) {
+      filenames.push_back(ui::FileInfo(std::move(path), base::FilePath()));
+    }
+  }
+  return filenames;
+}
+
+void TestSecurityDelegate::SendFileInfo(ui::EndpointType target,
+                                        const std::vector<ui::FileInfo>& files,
+                                        SendDataCallback callback) const {
+  std::vector<std::string> lines;
+  for (const auto& file : files) {
+    lines.push_back("file://" + file.path.value());
+  }
+  std::move(callback).Run(base::MakeRefCounted<base::RefCountedString>(
+      base::JoinString(lines, "\r\n")));
+}
+
+void TestSecurityDelegate::SendPickle(ui::EndpointType target,
+                                      const base::Pickle& pickle,
+                                      SendDataCallback callback) {
+  send_pickle_callback_ = std::move(callback);
+}
+
 void TestSecurityDelegate::SetCanSetBounds(
     exo::SecurityDelegate::SetBoundsPolicy policy) {
   policy_ = policy;
 }
 
+void TestSecurityDelegate::RunSendPickleCallback(std::vector<GURL> urls) {
+  std::vector<std::string> lines;
+  for (const auto& url : urls) {
+    lines.push_back(url.spec());
+  }
+  std::move(send_pickle_callback_)
+      .Run(base::MakeRefCounted<base::RefCountedString>(
+          base::JoinString(lines, "\r\n")));
+}
+
 }  // namespace exo::test
diff --git a/components/exo/test/test_security_delegate.h b/components/exo/test/test_security_delegate.h
index 54ae8c2..1ff2331 100644
--- a/components/exo/test/test_security_delegate.h
+++ b/components/exo/test/test_security_delegate.h
@@ -7,6 +7,8 @@
 
 #include "components/exo/security_delegate.h"
 
+#include "url/gurl.h"
+
 namespace aura {
 class Window;
 }
@@ -24,12 +26,25 @@
   bool CanSelfActivate(aura::Window* window) const override;
   bool CanLockPointer(aura::Window* toplevel) const override;
   SetBoundsPolicy CanSetBounds(aura::Window* window) const override;
+  std::vector<ui::FileInfo> GetFilenames(
+      ui::EndpointType source,
+      const std::vector<uint8_t>& data) const override;
+  void SendFileInfo(ui::EndpointType target,
+                    const std::vector<ui::FileInfo>& files,
+                    SendDataCallback callback) const override;
+  void SendPickle(ui::EndpointType target,
+                  const base::Pickle& pickle,
+                  SendDataCallback callback) override;
 
   // Choose the return value of |CanSetBounds()|.
   void SetCanSetBounds(SetBoundsPolicy policy);
 
+  // Run the callback received in SendPickle() with the specified values..
+  void RunSendPickleCallback(std::vector<GURL> urls);
+
  protected:
   SetBoundsPolicy policy_ = SetBoundsPolicy::IGNORE;
+  SendDataCallback send_pickle_callback_;
 };
 
 }  // namespace exo::test
diff --git a/components/viz/common/features.cc b/components/viz/common/features.cc
index 4bf71006..f59225d 100644
--- a/components/viz/common/features.cc
+++ b/components/viz/common/features.cc
@@ -268,8 +268,8 @@
              );
 
 BASE_FEATURE(kSharedBitmapToSharedImage,
-             "SharedBitmapToSharedImage_NotToBeEnabled",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             "SharedBitmapToSharedImage",
+             base::FEATURE_ENABLED_BY_DEFAULT);
 // Used to enable the HintSession::Mode::BOOST mode. BOOST mode try to force
 // the ADPF(Android Dynamic Performance Framework) to give Chrome more CPU
 // resources during a scroll.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index ade4c073..6bd5d01 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -3259,6 +3259,8 @@
       "speech/endpointer/energy_endpointer.h",
       "speech/endpointer/energy_endpointer_params.cc",
       "speech/endpointer/energy_endpointer_params.h",
+      "speech/network_speech_recognition_engine_impl.cc",
+      "speech/network_speech_recognition_engine_impl.h",
       "speech/speech_recognition_engine.cc",
       "speech/speech_recognition_engine.h",
       "speech/speech_recognizer_impl.cc",
diff --git a/content/browser/browsing_data/OWNERS b/content/browser/browsing_data/OWNERS
index afc2447..c5d66d1 100644
--- a/content/browser/browsing_data/OWNERS
+++ b/content/browser/browsing_data/OWNERS
@@ -1,3 +1,3 @@
 dullweber@chromium.org
-jsbell@chromium.org
+ayui@chromium.org
 msramek@chromium.org
diff --git a/content/browser/loader/keep_alive_url_loader.cc b/content/browser/loader/keep_alive_url_loader.cc
index e142765..cdfa5584 100644
--- a/content/browser/loader/keep_alive_url_loader.cc
+++ b/content/browser/loader/keep_alive_url_loader.cc
@@ -162,6 +162,107 @@
 
 }  // namespace
 
+// A wrapper class around the target URLLoaderClient connected to Renderer,
+// where the owning KeepAliveURLLoader forwards the network loading results to.
+class KeepAliveURLLoader::ForwardingClient final
+    : public network::mojom::URLLoaderClient {
+ public:
+  ForwardingClient(
+      KeepAliveURLLoader* loader,
+      mojo::PendingRemote<network::mojom::URLLoaderClient> forwarding_client)
+      : keep_alive_url_loader_(std::move(loader)),
+        target_(std::move(forwarding_client)) {
+    CHECK(keep_alive_url_loader_);
+    // For FetchLater requests, `target_` is not bound to renderer.
+    if (target_) {
+      target_.set_disconnect_handler(base::BindOnce(
+          &ForwardingClient::OnDisconnected, base::Unretained(this)));
+    }
+  }
+  // Not copyable.
+  ForwardingClient(const ForwardingClient&) = delete;
+  ForwardingClient& operator=(const ForwardingClient&) = delete;
+
+  int32_t request_id() const { return keep_alive_url_loader_->request_id_; }
+  bool IsConnected() const { return !!target_; }
+  void OnDisconnected();
+
+  // network::mojom::URLLoaderClient overrides:
+  void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    TRACE_EVENT("loading",
+                "KeepAliveURLLoader::ForwardingClient::OnReceiveEarlyHints",
+                "request_id", request_id());
+
+    if (IsConnected()) {
+      // The renderer is alive, forwards the action.
+      target_->OnReceiveEarlyHints(std::move(early_hints));
+      return;
+    }
+  }
+
+  void OnUploadProgress(int64_t current_position,
+                        int64_t total_size,
+                        base::OnceCallback<void()> callback) override {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    TRACE_EVENT("loading",
+                "KeepAliveURLLoader::ForwardingClient::OnUploadProgress",
+                "request_id", request_id());
+
+    if (IsConnected()) {
+      // The renderer is alive, forwards the action.
+      target_->OnUploadProgress(current_position, total_size,
+                                std::move(callback));
+      return;
+    }
+  }
+
+  void OnTransferSizeUpdated(int32_t transfer_size_diff) override {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    TRACE_EVENT("loading",
+                "KeepAliveURLLoader::ForwardingClient::OnTransferSizeUpdated",
+                "request_id", request_id());
+
+    if (IsConnected()) {
+      // The renderer is alive, forwards the action.
+      target_->OnTransferSizeUpdated(transfer_size_diff);
+      return;
+    }
+  }
+
+  void OnReceiveRedirect(const net::RedirectInfo& redirect_info,
+                         network::mojom::URLResponseHeadPtr head) override {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    CHECK(IsConnected());
+    target_->OnReceiveRedirect(redirect_info, std::move(head));
+  }
+
+  void OnReceiveResponse(
+      network::mojom::URLResponseHeadPtr head,
+      mojo::ScopedDataPipeConsumerHandle body,
+      std::optional<mojo_base::BigBuffer> cached_metadata) override {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    CHECK(IsConnected());
+    target_->OnReceiveResponse(std::move(head), std::move(body),
+                               std::move(cached_metadata));
+  }
+
+  void OnComplete(
+      const network::URLLoaderCompletionStatus& completion_status) override {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    CHECK(IsConnected());
+    target_->OnComplete(completion_status);
+  }
+
+ private:
+  // Cannot be nullptr as it owns `this`.
+  const raw_ptr<KeepAliveURLLoader> keep_alive_url_loader_;
+  // The target where overridden the `network::mojom::URLLoaderClient` methods
+  // should forward to.
+  // Its receiver resides in the Renderer.
+  mojo::Remote<network::mojom::URLLoaderClient> target_;
+};
+
 // A custom `blink::URLLoaderThrottle` delegate that only handles relevant
 // actions.
 //
@@ -338,7 +439,9 @@
       devtools_request_id_(base::UnguessableToken::Create().ToString()),
       options_(options),
       resource_request_(resource_request),
-      forwarding_client_(std::move(forwarding_client)),
+      forwarding_client_(
+          std::make_unique<ForwardingClient>(this,
+                                             std::move(forwarding_client))),
       traffic_annotation_(traffic_annotation),
       network_loader_factory_(std::move(network_loader_factory)),
       stored_url_load_(std::make_unique<StoredURLLoad>()),
@@ -394,12 +497,6 @@
       traffic_annotation_);
   loader_receiver_.set_disconnect_handler(base::BindOnce(
       &KeepAliveURLLoader::OnNetworkConnectionError, base::Unretained(this)));
-  // For FetchLater requests, `forwarding_client_` is not bound to renderer.
-  if (forwarding_client_) {
-    forwarding_client_.set_disconnect_handler(
-        base::BindOnce(&KeepAliveURLLoader::OnForwardingClientDisconnected,
-                       base::Unretained(this)));
-  }
 
   // These throttles are also run by `blink::ThrottlingURLLoader`. However, they
   // have to be re-run here in case of handling in-browser redirects.
@@ -543,19 +640,10 @@
   }
 }
 
+// TODO(crbug/40236167): Remove this after integrating with ThrottlingURLLoader.
 void KeepAliveURLLoader::OnReceiveEarlyHints(
     network::mojom::EarlyHintsPtr early_hints) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  TRACE_EVENT("loading", "KeepAliveURLLoader::OnReceiveEarlyHints",
-              "request_id", request_id_);
-
-  if (IsRendererConnected()) {
-    // The renderer is alive, forwards the action.
-    forwarding_client_->OnReceiveEarlyHints(std::move(early_hints));
-    return;
-  }
-
-  // TODO(crbug.com/1356128): Handle in browser process.
+  forwarding_client_->OnReceiveEarlyHints(std::move(early_hints));
 }
 
 void KeepAliveURLLoader::OnReceiveRedirect(
@@ -733,35 +821,17 @@
   // DO NOT touch any members after this line. `this` is already deleted.
 }
 
+// TODO(crbug/40236167): Remove this after integrating with ThrottlingURLLoader.
 void KeepAliveURLLoader::OnUploadProgress(int64_t current_position,
                                           int64_t total_size,
                                           base::OnceCallback<void()> callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  TRACE_EVENT("loading", "KeepAliveURLLoader::OnUploadProgress", "request_id",
-              request_id_);
-
-  if (IsRendererConnected()) {
-    // The renderer is alive, forwards the action.
-    forwarding_client_->OnUploadProgress(current_position, total_size,
-                                         std::move(callback));
-    return;
-  }
-
-  // TODO(crbug.com/1356128): Handle in the browser process.
+  forwarding_client_->OnUploadProgress(current_position, total_size,
+                                       std::move(callback));
 }
 
+// TODO(crbug/40236167): Remove this after integrating with ThrottlingURLLoader.
 void KeepAliveURLLoader::OnTransferSizeUpdated(int32_t transfer_size_diff) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  TRACE_EVENT("loading", "KeepAliveURLLoader::OnTransferSizeUpdated",
-              "request_id", request_id_);
-
-  if (IsRendererConnected()) {
-    // The renderer is alive, forwards the action.
-    forwarding_client_->OnTransferSizeUpdated(transfer_size_diff);
-    return;
-  }
-
-  // TODO(crbug.com/1356128): Handle in the browser process.
+  forwarding_client_->OnTransferSizeUpdated(transfer_size_diff);
 }
 
 void KeepAliveURLLoader::OnComplete(
@@ -893,7 +963,8 @@
 }
 
 bool KeepAliveURLLoader::IsRendererConnected() const {
-  return !!forwarding_client_;
+  CHECK(forwarding_client_);
+  return forwarding_client_->IsConnected();
 }
 
 net::Error KeepAliveURLLoader::WillFollowRedirect(
@@ -960,15 +1031,16 @@
 }
 
 // Browser -> Renderer connection
-void KeepAliveURLLoader::OnForwardingClientDisconnected() {
+void KeepAliveURLLoader::ForwardingClient::OnDisconnected() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  TRACE_EVENT("loading", "KeepAliveURLLoader::OnForwardingClientDisconnected",
-              "request_id", request_id_);
+  TRACE_EVENT("loading", "KeepAliveURLLoader::ForwardingClient::OnDisconnected",
+              "request_id", request_id());
 
   // Dropping the client as renderer is gone.
-  forwarding_client_.reset();
+  target_.reset();
 
-  if (!IsForwardURLLoadStarted() && !HasReceivedResponse()) {
+  if (!keep_alive_url_loader_->IsForwardURLLoadStarted() &&
+      !keep_alive_url_loader_->HasReceivedResponse()) {
     // The renderer disconnects before this loader forwards anything to it.
     // But the in-browser request processing may not complete yet.
 
@@ -979,7 +1051,7 @@
 
   // Renderer disconnects in-between forwarding, no need to call
   // `ForwardURLLoad()` anymore.
-  DeleteSelf();
+  keep_alive_url_loader_->DeleteSelf();
   // DO NOT touch any members after this line. `this` is already deleted.
 }
 
diff --git a/content/browser/loader/keep_alive_url_loader.h b/content/browser/loader/keep_alive_url_loader.h
index d8198be..a956dcf 100644
--- a/content/browser/loader/keep_alive_url_loader.h
+++ b/content/browser/loader/keep_alive_url_loader.h
@@ -83,8 +83,10 @@
 // The lifetime of an instance is roughly equal to the lifetime of a keepalive
 // request, which may surpass the initiator renderer's lifetime.
 //
-// Design Doc:
+// * Design Doc:
 // https://docs.google.com/document/d/1ZzxMMBvpqn8VZBZKnb7Go8TWjnrGcXuLS_USwVVRUvY
+// * Mojo Connections:
+// https://docs.google.com/document/d/1RKPgoLBrrLZBPn01XtwHJiLlH9rA7nIRXQJIR7BUqJA/edit#heading=h.y1og20bzkuf7
 class CONTENT_EXPORT KeepAliveURLLoader
     : public network::mojom::URLLoader,
       public network::mojom::URLLoaderClient,
@@ -283,6 +285,9 @@
   // service.
   mojo::Receiver<network::mojom::URLLoaderClient> loader_receiver_{this};
 
+  // See
+  // https://docs.google.com/document/d/1RKPgoLBrrLZBPn01XtwHJiLlH9rA7nIRXQJIR7BUqJA/edit#heading=h.y1og20bzkuf7
+  class ForwardingClient;
   // Browser -> Renderer connection:
   //
   // Connects to the receiver URLLoaderClient implemented in the renderer.
@@ -290,7 +295,7 @@
   // the network service, i.e. message received by `loader_receiver_`, to.
   // It may be disconnected if the renderer is dead. In such case, subsequent
   // URLLoader response may be handled in browser.
-  mojo::Remote<network::mojom::URLLoaderClient> forwarding_client_;
+  const std::unique_ptr<ForwardingClient> forwarding_client_;
 
   // Browser <- Renderer connection:
   // Timer used for triggering cleaning up `this` after the receiver is
diff --git a/content/browser/preloading/preloading_decider.cc b/content/browser/preloading/preloading_decider.cc
index f27c9bf..7e7534e9 100644
--- a/content/browser/preloading/preloading_decider.cc
+++ b/content/browser/preloading/preloading_decider.cc
@@ -379,6 +379,10 @@
   prerenderer_->ProcessCandidatesForPrerender(candidates);
 }
 
+void PreloadingDecider::OnLCPPredicted() {
+  prerenderer_->OnLCPPredicted();
+}
+
 bool PreloadingDecider::MaybePrefetch(const GURL& url,
                                       const PreloadingPredictor& predictor) {
   SpeculationCandidateKey key{url, blink::mojom::SpeculationAction::kPrefetch};
diff --git a/content/browser/preloading/preloading_decider.h b/content/browser/preloading/preloading_decider.h
index 3391318a..ffee2cf 100644
--- a/content/browser/preloading/preloading_decider.h
+++ b/content/browser/preloading/preloading_decider.h
@@ -64,6 +64,11 @@
   void UpdateSpeculationCandidates(
       std::vector<blink::mojom::SpeculationCandidatePtr>& candidates);
 
+  // Called when LCP is predicted.
+  // This is used to defer starting prerenders until LCP timing and is only
+  // used under LCPTimingPredictorPrerender2.
+  void OnLCPPredicted();
+
   // Returns true if the |url|, |action| pair is in the on-standby list.
   bool IsOnStandByForTesting(const GURL& url,
                              blink::mojom::SpeculationAction action);
diff --git a/content/browser/preloading/preloading_decider_unittest.cc b/content/browser/preloading/preloading_decider_unittest.cc
index fb7381ed..07519d4 100644
--- a/content/browser/preloading/preloading_decider_unittest.cc
+++ b/content/browser/preloading/preloading_decider_unittest.cc
@@ -75,6 +75,8 @@
     }
   }
 
+  void OnLCPPredicted() override {}
+
   bool MaybePrerender(
       const blink::mojom::SpeculationCandidatePtr& candidate) override {
     if (PrerenderExists(candidate->url)) {
diff --git a/content/browser/preloading/prerenderer.h b/content/browser/preloading/prerenderer.h
index 50e4327..db1fd1f 100644
--- a/content/browser/preloading/prerenderer.h
+++ b/content/browser/preloading/prerenderer.h
@@ -21,6 +21,11 @@
   virtual void ProcessCandidatesForPrerender(
       const std::vector<blink::mojom::SpeculationCandidatePtr>& candidates) = 0;
 
+  // Called when LCP is predicted.
+  // This is used to defer starting prerenders until LCP timing and is only
+  // used under LCPTimingPredictorPrerender2.
+  virtual void OnLCPPredicted() = 0;
+
   virtual bool MaybePrerender(
       const blink::mojom::SpeculationCandidatePtr& candidate) = 0;
 
diff --git a/content/browser/preloading/prerenderer_impl.cc b/content/browser/preloading/prerenderer_impl.cc
index 692ac9b8..6b70ad36 100644
--- a/content/browser/preloading/prerenderer_impl.cc
+++ b/content/browser/preloading/prerenderer_impl.cc
@@ -40,6 +40,10 @@
     observation_.Observe(registry_.get());
   }
   ResetReceivedPrerendersCountForMetrics();
+  if (base::FeatureList::IsEnabled(
+          blink::features::kLCPTimingPredictorPrerender2)) {
+    blocked_ = true;
+  }
 }
 
 PrerendererImpl::~PrerendererImpl() {
@@ -191,9 +195,20 @@
   }
 }
 
+void PrerendererImpl::OnLCPPredicted() {
+  blocked_ = false;
+  for (auto& candidate : std::move(blocked_candidates_)) {
+    MaybePrerender(candidate);
+  }
+}
+
 bool PrerendererImpl::MaybePrerender(
     const blink::mojom::SpeculationCandidatePtr& candidate) {
   CHECK_EQ(candidate->action, blink::mojom::SpeculationAction::kPrerender);
+  if (blocked_) {
+    blocked_candidates_.push_back(candidate->Clone());
+    return false;
+  }
 
   // Prerendering frames should not trigger any prerender request.
   CHECK(!render_frame_host_->IsInLifecycleState(
diff --git a/content/browser/preloading/prerenderer_impl.h b/content/browser/preloading/prerenderer_impl.h
index 634f746..c01b32f 100644
--- a/content/browser/preloading/prerenderer_impl.h
+++ b/content/browser/preloading/prerenderer_impl.h
@@ -32,6 +32,7 @@
 
   bool MaybePrerender(
       const blink::mojom::SpeculationCandidatePtr& candidate) override;
+  void OnLCPPredicted() override;
 
   bool ShouldWaitForPrerenderResult(const GURL& url) override;
 
@@ -85,6 +86,11 @@
   // content::PreloadingDecider, which inherits content::DocumentUserData, owns
   // `this`, so `this` can access `render_frame_host_` safely.
   const raw_ref<RenderFrameHost> render_frame_host_;
+
+  // Below two fields are used to defer starting prerenders until LCP timing
+  // and are only used under LCPTimingPredictorPrerender2.
+  bool blocked_ = false;
+  std::vector<blink::mojom::SpeculationCandidatePtr> blocked_candidates_;
 };
 
 }  // namespace content
diff --git a/content/browser/preloading/prerenderer_impl_unittest.cc b/content/browser/preloading/prerenderer_impl_unittest.cc
index 765a353..cf3f199 100644
--- a/content/browser/preloading/prerenderer_impl_unittest.cc
+++ b/content/browser/preloading/prerenderer_impl_unittest.cc
@@ -99,6 +99,27 @@
   EXPECT_TRUE(registry->FindHostByUrlForTesting(kPrerenderingUrl));
 }
 
+// Tests that Prerenderer should not start prerendering when
+// kLCPTimingPredictorPrerender2 is enabled and until OnLCPPredicted is called.
+TEST_F(PrerendererTest, LCPTimingPredictorPrerender2) {
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitAndEnableFeature(
+      blink::features::kLCPTimingPredictorPrerender2);
+
+  PrerenderHostRegistry* registry = GetPrerenderHostRegistry();
+  PrerendererImpl prerenderer(*GetRenderFrameHost());
+
+  const GURL kPrerenderingUrl = GetSameOriginUrl("/empty.html");
+  std::vector<blink::mojom::SpeculationCandidatePtr> candidates;
+  candidates.push_back(CreatePrerenderCandidate(kPrerenderingUrl));
+
+  prerenderer.ProcessCandidatesForPrerender(std::move(candidates));
+  EXPECT_FALSE(registry->FindHostByUrlForTesting(kPrerenderingUrl));
+
+  prerenderer.OnLCPPredicted();
+  EXPECT_TRUE(registry->FindHostByUrlForTesting(kPrerenderingUrl));
+}
+
 // Tests that Prerenderer will skip a cross-site candidate even if it is the
 // first prerender candidate in the candidate list.
 TEST_F(PrerendererTest, ProcessFirstSameOriginPrerenderCandidate) {
diff --git a/content/browser/preloading/speculation_rules/speculation_host_impl.cc b/content/browser/preloading/speculation_rules/speculation_host_impl.cc
index 49f41c5..183c887 100644
--- a/content/browser/preloading/speculation_rules/speculation_host_impl.cc
+++ b/content/browser/preloading/speculation_rules/speculation_host_impl.cc
@@ -76,6 +76,13 @@
   preloading_decider->UpdateSpeculationCandidates(candidates);
 }
 
+void SpeculationHostImpl::OnLCPPredicted() {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  auto* preloading_decider =
+      PreloadingDecider::GetOrCreateForCurrentDocument(&render_frame_host());
+  preloading_decider->OnLCPPredicted();
+}
+
 void SpeculationHostImpl::EnableNoVarySearchSupport() {
   auto* prefetch_document_manager =
       PrefetchDocumentManager::GetOrCreateForCurrentDocument(
diff --git a/content/browser/preloading/speculation_rules/speculation_host_impl.h b/content/browser/preloading/speculation_rules/speculation_host_impl.h
index ad48d3ce..9c73cfbb 100644
--- a/content/browser/preloading/speculation_rules/speculation_host_impl.h
+++ b/content/browser/preloading/speculation_rules/speculation_host_impl.h
@@ -37,6 +37,7 @@
 
   void UpdateSpeculationCandidates(
       std::vector<blink::mojom::SpeculationCandidatePtr> candidates) override;
+  void OnLCPPredicted() override;
   void EnableNoVarySearchSupport() override;
   void InitiatePreview(const GURL& url) override;
 };
diff --git a/content/browser/speech/network_speech_recognition_engine_impl.cc b/content/browser/speech/network_speech_recognition_engine_impl.cc
new file mode 100644
index 0000000..c3bc9cd
--- /dev/null
+++ b/content/browser/speech/network_speech_recognition_engine_impl.cc
@@ -0,0 +1,758 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/speech/network_speech_recognition_engine_impl.h"
+
+#include <algorithm>
+#include <memory>
+#include <vector>
+
+#include "base/functional/bind.h"
+#include "base/metrics/histogram_functions.h"
+#include "base/numerics/byte_conversions.h"
+#include "base/numerics/safe_conversions.h"
+#include "base/rand_util.h"
+#include "base/strings/escape.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
+#include "components/speech/audio_buffer.h"
+#include "content/public/browser/google_streaming_api.pb.h"
+#include "google_apis/google_api_keys.h"
+#include "media/base/audio_timestamp_helper.h"
+#include "mojo/public/c/system/types.h"
+#include "mojo/public/cpp/bindings/receiver_set.h"
+#include "net/base/load_flags.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
+#include "third_party/blink/public/mojom/speech/speech_recognition_error.mojom.h"
+#include "third_party/blink/public/mojom/speech/speech_recognition_result.mojom.h"
+
+namespace content {
+namespace {
+
+const char kWebServiceBaseUrl[] =
+    "https://www.google.com/speech-api/full-duplex/v1";
+const char kDownstreamUrl[] = "/down?";
+const char kUpstreamUrl[] = "/up?";
+
+constexpr char kWebSpeechAudioDuration[] = "Accessibility.WebSpeech.Duration";
+
+// Used to override |kWebServiceBaseUrl| when non-null, only set in tests.
+const char* web_service_base_url_for_tests = nullptr;
+
+// This matches the maximum maxAlternatives value supported by the server.
+const uint32_t kMaxMaxAlternatives = 30;
+
+// TODO(hans): Remove this and other logging when we don't need it anymore.
+void DumpResponse(const std::string& response) {
+  DVLOG(1) << "------------";
+  proto::SpeechRecognitionEvent event;
+  if (!event.ParseFromString(response)) {
+    DVLOG(1) << "Parse failed!";
+    return;
+  }
+  if (event.has_status()) {
+    DVLOG(1) << "STATUS\t" << event.status();
+  }
+  if (event.has_endpoint()) {
+    DVLOG(1) << "ENDPOINT\t" << event.endpoint();
+  }
+  for (int i = 0; i < event.result_size(); ++i) {
+    DVLOG(1) << "RESULT #" << i << ":";
+    const proto::SpeechRecognitionResult& res = event.result(i);
+    if (res.has_final()) {
+      DVLOG(1) << "  final:\t" << res.final();
+    }
+    if (res.has_stability()) {
+      DVLOG(1) << "  STABILITY:\t" << res.stability();
+    }
+    for (int j = 0; j < res.alternative_size(); ++j) {
+      const proto::SpeechRecognitionAlternative& alt = res.alternative(j);
+      if (alt.has_confidence()) {
+        DVLOG(1) << "    CONFIDENCE:\t" << alt.confidence();
+      }
+      if (alt.has_transcript()) {
+        DVLOG(1) << "    TRANSCRIPT:\t" << alt.transcript();
+      }
+    }
+  }
+}
+
+const int kDefaultConfigSampleRate = 8000;
+const int kDefaultConfigBitsPerSample = 16;
+const uint32_t kDefaultMaxHypotheses = 1;
+
+}  // namespace
+
+NetworkSpeechRecognitionEngineImpl::Config::Config()
+    : max_hypotheses(kDefaultMaxHypotheses),
+      audio_sample_rate(kDefaultConfigSampleRate),
+      audio_num_bits_per_sample(kDefaultConfigBitsPerSample) {}
+
+NetworkSpeechRecognitionEngineImpl::Config::~Config() = default;
+
+const int NetworkSpeechRecognitionEngineImpl::kAudioPacketIntervalMs = 100;
+const int NetworkSpeechRecognitionEngineImpl::kWebserviceStatusNoError = 0;
+const int NetworkSpeechRecognitionEngineImpl::kWebserviceStatusErrorNoMatch = 5;
+
+NetworkSpeechRecognitionEngineImpl::NetworkSpeechRecognitionEngineImpl(
+    scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory,
+    const std::string& accept_language)
+    : shared_url_loader_factory_(std::move(shared_url_loader_factory)),
+      accept_language_(accept_language) {}
+
+NetworkSpeechRecognitionEngineImpl::~NetworkSpeechRecognitionEngineImpl() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+}
+
+void NetworkSpeechRecognitionEngineImpl::set_web_service_base_url_for_tests(
+    const char* base_url_for_tests) {
+  web_service_base_url_for_tests = base_url_for_tests;
+}
+
+void NetworkSpeechRecognitionEngineImpl::SetConfig(const Config& config) {
+  config_ = config;
+}
+
+bool NetworkSpeechRecognitionEngineImpl::IsRecognitionPending() const {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  return state_ != STATE_IDLE;
+}
+
+void NetworkSpeechRecognitionEngineImpl::StartRecognition() {
+  upstream_audio_duration_ = base::TimeDelta();
+  FSMEventArgs event_args(EVENT_START_RECOGNITION);
+  DispatchEvent(event_args);
+}
+
+void NetworkSpeechRecognitionEngineImpl::EndRecognition() {
+  base::UmaHistogramLongTimes100(kWebSpeechAudioDuration,
+                                 upstream_audio_duration_);
+
+  FSMEventArgs event_args(EVENT_END_RECOGNITION);
+  DispatchEvent(event_args);
+}
+
+void NetworkSpeechRecognitionEngineImpl::TakeAudioChunk(
+    const AudioChunk& data) {
+  FSMEventArgs event_args(EVENT_AUDIO_CHUNK);
+  event_args.audio_data = &data;
+  DispatchEvent(event_args);
+}
+
+void NetworkSpeechRecognitionEngineImpl::AudioChunksEnded() {
+  FSMEventArgs event_args(EVENT_AUDIO_CHUNKS_ENDED);
+  DispatchEvent(event_args);
+}
+
+void NetworkSpeechRecognitionEngineImpl::OnUpstreamDataComplete(
+    bool success,
+    int response_code) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  DVLOG(1) << "Upstream complete success: " << success
+           << " response_code: " << response_code;
+
+  if (!success) {
+    FSMEventArgs event_args(EVENT_UPSTREAM_ERROR);
+    DispatchEvent(event_args);
+    return;
+  }
+
+  // Do nothing on clean completion of upstream request.
+}
+
+void NetworkSpeechRecognitionEngineImpl::OnDownstreamDataReceived(
+    base::StringPiece new_response_data) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  DVLOG(1) << "Downstream length: " << new_response_data.size();
+
+  // The downstream response is organized in chunks, whose size is determined
+  // by a 4 bytes prefix, transparently handled by the ChunkedByteBuffer class.
+  // Such chunks are sent by the speech recognition webservice over the HTTP
+  // downstream channel using HTTP chunked transfer (unrelated to our chunks).
+  // This function is called every time an HTTP chunk is received by the
+  // url fetcher. However there isn't any particular matching between our
+  // protocol chunks and HTTP chunks, in the sense that a single HTTP chunk can
+  // contain a portion of one chunk or even more chunks together.
+  chunked_byte_buffer_.Append(new_response_data);
+
+  // A single HTTP chunk can contain more than one data chunk, thus the while.
+  while (chunked_byte_buffer_.HasChunks()) {
+    FSMEventArgs event_args(EVENT_DOWNSTREAM_RESPONSE);
+    event_args.response = chunked_byte_buffer_.PopChunk();
+    DCHECK(event_args.response.get());
+    DumpResponse(
+        std::string(event_args.response->begin(), event_args.response->end()));
+    DispatchEvent(event_args);
+  }
+}
+
+void NetworkSpeechRecognitionEngineImpl::OnDownstreamDataComplete(
+    bool success,
+    int response_code) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  DVLOG(1) << "Downstream complete success: " << success
+           << " response_code: " << response_code;
+
+  if (!success) {
+    FSMEventArgs event_args(EVENT_DOWNSTREAM_ERROR);
+    DispatchEvent(event_args);
+    return;
+  }
+
+  FSMEventArgs event_args(EVENT_DOWNSTREAM_CLOSED);
+  DispatchEvent(event_args);
+}
+
+int NetworkSpeechRecognitionEngineImpl::GetDesiredAudioChunkDurationMs() const {
+  return kAudioPacketIntervalMs;
+}
+
+// -----------------------  Core FSM implementation ---------------------------
+
+void NetworkSpeechRecognitionEngineImpl::DispatchEvent(
+    const FSMEventArgs& event_args) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK_LE(event_args.event, EVENT_MAX_VALUE);
+  DCHECK_LE(state_, STATE_MAX_VALUE);
+
+  // Event dispatching must be sequential, otherwise it will break all the rules
+  // and the assumptions of the finite state automata model.
+  DCHECK(!is_dispatching_event_);
+  is_dispatching_event_ = true;
+
+  state_ = ExecuteTransitionAndGetNextState(event_args);
+
+  is_dispatching_event_ = false;
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::ExecuteTransitionAndGetNextState(
+    const FSMEventArgs& event_args) {
+  const FSMEvent event = event_args.event;
+  switch (state_) {
+    case STATE_IDLE:
+      switch (event) {
+        case EVENT_START_RECOGNITION:
+          return ConnectBothStreams(event_args);
+        case EVENT_END_RECOGNITION:
+        // Note AUDIO_CHUNK and AUDIO_END events can remain enqueued in case of
+        // abort, so we just silently drop them here.
+        case EVENT_AUDIO_CHUNK:
+        case EVENT_AUDIO_CHUNKS_ENDED:
+        // DOWNSTREAM_CLOSED can be received if we end up here due to an error.
+        case EVENT_DOWNSTREAM_CLOSED:
+          return DoNothing(event_args);
+        case EVENT_UPSTREAM_ERROR:
+        case EVENT_DOWNSTREAM_ERROR:
+        case EVENT_DOWNSTREAM_RESPONSE:
+          return NotFeasible(event_args);
+      }
+      break;
+    case STATE_BOTH_STREAMS_CONNECTED:
+      switch (event) {
+        case EVENT_AUDIO_CHUNK:
+          return TransmitAudioUpstream(event_args);
+        case EVENT_DOWNSTREAM_RESPONSE:
+          return ProcessDownstreamResponse(event_args);
+        case EVENT_AUDIO_CHUNKS_ENDED:
+          return CloseUpstreamAndWaitForResults(event_args);
+        case EVENT_END_RECOGNITION:
+          return AbortSilently(event_args);
+        case EVENT_UPSTREAM_ERROR:
+        case EVENT_DOWNSTREAM_ERROR:
+        case EVENT_DOWNSTREAM_CLOSED:
+          return AbortWithError(event_args);
+        case EVENT_START_RECOGNITION:
+          return NotFeasible(event_args);
+      }
+      break;
+    case STATE_WAITING_DOWNSTREAM_RESULTS:
+      switch (event) {
+        case EVENT_DOWNSTREAM_RESPONSE:
+          return ProcessDownstreamResponse(event_args);
+        case EVENT_DOWNSTREAM_CLOSED:
+          return RaiseNoMatchErrorIfGotNoResults(event_args);
+        case EVENT_END_RECOGNITION:
+          return AbortSilently(event_args);
+        case EVENT_UPSTREAM_ERROR:
+        case EVENT_DOWNSTREAM_ERROR:
+          return AbortWithError(event_args);
+        case EVENT_START_RECOGNITION:
+        case EVENT_AUDIO_CHUNK:
+        case EVENT_AUDIO_CHUNKS_ENDED:
+          return NotFeasible(event_args);
+      }
+      break;
+  }
+  return NotFeasible(event_args);
+}
+
+// ----------- Contract for all the FSM evolution functions below -------------
+//  - Are guaranteed to be executed in the same thread (IO, except for tests);
+//  - Are guaranteed to be not reentrant (themselves and each other);
+//  - event_args members are guaranteed to be stable during the call;
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::ConnectBothStreams(const FSMEventArgs&) {
+  DCHECK(!upstream_loader_.get());
+  DCHECK(!downstream_loader_.get());
+
+  encoder_ = std::make_unique<AudioEncoder>(config_.audio_sample_rate,
+                                            config_.audio_num_bits_per_sample);
+  DCHECK(encoder_.get());
+  const std::string request_key = GenerateRequestKey();
+
+  // Only use the framed post data format when a preamble needs to be logged.
+  use_framed_post_data_ =
+      (config_.preamble && !config_.preamble->sample_data.empty() &&
+       !config_.auth_token.empty() && !config_.auth_scope.empty());
+  if (use_framed_post_data_) {
+    preamble_encoder_ = std::make_unique<AudioEncoder>(
+        config_.preamble->sample_rate, config_.preamble->sample_depth * 8);
+  }
+
+  const char* web_service_base_url = !web_service_base_url_for_tests
+                                         ? kWebServiceBaseUrl
+                                         : web_service_base_url_for_tests;
+
+  // Setup downstream fetcher.
+  std::vector<std::string> downstream_args;
+  downstream_args.push_back(
+      "key=" + base::EscapeQueryParamValue(google_apis::GetAPIKey(), true));
+  downstream_args.push_back("pair=" + request_key);
+  downstream_args.push_back("output=pb");
+  GURL downstream_url(std::string(web_service_base_url) +
+                      std::string(kDownstreamUrl) +
+                      base::JoinString(downstream_args, "&"));
+
+  net::NetworkTrafficAnnotationTag downstream_traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("speech_recognition_downstream", R"(
+        semantics {
+          sender: "Speech Recognition"
+          description:
+            "Chrome provides translation from speech audio recorded with a "
+            "microphone to text, by using the Google speech recognition web "
+            "service. Audio is sent to Google's servers (upstream) and text is "
+            "returned (downstream). This network request (downstream) sends an "
+            "id for getting the text response. Then the (upstream) request "
+            "sends the audio data along with the id. When the server has "
+            "finished processing the audio data and produced a text response, "
+            "it replies to this request."
+          trigger:
+            "The user chooses to start the recognition by clicking the "
+            "microphone icon of the pages using Web SpeechRecognition API."
+          internal {
+            contacts {
+              email: "chrome-media-ux@google.com"
+            }
+          }
+          user_data {
+            type: USER_CONTENT
+          }
+          data: "A unique random id for this speech recognition request."
+          destination: GOOGLE_OWNED_SERVICE
+          last_reviewed: "2024-2-21"
+        }
+        policy {
+          cookies_allowed: NO
+          setting:
+            "The user must allow the browser to access the microphone in a "
+            "permission prompt. This is set per site (hostname pattern). In "
+            "the site settings menu, microphone access can be turned off "
+            "for all sites and site specific settings can be changed."
+          chrome_policy {
+            AudioCaptureAllowed {
+              policy_options {mode: MANDATORY}
+              AudioCaptureAllowed: false
+            }
+          }
+          chrome_policy {
+            AudioCaptureAllowedUrls {
+              policy_options {mode: MANDATORY}
+              AudioCaptureAllowedUrls: {}
+            }
+          }
+        })");
+  auto downstream_request = std::make_unique<network::ResourceRequest>();
+  downstream_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
+  downstream_request->url = downstream_url;
+  downstream_loader_ = std::make_unique<speech::DownstreamLoader>(
+      std::move(downstream_request), downstream_traffic_annotation,
+      shared_url_loader_factory_.get(), this);
+
+  // Setup upstream fetcher.
+  // TODO(hans): Support for user-selected grammars.
+  std::vector<std::string> upstream_args;
+  upstream_args.push_back(
+      "key=" + base::EscapeQueryParamValue(google_apis::GetAPIKey(), true));
+  upstream_args.push_back("pair=" + request_key);
+  upstream_args.push_back("output=pb");
+  upstream_args.push_back(
+      "lang=" + base::EscapeQueryParamValue(GetAcceptedLanguages(), true));
+  upstream_args.push_back(config_.filter_profanities ? "pFilter=2"
+                                                     : "pFilter=0");
+  if (config_.max_hypotheses > 0U) {
+    uint32_t max_alternatives =
+        std::min(kMaxMaxAlternatives, config_.max_hypotheses);
+    upstream_args.push_back("maxAlternatives=" +
+                            base::NumberToString(max_alternatives));
+  }
+  upstream_args.push_back("app=chromium");
+  for (const blink::mojom::SpeechRecognitionGrammar& grammar :
+       config_.grammars) {
+    std::string grammar_value(base::NumberToString(grammar.weight) + ":" +
+                              grammar.url.spec());
+    upstream_args.push_back("grammar=" +
+                            base::EscapeQueryParamValue(grammar_value, true));
+  }
+  if (config_.continuous) {
+    upstream_args.push_back("continuous");
+  } else {
+    upstream_args.push_back("endpoint=1");
+  }
+  if (config_.interim_results) {
+    upstream_args.push_back("interim");
+  }
+  if (!config_.auth_token.empty() && !config_.auth_scope.empty()) {
+    upstream_args.push_back(
+        "authScope=" + base::EscapeQueryParamValue(config_.auth_scope, true));
+    upstream_args.push_back(
+        "authToken=" + base::EscapeQueryParamValue(config_.auth_token, true));
+  }
+  if (use_framed_post_data_) {
+    std::string audio_format;
+    if (preamble_encoder_) {
+      audio_format = preamble_encoder_->GetMimeType() + ",";
+    }
+    audio_format += encoder_->GetMimeType();
+    upstream_args.push_back("audioFormat=" +
+                            base::EscapeQueryParamValue(audio_format, true));
+  }
+
+  GURL upstream_url(std::string(web_service_base_url) +
+                    std::string(kUpstreamUrl) +
+                    base::JoinString(upstream_args, "&"));
+
+  net::NetworkTrafficAnnotationTag upstream_traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("speech_recognition_upstream", R"(
+        semantics {
+          sender: "Speech Recognition"
+          description:
+            "Chrome provides translation from speech audio recorded with a "
+            "microphone to text, by using the Google speech recognition web "
+            "service. Audio is sent to Google's servers (upstream) and text is "
+            "returned (downstream)."
+          trigger:
+            "The user chooses to start the recognition by clicking the "
+            "microphone icon of the pages using Web SpeechRecognition API."
+          internal {
+            contacts {
+              email: "chrome-media-ux@google.com"
+            }
+          }
+          user_data {
+            type: USER_CONTENT
+          }
+          data:
+            "Audio recorded with the microphone, and the unique id of "
+            "downstream speech recognition request."
+          destination: GOOGLE_OWNED_SERVICE
+          last_reviewed: "2024-2-21"
+        }
+        policy {
+          cookies_allowed: NO
+          setting:
+            "The user must allow the browser to access the microphone in a "
+            "permission prompt. This is set per site (hostname pattern). In "
+            "the site settings menu, microphone access can be turned off "
+            "for all sites and site specific settings can be changed."
+          chrome_policy {
+            AudioCaptureAllowed {
+              policy_options {mode: MANDATORY}
+              AudioCaptureAllowed: false
+            }
+          }
+          chrome_policy {
+            AudioCaptureAllowedUrls {
+              policy_options {mode: MANDATORY}
+              AudioCaptureAllowedUrls: {}
+            }
+          }
+        })");
+
+  auto upstream_request = std::make_unique<network::ResourceRequest>();
+  upstream_request->url = upstream_url;
+  upstream_request->method = "POST";
+  upstream_request->referrer = GURL(config_.origin_url);
+  upstream_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
+  if (use_framed_post_data_) {
+    upstream_request->headers.SetHeader(net::HttpRequestHeaders::kContentType,
+                                        "application/octet-stream");
+  } else {
+    upstream_request->headers.SetHeader(net::HttpRequestHeaders::kContentType,
+                                        encoder_->GetMimeType());
+  }
+
+  upstream_loader_ = std::make_unique<speech::UpstreamLoader>(
+      std::move(upstream_request), upstream_traffic_annotation,
+      shared_url_loader_factory_.get(), this);
+
+  if (preamble_encoder_) {
+    // Encode and send preamble right away.
+    scoped_refptr<AudioChunk> chunk = new AudioChunk(
+        reinterpret_cast<const uint8_t*>(config_.preamble->sample_data.data()),
+        config_.preamble->sample_data.size(), config_.preamble->sample_depth);
+    preamble_encoder_->Encode(*chunk);
+    preamble_encoder_->Flush();
+    scoped_refptr<AudioChunk> encoded_data(
+        preamble_encoder_->GetEncodedDataAndClear());
+    UploadAudioChunk(encoded_data->AsString(), FRAME_PREAMBLE_AUDIO, false);
+  }
+  return STATE_BOTH_STREAMS_CONNECTED;
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::TransmitAudioUpstream(
+    const FSMEventArgs& event_args) {
+  DCHECK(upstream_loader_.get());
+  DCHECK(event_args.audio_data.get());
+  const AudioChunk& audio = *(event_args.audio_data.get());
+
+  base::TimeDelta duration = media::AudioTimestampHelper::FramesToTime(
+      audio.NumSamples(), config_.audio_sample_rate);
+  upstream_audio_duration_ += duration;
+
+  DCHECK_EQ(audio.bytes_per_sample(), config_.audio_num_bits_per_sample / 8);
+  encoder_->Encode(audio);
+  scoped_refptr<AudioChunk> encoded_data(encoder_->GetEncodedDataAndClear());
+  UploadAudioChunk(encoded_data->AsString(), FRAME_RECOGNITION_AUDIO, false);
+  return state_;
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::ProcessDownstreamResponse(
+    const FSMEventArgs& event_args) {
+  DCHECK(event_args.response.get());
+
+  proto::SpeechRecognitionEvent ws_event;
+  if (!ws_event.ParseFromString(std::string(event_args.response->begin(),
+                                            event_args.response->end()))) {
+    return AbortWithError(event_args);
+  }
+
+  if (ws_event.has_status()) {
+    switch (ws_event.status()) {
+      case proto::SpeechRecognitionEvent::STATUS_SUCCESS:
+        break;
+      case proto::SpeechRecognitionEvent::STATUS_NO_SPEECH:
+        return Abort(blink::mojom::SpeechRecognitionErrorCode::kNoSpeech);
+      case proto::SpeechRecognitionEvent::STATUS_ABORTED:
+        return Abort(blink::mojom::SpeechRecognitionErrorCode::kAborted);
+      case proto::SpeechRecognitionEvent::STATUS_AUDIO_CAPTURE:
+        return Abort(blink::mojom::SpeechRecognitionErrorCode::kAudioCapture);
+      case proto::SpeechRecognitionEvent::STATUS_NETWORK:
+        return Abort(blink::mojom::SpeechRecognitionErrorCode::kNetwork);
+      case proto::SpeechRecognitionEvent::STATUS_NOT_ALLOWED:
+        return Abort(blink::mojom::SpeechRecognitionErrorCode::kNotAllowed);
+      case proto::SpeechRecognitionEvent::STATUS_SERVICE_NOT_ALLOWED:
+        return Abort(
+            blink::mojom::SpeechRecognitionErrorCode::kServiceNotAllowed);
+      case proto::SpeechRecognitionEvent::STATUS_BAD_GRAMMAR:
+        return Abort(blink::mojom::SpeechRecognitionErrorCode::kBadGrammar);
+      case proto::SpeechRecognitionEvent::STATUS_LANGUAGE_NOT_SUPPORTED:
+        return Abort(
+            blink::mojom::SpeechRecognitionErrorCode::kLanguageNotSupported);
+    }
+  }
+
+  if (!config_.continuous && ws_event.has_endpoint() &&
+      ws_event.endpoint() == proto::SpeechRecognitionEvent::END_OF_UTTERANCE) {
+    delegate_->OnSpeechRecognitionEngineEndOfUtterance();
+  }
+
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
+  for (int i = 0; i < ws_event.result_size(); ++i) {
+    const proto::SpeechRecognitionResult& ws_result = ws_event.result(i);
+    results.push_back(blink::mojom::SpeechRecognitionResult::New());
+    blink::mojom::SpeechRecognitionResultPtr& result = results.back();
+    result->is_provisional = !(ws_result.has_final() && ws_result.final());
+
+    if (!result->is_provisional) {
+      got_last_definitive_result_ = true;
+    }
+
+    for (int j = 0; j < ws_result.alternative_size(); ++j) {
+      const proto::SpeechRecognitionAlternative& ws_alternative =
+          ws_result.alternative(j);
+      blink::mojom::SpeechRecognitionHypothesisPtr hypothesis =
+          blink::mojom::SpeechRecognitionHypothesis::New();
+      if (ws_alternative.has_confidence()) {
+        hypothesis->confidence = ws_alternative.confidence();
+      } else if (ws_result.has_stability()) {
+        hypothesis->confidence = ws_result.stability();
+      }
+      DCHECK(ws_alternative.has_transcript());
+      // TODO(hans): Perhaps the transcript should be required in the proto?
+      if (ws_alternative.has_transcript()) {
+        hypothesis->utterance = base::UTF8ToUTF16(ws_alternative.transcript());
+      }
+
+      result->hypotheses.push_back(std::move(hypothesis));
+    }
+  }
+  if (results.size()) {
+    delegate_->OnSpeechRecognitionEngineResults(results);
+  }
+
+  return state_;
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::RaiseNoMatchErrorIfGotNoResults(
+    const FSMEventArgs& event_args) {
+  if (!got_last_definitive_result_) {
+    // Provide an empty result to notify that recognition is ended with no
+    // errors, yet neither any further results.
+    delegate_->OnSpeechRecognitionEngineResults(
+        std::vector<blink::mojom::SpeechRecognitionResultPtr>());
+  }
+  return AbortSilently(event_args);
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::CloseUpstreamAndWaitForResults(
+    const FSMEventArgs&) {
+  DCHECK(upstream_loader_.get());
+  DCHECK(encoder_.get());
+
+  DVLOG(1) << "Closing upstream.";
+
+  // The encoder requires a non-empty final buffer. So we encode a packet
+  // of silence in case encoder had no data already.
+  size_t sample_count =
+      config_.audio_sample_rate * kAudioPacketIntervalMs / 1000;
+  scoped_refptr<AudioChunk> dummy_chunk = new AudioChunk(
+      sample_count * sizeof(int16_t), encoder_->GetBitsPerSample() / 8);
+  encoder_->Encode(*dummy_chunk.get());
+  encoder_->Flush();
+  scoped_refptr<AudioChunk> encoded_dummy_data =
+      encoder_->GetEncodedDataAndClear();
+  DCHECK(!encoded_dummy_data->IsEmpty());
+  encoder_.reset();
+
+  UploadAudioChunk(encoded_dummy_data->AsString(), FRAME_RECOGNITION_AUDIO,
+                   true);
+  got_last_definitive_result_ = false;
+  return STATE_WAITING_DOWNSTREAM_RESULTS;
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::CloseDownstream(const FSMEventArgs&) {
+  DCHECK(!upstream_loader_.get());
+  DCHECK(downstream_loader_.get());
+
+  DVLOG(1) << "Closing downstream.";
+  downstream_loader_.reset();
+  return STATE_IDLE;
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::AbortSilently(const FSMEventArgs&) {
+  return Abort(blink::mojom::SpeechRecognitionErrorCode::kNone);
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::AbortWithError(const FSMEventArgs&) {
+  return Abort(blink::mojom::SpeechRecognitionErrorCode::kNetwork);
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::Abort(
+    blink::mojom::SpeechRecognitionErrorCode error_code) {
+  DVLOG(1) << "Aborting with error " << error_code;
+
+  if (error_code != blink::mojom::SpeechRecognitionErrorCode::kNone) {
+    delegate_->OnSpeechRecognitionEngineError(
+        blink::mojom::SpeechRecognitionError(
+            error_code, blink::mojom::SpeechAudioErrorDetails::kNone));
+  }
+  downstream_loader_.reset();
+  upstream_loader_.reset();
+  encoder_.reset();
+  return STATE_IDLE;
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::DoNothing(const FSMEventArgs&) {
+  return state_;
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMState
+NetworkSpeechRecognitionEngineImpl::NotFeasible(
+    const FSMEventArgs& event_args) {
+  NOTREACHED() << "Unfeasible event " << event_args.event << " in state "
+               << state_;
+  return state_;
+}
+
+std::string NetworkSpeechRecognitionEngineImpl::GetAcceptedLanguages() const {
+  std::string langs = config_.language;
+  if (langs.empty() && !accept_language_.empty()) {
+    // If no language is provided then we use the first from the accepted
+    // language list. If this list is empty then it defaults to "en-US".
+    // Example of the contents of this list: "es,en-GB;q=0.8", ""
+    size_t separator = accept_language_.find_first_of(",;");
+    if (separator != std::string::npos) {
+      langs = accept_language_.substr(0, separator);
+    }
+  }
+  if (langs.empty()) {
+    langs = "en-US";
+  }
+  return langs;
+}
+
+// TODO(primiano): Is there any utility in the codebase that already does this?
+std::string NetworkSpeechRecognitionEngineImpl::GenerateRequestKey() const {
+  const int64_t kKeepLowBytes = 0x00000000FFFFFFFFLL;
+  const int64_t kKeepHighBytes = 0xFFFFFFFF00000000LL;
+
+  // Just keep the least significant bits of timestamp, in order to reduce
+  // probability of collisions.
+  int64_t key = (base::Time::Now().ToInternalValue() & kKeepLowBytes) |
+                (base::RandUint64() & kKeepHighBytes);
+  return base::HexEncode(reinterpret_cast<void*>(&key), sizeof(key));
+}
+
+void NetworkSpeechRecognitionEngineImpl::UploadAudioChunk(
+    const std::string& data,
+    FrameType type,
+    bool is_final) {
+  if (use_framed_post_data_) {
+    std::string frame(data.size() + 8u, char{0});
+    auto frame_span = base::as_writable_byte_span(frame);
+    frame_span.subspan<0u, 4u>().copy_from(
+        base::numerics::U32ToBigEndian(static_cast<uint32_t>(data.size())));
+    frame_span.subspan<4u, 4u>().copy_from(
+        base::numerics::U32ToBigEndian(base::checked_cast<uint32_t>(type)));
+    frame.replace(8u, data.size(), data);
+    upstream_loader_->AppendChunkToUpload(frame, is_final);
+  } else {
+    upstream_loader_->AppendChunkToUpload(data, is_final);
+  }
+}
+
+NetworkSpeechRecognitionEngineImpl::FSMEventArgs::FSMEventArgs(
+    FSMEvent event_value)
+    : event(event_value) {}
+
+NetworkSpeechRecognitionEngineImpl::FSMEventArgs::~FSMEventArgs() = default;
+
+}  // namespace content
diff --git a/content/browser/speech/network_speech_recognition_engine_impl.h b/content/browser/speech/network_speech_recognition_engine_impl.h
new file mode 100644
index 0000000..40bf4d9
--- /dev/null
+++ b/content/browser/speech/network_speech_recognition_engine_impl.h
@@ -0,0 +1,217 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_BROWSER_SPEECH_NETWORK_SPEECH_RECOGNITION_ENGINE_IMPL_H_
+#define CONTENT_BROWSER_SPEECH_NETWORK_SPEECH_RECOGNITION_ENGINE_IMPL_H_
+
+#include <stdint.h>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "base/memory/raw_ptr.h"
+#include "base/memory/ref_counted.h"
+#include "base/sequence_checker.h"
+#include "base/strings/string_piece.h"
+#include "components/speech/audio_encoder.h"
+#include "components/speech/chunked_byte_buffer.h"
+#include "components/speech/downstream_loader.h"
+#include "components/speech/downstream_loader_client.h"
+#include "components/speech/upstream_loader.h"
+#include "components/speech/upstream_loader_client.h"
+#include "content/browser/speech/speech_recognition_engine.h"
+#include "content/common/content_export.h"
+#include "content/public/browser/speech_recognition_session_preamble.h"
+#include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
+#include "third_party/blink/public/mojom/speech/speech_recognition_error.mojom.h"
+#include "third_party/blink/public/mojom/speech/speech_recognition_grammar.mojom.h"
+#include "third_party/blink/public/mojom/speech/speech_recognition_result.mojom.h"
+
+class AudioChunk;
+
+namespace base {
+class TimeDelta;
+}
+
+namespace network {
+class SharedURLLoaderFactory;
+}
+
+namespace content {
+
+// This is the network implementation for `SpeechRecognitionEngine`, which is
+// supporting continuous recognition by means of interaction with the Google
+// streaming speech recognition webservice.
+//
+// This class establishes two HTTPS connections with the webservice for each
+// session, herein called "upstream" and "downstream". Audio chunks are sent on
+// the upstream by means of a chunked HTTP POST upload. Recognition results are
+// retrieved in a full-duplex fashion (i.e. while pushing audio on the upstream)
+// on the downstream by means of a chunked HTTP GET request. Pairing between the
+// two stream is handled through a randomly generated key, unique for each
+// request, which is passed in the &pair= arg to both stream request URLs. In
+// the case of a regular session, the upstream is closed when the audio capture
+// ends (notified through a |AudioChunksEnded| call) and the downstream waits
+// for a corresponding server closure (eventually some late results can come
+// after closing the upstream). Both streams are guaranteed to be closed when
+// |EndRecognition| call is issued.
+
+class CONTENT_EXPORT NetworkSpeechRecognitionEngineImpl
+    : public SpeechRecognitionEngine,
+      public speech::UpstreamLoaderClient,
+      public speech::DownstreamLoaderClient {
+ public:
+  // Network engine configuration.
+  struct CONTENT_EXPORT Config {
+    Config();
+    ~Config();
+
+    std::string language;
+    std::vector<blink::mojom::SpeechRecognitionGrammar> grammars;
+    bool filter_profanities = false;
+    bool continuous = true;
+    bool interim_results = true;
+    uint32_t max_hypotheses;
+    std::string origin_url;
+    int audio_sample_rate;
+    int audio_num_bits_per_sample;
+    std::string auth_token;
+    std::string auth_scope;
+    scoped_refptr<SpeechRecognitionSessionPreamble> preamble;
+  };
+
+  // Duration of each audio packet.
+  static const int kAudioPacketIntervalMs;
+
+  // |accept_language| is the default Accept-Language header.
+  NetworkSpeechRecognitionEngineImpl(
+      scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory,
+      const std::string& accept_language);
+
+  NetworkSpeechRecognitionEngineImpl(
+      const NetworkSpeechRecognitionEngineImpl&) = delete;
+  NetworkSpeechRecognitionEngineImpl& operator=(
+      const NetworkSpeechRecognitionEngineImpl&) = delete;
+
+  ~NetworkSpeechRecognitionEngineImpl() override;
+
+  // Sets the URL requests are sent to for tests.
+  static void set_web_service_base_url_for_tests(
+      const char* base_url_for_tests);
+
+  void SetConfig(const Config& config);
+  bool IsRecognitionPending() const;
+
+  // content::SpeechRecognitionEngine:
+  void StartRecognition() override;
+  void EndRecognition() override;
+  void TakeAudioChunk(const AudioChunk& data) override;
+  void AudioChunksEnded() override;
+  int GetDesiredAudioChunkDurationMs() const override;
+
+ private:
+  friend class speech::UpstreamLoaderClient;
+  friend class speech::DownstreamLoader;
+
+  // Response status codes from the speech recognition webservice.
+  static const int kWebserviceStatusNoError;
+  static const int kWebserviceStatusErrorNoMatch;
+
+  // Frame type for framed POST data. Do NOT change these. They must match
+  // values the server expects.
+  enum FrameType { FRAME_PREAMBLE_AUDIO = 0, FRAME_RECOGNITION_AUDIO = 1 };
+
+  // Data types for the internal Finite State Machine (FSM).
+  enum FSMState {
+    STATE_IDLE = 0,
+    STATE_BOTH_STREAMS_CONNECTED,
+    STATE_WAITING_DOWNSTREAM_RESULTS,
+    STATE_MAX_VALUE = STATE_WAITING_DOWNSTREAM_RESULTS
+  };
+
+  enum FSMEvent {
+    EVENT_END_RECOGNITION = 0,
+    EVENT_START_RECOGNITION,
+    EVENT_AUDIO_CHUNK,
+    EVENT_AUDIO_CHUNKS_ENDED,
+    EVENT_UPSTREAM_ERROR,
+    EVENT_DOWNSTREAM_ERROR,
+    EVENT_DOWNSTREAM_RESPONSE,
+    EVENT_DOWNSTREAM_CLOSED,
+    EVENT_MAX_VALUE = EVENT_DOWNSTREAM_CLOSED
+  };
+
+  struct FSMEventArgs {
+    explicit FSMEventArgs(FSMEvent event_value);
+
+    FSMEventArgs(const FSMEventArgs&) = delete;
+    FSMEventArgs& operator=(const FSMEventArgs&) = delete;
+
+    ~FSMEventArgs();
+
+    FSMEvent event;
+
+    // In case of EVENT_AUDIO_CHUNK, holds the chunk pushed by |TakeAudioChunk|.
+    scoped_refptr<const AudioChunk> audio_data;
+
+    // In case of EVENT_DOWNSTREAM_RESPONSE, hold the current chunk bytes.
+    std::unique_ptr<std::vector<uint8_t>> response;
+  };
+
+  // speech::UpstreamLoaderClient
+  void OnUpstreamDataComplete(bool success, int response_code) override;
+
+  // speech::DownstreamLoaderClient
+  void OnDownstreamDataReceived(base::StringPiece new_response_data) override;
+  void OnDownstreamDataComplete(bool success, int response_code) override;
+
+  // Entry point for pushing any new external event into the recognizer FSM.
+  void DispatchEvent(const FSMEventArgs& event_args);
+
+  // Defines the behavior of the recognizer FSM, selecting the appropriate
+  // transition according to the current state and event.
+  FSMState ExecuteTransitionAndGetNextState(const FSMEventArgs& event_args);
+
+  // The methods below handle transitions of the recognizer FSM.
+  FSMState ConnectBothStreams(const FSMEventArgs& event_args);
+  FSMState TransmitAudioUpstream(const FSMEventArgs& event_args);
+  FSMState ProcessDownstreamResponse(const FSMEventArgs& event_args);
+  FSMState RaiseNoMatchErrorIfGotNoResults(const FSMEventArgs& event_args);
+  FSMState CloseUpstreamAndWaitForResults(const FSMEventArgs& event_args);
+  FSMState CloseDownstream(const FSMEventArgs& event_args);
+  FSMState AbortSilently(const FSMEventArgs& event_args);
+  FSMState AbortWithError(const FSMEventArgs& event_args);
+  FSMState Abort(blink::mojom::SpeechRecognitionErrorCode error);
+  FSMState DoNothing(const FSMEventArgs& event_args);
+  FSMState NotFeasible(const FSMEventArgs& event_args);
+
+  std::string GetAcceptedLanguages() const;
+  std::string GenerateRequestKey() const;
+
+  // Upload a single chunk of audio data. Handles both unframed and framed
+  // upload formats, and uses the appropriate one.
+  void UploadAudioChunk(const std::string& data, FrameType type, bool is_final);
+
+  // The total audio duration of the upstream request.
+  base::TimeDelta upstream_audio_duration_;
+
+  Config config_;
+  std::unique_ptr<speech::UpstreamLoader> upstream_loader_;
+  std::unique_ptr<speech::DownstreamLoader> downstream_loader_;
+  scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory_;
+  const std::string accept_language_;
+  std::unique_ptr<AudioEncoder> encoder_;
+  std::unique_ptr<AudioEncoder> preamble_encoder_;
+  speech::ChunkedByteBuffer chunked_byte_buffer_;
+  bool got_last_definitive_result_ = false;
+  bool is_dispatching_event_ = false;
+  bool use_framed_post_data_ = false;
+  FSMState state_ = FSMState::STATE_IDLE;
+
+  SEQUENCE_CHECKER(sequence_checker_);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_SPEECH_NETWORK_SPEECH_RECOGNITION_ENGINE_IMPL_H_
diff --git a/content/browser/speech/network_speech_recognition_engine_impl_unittest.cc b/content/browser/speech/network_speech_recognition_engine_impl_unittest.cc
new file mode 100644
index 0000000..3364dc1
--- /dev/null
+++ b/content/browser/speech/network_speech_recognition_engine_impl_unittest.cc
@@ -0,0 +1,774 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/speech/network_speech_recognition_engine_impl.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <memory>
+
+#include "base/containers/queue.h"
+#include "base/numerics/byte_conversions.h"
+#include "base/numerics/safe_conversions.h"
+#include "base/run_loop.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/sys_byteorder.h"
+#include "base/test/task_environment.h"
+#include "components/speech/audio_buffer.h"
+#include "content/browser/speech/speech_recognition_engine.h"
+#include "content/public/browser/google_streaming_api.pb.h"
+#include "mojo/public/cpp/bindings/remote.h"
+#include "net/base/net_errors.h"
+#include "net/http/http_response_headers.h"
+#include "net/http/http_util.h"
+#include "services/network/public/cpp/url_loader_completion_status.h"
+#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
+#include "services/network/public/mojom/url_response_head.mojom.h"
+#include "services/network/test/test_url_loader_factory.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/mojom/speech/speech_recognition_error.mojom.h"
+#include "third_party/blink/public/mojom/speech/speech_recognition_result.mojom.h"
+
+using base::HostToNet32;
+using base::checked_cast;
+
+namespace content {
+
+// Frame types for framed POST data.
+static const uint32_t kFrameTypePreamble = 0;
+static const uint32_t kFrameTypeRecognitionAudio = 1;
+
+// Note: the terms upstream and downstream are from the point-of-view of the
+// client (engine_under_test_).
+
+class NetworkSpeechRecognitionEngineImplTest
+    : public SpeechRecognitionEngine::Delegate,
+      public testing::Test {
+ public:
+  NetworkSpeechRecognitionEngineImplTest()
+      : last_number_of_upstream_chunks_seen_(0U),
+        error_(blink::mojom::SpeechRecognitionErrorCode::kNone),
+        end_of_utterance_counter_(0) {}
+
+  // SpeechRecognitionRequestDelegate methods.
+  void OnSpeechRecognitionEngineResults(
+      const std::vector<blink::mojom::SpeechRecognitionResultPtr>& results)
+      override {
+    results_.push(mojo::Clone(results));
+  }
+  void OnSpeechRecognitionEngineEndOfUtterance() override {
+    ++end_of_utterance_counter_;
+  }
+  void OnSpeechRecognitionEngineError(
+      const blink::mojom::SpeechRecognitionError& error) override {
+    error_ = error.code;
+  }
+
+  // testing::Test methods.
+  void SetUp() override;
+  void TearDown() override;
+
+ protected:
+  enum DownstreamError {
+    DOWNSTREAM_ERROR_NONE,
+    DOWNSTREAM_ERROR_HTTP500,
+    DOWNSTREAM_ERROR_NETWORK,
+    DOWNSTREAM_ERROR_WEBSERVICE_NO_MATCH
+  };
+  static bool ResultsAreEqual(
+      const std::vector<blink::mojom::SpeechRecognitionResultPtr>& a,
+      const std::vector<blink::mojom::SpeechRecognitionResultPtr>& b);
+  static std::string SerializeProtobufResponse(
+      const proto::SpeechRecognitionEvent& msg);
+
+  const network::TestURLLoaderFactory::PendingRequest* GetUpstreamRequest();
+  const network::TestURLLoaderFactory::PendingRequest* GetDownstreamRequest();
+  void StartMockRecognition();
+  void EndMockRecognition();
+  void InjectDummyAudioChunk();
+  void ProvideMockResponseStartDownstreamIfNeeded();
+  void ProvideMockProtoResultDownstream(
+      const proto::SpeechRecognitionEvent& result);
+  void ProvideMockResultDownstream(
+      const blink::mojom::SpeechRecognitionResultPtr& result);
+  void ExpectResultsReceived(
+      const std::vector<blink::mojom::SpeechRecognitionResultPtr>& result);
+  void ExpectFramedChunk(const std::string& chunk, uint32_t type);
+  // Reads and returns all pending upload data from |upstream_data_pipe_|,
+  // initializing the pipe from |GetUpstreamRequest()|, if needed.
+  std::string ConsumeChunkedUploadData();
+  void CloseMockDownstream(DownstreamError error);
+
+  base::test::SingleThreadTaskEnvironment task_environment_;
+
+  network::TestURLLoaderFactory url_loader_factory_;
+  mojo::ScopedDataPipeProducerHandle downstream_data_pipe_;
+  mojo::Remote<network::mojom::ChunkedDataPipeGetter> chunked_data_pipe_getter_;
+  mojo::ScopedDataPipeConsumerHandle upstream_data_pipe_;
+
+  std::unique_ptr<NetworkSpeechRecognitionEngineImpl> engine_under_test_;
+  size_t last_number_of_upstream_chunks_seen_;
+  std::string response_buffer_;
+  blink::mojom::SpeechRecognitionErrorCode error_;
+  int end_of_utterance_counter_;
+  base::queue<std::vector<blink::mojom::SpeechRecognitionResultPtr>> results_;
+};
+
+TEST_F(NetworkSpeechRecognitionEngineImplTest, SingleDefinitiveResult) {
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+  ASSERT_EQ("", ConsumeChunkedUploadData());
+
+  // Inject some dummy audio chunks and check a corresponding chunked upload
+  // is performed every time on the server.
+  for (int i = 0; i < 3; ++i) {
+    InjectDummyAudioChunk();
+    ASSERT_FALSE(ConsumeChunkedUploadData().empty());
+  }
+
+  // Ensure that a final (empty) audio chunk is uploaded on chunks end.
+  engine_under_test_->AudioChunksEnded();
+  ASSERT_FALSE(ConsumeChunkedUploadData().empty());
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Simulate a protobuf message streamed from the server containing a single
+  // result with two hypotheses.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
+  results.push_back(blink::mojom::SpeechRecognitionResult::New());
+  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
+  result->is_provisional = false;
+  result->hypotheses.push_back(
+      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis 1", 0.1F));
+  result->hypotheses.push_back(
+      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis 2", 0.2F));
+
+  ProvideMockResultDownstream(result);
+  ExpectResultsReceived(results);
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Ensure everything is closed cleanly after the downstream is closed.
+  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+  EndMockRecognition();
+  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
+  ASSERT_EQ(0U, results_.size());
+}
+
+TEST_F(NetworkSpeechRecognitionEngineImplTest, SeveralStreamingResults) {
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+  ASSERT_EQ("", ConsumeChunkedUploadData());
+
+  for (int i = 0; i < 4; ++i) {
+    InjectDummyAudioChunk();
+    ASSERT_NE("", ConsumeChunkedUploadData());
+
+    std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
+    results.push_back(blink::mojom::SpeechRecognitionResult::New());
+    blink::mojom::SpeechRecognitionResultPtr& result = results.back();
+    result->is_provisional = (i % 2 == 0);  // Alternate result types.
+    float confidence = result->is_provisional ? 0.0F : (i * 0.1F);
+    result->hypotheses.push_back(blink::mojom::SpeechRecognitionHypothesis::New(
+        u"hypothesis", confidence));
+
+    ProvideMockResultDownstream(result);
+    ExpectResultsReceived(results);
+    ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+  }
+
+  // Ensure that a final (empty) audio chunk is uploaded on chunks end.
+  engine_under_test_->AudioChunksEnded();
+  ASSERT_NE("", ConsumeChunkedUploadData());
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Simulate a final definitive result.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
+  results.push_back(blink::mojom::SpeechRecognitionResult::New());
+  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
+  result->is_provisional = false;
+  result->hypotheses.push_back(blink::mojom::SpeechRecognitionHypothesis::New(
+      u"The final result", 1.0F));
+  ProvideMockResultDownstream(result);
+  ExpectResultsReceived(results);
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Ensure everything is closed cleanly after the downstream is closed.
+  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+  EndMockRecognition();
+  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
+  ASSERT_EQ(0U, results_.size());
+}
+
+TEST_F(NetworkSpeechRecognitionEngineImplTest,
+       NoFinalResultAfterAudioChunksEnded) {
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+  ASSERT_EQ("", ConsumeChunkedUploadData());
+
+  // Simulate one pushed audio chunk.
+  InjectDummyAudioChunk();
+  ASSERT_NE("", ConsumeChunkedUploadData());
+
+  // Simulate the corresponding definitive result.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
+  results.push_back(blink::mojom::SpeechRecognitionResult::New());
+  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
+  result->hypotheses.push_back(
+      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis", 1.0F));
+  ProvideMockResultDownstream(result);
+  ExpectResultsReceived(results);
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Simulate a silent downstream closure after |AudioChunksEnded|.
+  engine_under_test_->AudioChunksEnded();
+  ASSERT_NE("", ConsumeChunkedUploadData());
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
+
+  // Expect an empty result, aimed at notifying recognition ended with no
+  // actual results nor errors.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> empty_results;
+  ExpectResultsReceived(empty_results);
+
+  // Ensure everything is closed cleanly after the downstream is closed.
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+  EndMockRecognition();
+  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
+  ASSERT_EQ(0U, results_.size());
+}
+
+// Simulate the network service repeatedly re-requesting data (Possibly due to
+// using a stale socket, for instance).
+TEST_F(NetworkSpeechRecognitionEngineImplTest, ReRequestData) {
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+  ASSERT_EQ("", ConsumeChunkedUploadData());
+
+  // Simulate one pushed audio chunk.
+  InjectDummyAudioChunk();
+  std::string uploaded_data = ConsumeChunkedUploadData();
+  ASSERT_NE(uploaded_data, ConsumeChunkedUploadData());
+
+  // The network service closes the data pipe.
+  upstream_data_pipe_.reset();
+
+  // Re-opening the data pipe should result in the data being re-uploaded.
+  ASSERT_EQ(uploaded_data, ConsumeChunkedUploadData());
+
+  // Simulate the corresponding definitive result.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
+  results.push_back(blink::mojom::SpeechRecognitionResult::New());
+  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
+  result->hypotheses.push_back(
+      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis", 1.0F));
+  ProvideMockResultDownstream(result);
+  ExpectResultsReceived(results);
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Simulate a silent downstream closure after |AudioChunksEnded|.
+  engine_under_test_->AudioChunksEnded();
+  std::string new_uploaded_data = ConsumeChunkedUploadData();
+  ASSERT_NE(new_uploaded_data, ConsumeChunkedUploadData());
+  uploaded_data += new_uploaded_data;
+
+  // The network service closes the data pipe.
+  upstream_data_pipe_.reset();
+
+  // Re-opening the data pipe should result in the data being re-uploaded.
+  ASSERT_EQ(uploaded_data, ConsumeChunkedUploadData());
+
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
+
+  // Expect an empty result, aimed at notifying recognition ended with no
+  // actual results nor errors.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> empty_results;
+  ExpectResultsReceived(empty_results);
+
+  // Ensure everything is closed cleanly after the downstream is closed.
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+  EndMockRecognition();
+  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
+  ASSERT_EQ(0U, results_.size());
+}
+
+TEST_F(NetworkSpeechRecognitionEngineImplTest, NoMatchError) {
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+  ASSERT_EQ("", ConsumeChunkedUploadData());
+
+  for (int i = 0; i < 3; ++i) {
+    InjectDummyAudioChunk();
+    ASSERT_NE("", ConsumeChunkedUploadData());
+  }
+  engine_under_test_->AudioChunksEnded();
+  ASSERT_NE("", ConsumeChunkedUploadData());
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Simulate only a provisional result.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
+  results.push_back(blink::mojom::SpeechRecognitionResult::New());
+  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
+  result->is_provisional = true;
+  result->hypotheses.push_back(blink::mojom::SpeechRecognitionHypothesis::New(
+      u"The final result", 0.0F));
+  ProvideMockResultDownstream(result);
+  ExpectResultsReceived(results);
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  CloseMockDownstream(DOWNSTREAM_ERROR_WEBSERVICE_NO_MATCH);
+
+  // Expect an empty result.
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+  EndMockRecognition();
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> empty_result;
+  ExpectResultsReceived(empty_result);
+}
+
+TEST_F(NetworkSpeechRecognitionEngineImplTest, HTTPError) {
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+  ASSERT_EQ("", ConsumeChunkedUploadData());
+
+  InjectDummyAudioChunk();
+  ASSERT_NE("", ConsumeChunkedUploadData());
+
+  // Close the downstream with a HTTP 500 error.
+  CloseMockDownstream(DOWNSTREAM_ERROR_HTTP500);
+
+  // Expect a blink::mojom::SpeechRecognitionErrorCode::kNetwork error to be
+  // raised.
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+  EndMockRecognition();
+  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNetwork, error_);
+  ASSERT_EQ(0U, results_.size());
+}
+
+TEST_F(NetworkSpeechRecognitionEngineImplTest, NetworkError) {
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+  ASSERT_EQ("", ConsumeChunkedUploadData());
+
+  InjectDummyAudioChunk();
+  ASSERT_NE("", ConsumeChunkedUploadData());
+
+  // Close the downstream fetcher simulating a network failure.
+  CloseMockDownstream(DOWNSTREAM_ERROR_NETWORK);
+
+  // Expect a blink::mojom::SpeechRecognitionErrorCode::kNetwork error to be
+  // raised.
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+  EndMockRecognition();
+  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNetwork, error_);
+  ASSERT_EQ(0U, results_.size());
+}
+
+TEST_F(NetworkSpeechRecognitionEngineImplTest, Stability) {
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+  ASSERT_EQ("", ConsumeChunkedUploadData());
+
+  // Upload a dummy audio chunk.
+  InjectDummyAudioChunk();
+  ASSERT_NE("", ConsumeChunkedUploadData());
+  engine_under_test_->AudioChunksEnded();
+
+  // Simulate a protobuf message with an intermediate result without confidence,
+  // but with stability.
+  proto::SpeechRecognitionEvent proto_event;
+  proto_event.set_status(proto::SpeechRecognitionEvent::STATUS_SUCCESS);
+  proto::SpeechRecognitionResult* proto_result = proto_event.add_result();
+  proto_result->set_stability(0.5);
+  proto::SpeechRecognitionAlternative *proto_alternative =
+      proto_result->add_alternative();
+  proto_alternative->set_transcript("foo");
+  ProvideMockProtoResultDownstream(proto_event);
+
+  // Set up expectations.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
+  results.push_back(blink::mojom::SpeechRecognitionResult::New());
+  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
+  result->is_provisional = true;
+  result->hypotheses.push_back(
+      blink::mojom::SpeechRecognitionHypothesis::New(u"foo", 0.5));
+
+  // Check that the protobuf generated the expected result.
+  ExpectResultsReceived(results);
+
+  // Since it was a provisional result, recognition is still pending.
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Shut down.
+  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+  EndMockRecognition();
+
+  // Since there was no final result, we get an empty "no match" result.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> empty_result;
+  ExpectResultsReceived(empty_result);
+  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
+  ASSERT_EQ(0U, results_.size());
+}
+
+TEST_F(NetworkSpeechRecognitionEngineImplTest, EndOfUtterance) {
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+
+  // Simulate a END_OF_UTTERANCE proto event with continuous true.
+  NetworkSpeechRecognitionEngineImpl::Config config;
+  config.continuous = true;
+  engine_under_test_->SetConfig(config);
+  proto::SpeechRecognitionEvent proto_event;
+  proto_event.set_endpoint(proto::SpeechRecognitionEvent::END_OF_UTTERANCE);
+  ASSERT_EQ(0, end_of_utterance_counter_);
+  ProvideMockProtoResultDownstream(proto_event);
+  ASSERT_EQ(0, end_of_utterance_counter_);
+
+  // Simulate a END_OF_UTTERANCE proto event with continuous false.
+  config.continuous = false;
+  engine_under_test_->SetConfig(config);
+  ProvideMockProtoResultDownstream(proto_event);
+  ASSERT_EQ(1, end_of_utterance_counter_);
+
+  // Shut down.
+  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
+  EndMockRecognition();
+}
+
+TEST_F(NetworkSpeechRecognitionEngineImplTest, SendPreamble) {
+  const size_t kPreambleLength = 100;
+  scoped_refptr<SpeechRecognitionSessionPreamble> preamble =
+      new SpeechRecognitionSessionPreamble();
+  preamble->sample_rate = 16000;
+  preamble->sample_depth = 2;
+  preamble->sample_data.assign(kPreambleLength, 0);
+  NetworkSpeechRecognitionEngineImpl::Config config;
+  config.auth_token = "foo";
+  config.auth_scope = "bar";
+  config.preamble = preamble;
+  engine_under_test_->SetConfig(config);
+
+  StartMockRecognition();
+  ASSERT_TRUE(GetUpstreamRequest());
+  // First chunk uploaded should be the preamble.
+  std::string chunk = ConsumeChunkedUploadData();
+  ASSERT_NE("", chunk);
+  ExpectFramedChunk(chunk, kFrameTypePreamble);
+
+  for (int i = 0; i < 3; ++i) {
+    InjectDummyAudioChunk();
+    chunk = ConsumeChunkedUploadData();
+    ASSERT_NE("", chunk);
+    ExpectFramedChunk(chunk, kFrameTypeRecognitionAudio);
+  }
+  engine_under_test_->AudioChunksEnded();
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Simulate a protobuf message streamed from the server containing a single
+  // result with one hypotheses.
+  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
+  results.push_back(blink::mojom::SpeechRecognitionResult::New());
+  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
+  result->is_provisional = false;
+  result->hypotheses.push_back(
+      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis 1", 0.1F));
+
+  ProvideMockResultDownstream(result);
+  ExpectResultsReceived(results);
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  // Ensure everything is closed cleanly after the downstream is closed.
+  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+  EndMockRecognition();
+  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
+  ASSERT_EQ(0U, results_.size());
+}
+
+void NetworkSpeechRecognitionEngineImplTest::SetUp() {
+  engine_under_test_ = std::make_unique<NetworkSpeechRecognitionEngineImpl>(
+      base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
+          &url_loader_factory_),
+      "" /* accept_language */);
+  engine_under_test_->set_delegate(this);
+}
+
+void NetworkSpeechRecognitionEngineImplTest::TearDown() {
+  engine_under_test_.reset();
+}
+
+const network::TestURLLoaderFactory::PendingRequest*
+NetworkSpeechRecognitionEngineImplTest::GetUpstreamRequest() {
+  for (const auto& pending_request : *url_loader_factory_.pending_requests()) {
+    if (pending_request.request.url.spec().find("/up") != std::string::npos)
+      return &pending_request;
+  }
+  return nullptr;
+}
+
+const network::TestURLLoaderFactory::PendingRequest*
+NetworkSpeechRecognitionEngineImplTest::GetDownstreamRequest() {
+  for (const auto& pending_request : *url_loader_factory_.pending_requests()) {
+    if (pending_request.request.url.spec().find("/down") != std::string::npos)
+      return &pending_request;
+  }
+  return nullptr;
+}
+
+// Starts recognition on the engine, ensuring that both stream fetchers are
+// created.
+void NetworkSpeechRecognitionEngineImplTest::StartMockRecognition() {
+  DCHECK(engine_under_test_.get());
+
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+
+  engine_under_test_->StartRecognition();
+  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
+
+  ASSERT_TRUE(GetUpstreamRequest());
+  ASSERT_TRUE(GetDownstreamRequest());
+}
+
+void NetworkSpeechRecognitionEngineImplTest::EndMockRecognition() {
+  DCHECK(engine_under_test_.get());
+  engine_under_test_->EndRecognition();
+  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
+
+  // TODO(primiano): In order to be very pedantic we should check that both the
+  // upstream and downstream URL fetchers have been disposed at this time.
+  // Unfortunately it seems that there is no direct way to detect (in tests)
+  // if a url_fetcher has been freed or not, since they are not automatically
+  // de-registered from the TestURLFetcherFactory on destruction.
+}
+
+void NetworkSpeechRecognitionEngineImplTest::InjectDummyAudioChunk() {
+  // Enough data so that the encoder will output something, as can't read 0
+  // bytes from a Mojo stream.
+  unsigned char dummy_audio_buffer_data[2000 * 2] = {'\0'};
+  scoped_refptr<AudioChunk> dummy_audio_chunk(
+      new AudioChunk(&dummy_audio_buffer_data[0],
+                     sizeof(dummy_audio_buffer_data),
+                     2 /* bytes per sample */));
+  DCHECK(engine_under_test_.get());
+  engine_under_test_->TakeAudioChunk(*dummy_audio_chunk.get());
+}
+
+void NetworkSpeechRecognitionEngineImplTest::
+    ProvideMockResponseStartDownstreamIfNeeded() {
+  if (downstream_data_pipe_.get())
+    return;
+  const network::TestURLLoaderFactory::PendingRequest* downstream_request =
+      GetDownstreamRequest();
+  ASSERT_TRUE(downstream_request);
+
+  auto head = network::mojom::URLResponseHead::New();
+  std::string headers("HTTP/1.1 200 OK\n\n");
+  head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(headers));
+
+  mojo::ScopedDataPipeProducerHandle producer_handle;
+  mojo::ScopedDataPipeConsumerHandle consumer_handle;
+  ASSERT_EQ(mojo::CreateDataPipe(nullptr, producer_handle, consumer_handle),
+            MOJO_RESULT_OK);
+
+  downstream_request->client->OnReceiveResponse(
+      std::move(head), std::move(consumer_handle), std::nullopt);
+  downstream_data_pipe_ = std::move(producer_handle);
+}
+
+void NetworkSpeechRecognitionEngineImplTest::ProvideMockProtoResultDownstream(
+    const proto::SpeechRecognitionEvent& result) {
+  ProvideMockResponseStartDownstreamIfNeeded();
+  ASSERT_TRUE(downstream_data_pipe_.get());
+  ASSERT_TRUE(downstream_data_pipe_.is_valid());
+
+  std::string response_string = SerializeProtobufResponse(result);
+  response_buffer_.append(response_string);
+  uint32_t written = 0;
+  while (written < response_string.size()) {
+    uint32_t write_bytes = response_string.size() - written;
+    MojoResult mojo_result = downstream_data_pipe_->WriteData(
+        response_string.data() + written, &write_bytes,
+        MOJO_WRITE_DATA_FLAG_NONE);
+    if (mojo_result == MOJO_RESULT_OK) {
+      written += write_bytes;
+      continue;
+    }
+    if (mojo_result == MOJO_RESULT_SHOULD_WAIT) {
+      base::RunLoop().RunUntilIdle();
+      continue;
+    }
+
+    FAIL() << "Mojo pipe unexpectedly closed";
+  }
+  base::RunLoop().RunUntilIdle();
+}
+
+void NetworkSpeechRecognitionEngineImplTest::ProvideMockResultDownstream(
+    const blink::mojom::SpeechRecognitionResultPtr& result) {
+  proto::SpeechRecognitionEvent proto_event;
+  proto_event.set_status(proto::SpeechRecognitionEvent::STATUS_SUCCESS);
+  proto::SpeechRecognitionResult* proto_result = proto_event.add_result();
+  proto_result->set_final(!result->is_provisional);
+  for (size_t i = 0; i < result->hypotheses.size(); ++i) {
+    proto::SpeechRecognitionAlternative* proto_alternative =
+        proto_result->add_alternative();
+    const blink::mojom::SpeechRecognitionHypothesisPtr& hypothesis =
+        result->hypotheses[i];
+    proto_alternative->set_confidence(hypothesis->confidence);
+    proto_alternative->set_transcript(base::UTF16ToUTF8(hypothesis->utterance));
+  }
+  ProvideMockProtoResultDownstream(proto_event);
+  base::RunLoop().RunUntilIdle();
+}
+
+void NetworkSpeechRecognitionEngineImplTest::CloseMockDownstream(
+    DownstreamError error) {
+  if (error == DOWNSTREAM_ERROR_HTTP500) {
+    // Can't provide a network error if already gave the consumer a 200
+    // response.
+    ASSERT_FALSE(downstream_data_pipe_.get());
+
+    const network::TestURLLoaderFactory::PendingRequest* downstream_request =
+        GetDownstreamRequest();
+    ASSERT_TRUE(downstream_request);
+    auto head = network::mojom::URLResponseHead::New();
+    std::string headers("HTTP/1.1 500 Server Sad\n\n");
+    head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+        net::HttpUtil::AssembleRawHeaders(headers));
+    downstream_request->client->OnReceiveResponse(
+        std::move(head), mojo::ScopedDataPipeConsumerHandle(), std::nullopt);
+    // Wait for the response to be handled.
+    base::RunLoop().RunUntilIdle();
+    return;
+  }
+
+  ProvideMockResponseStartDownstreamIfNeeded();
+  const network::TestURLLoaderFactory::PendingRequest* downstream_request =
+      GetDownstreamRequest();
+  ASSERT_TRUE(downstream_request);
+
+  network::URLLoaderCompletionStatus status;
+  status.decoded_body_length = response_buffer_.size();
+  status.error_code =
+      (error == DOWNSTREAM_ERROR_NETWORK) ? net::ERR_FAILED : net::OK;
+  downstream_request->client->OnComplete(status);
+  downstream_data_pipe_.reset();
+  // Wait for the completion events to be handled.
+  base::RunLoop().RunUntilIdle();
+}
+
+void NetworkSpeechRecognitionEngineImplTest::ExpectResultsReceived(
+    const std::vector<blink::mojom::SpeechRecognitionResultPtr>& results) {
+  ASSERT_GE(1U, results_.size());
+  ASSERT_TRUE(ResultsAreEqual(results, results_.front()));
+  results_.pop();
+}
+
+bool NetworkSpeechRecognitionEngineImplTest::ResultsAreEqual(
+    const std::vector<blink::mojom::SpeechRecognitionResultPtr>& a,
+    const std::vector<blink::mojom::SpeechRecognitionResultPtr>& b) {
+  if (a.size() != b.size())
+    return false;
+
+  auto it_a = a.begin();
+  auto it_b = b.begin();
+  for (; it_a != a.end() && it_b != b.end(); ++it_a, ++it_b) {
+    if ((*it_a)->is_provisional != (*it_b)->is_provisional ||
+        (*it_a)->hypotheses.size() != (*it_b)->hypotheses.size()) {
+      return false;
+    }
+    for (size_t i = 0; i < (*it_a)->hypotheses.size(); ++i) {
+      const blink::mojom::SpeechRecognitionHypothesisPtr& hyp_a =
+          (*it_a)->hypotheses[i];
+      const blink::mojom::SpeechRecognitionHypothesisPtr& hyp_b =
+          (*it_b)->hypotheses[i];
+      if (hyp_a->utterance != hyp_b->utterance ||
+          hyp_a->confidence != hyp_b->confidence) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+void NetworkSpeechRecognitionEngineImplTest::ExpectFramedChunk(
+    const std::string& chunk, uint32_t type) {
+  uint32_t value = base::numerics::U32FromBigEndian(
+      base::as_byte_span(chunk).subspan<0u, 4u>());
+  EXPECT_EQ(chunk.size() - 8, value);
+  value = base::numerics::U32FromBigEndian(
+      base::as_byte_span(chunk).subspan<4u, 4u>());
+  EXPECT_EQ(type, value);
+}
+
+std::string NetworkSpeechRecognitionEngineImplTest::ConsumeChunkedUploadData() {
+  std::string result;
+  base::RunLoop().RunUntilIdle();
+
+  if (!upstream_data_pipe_.get()) {
+    if (!chunked_data_pipe_getter_) {
+      const network::TestURLLoaderFactory::PendingRequest* upstream_request =
+          GetUpstreamRequest();
+      EXPECT_TRUE(upstream_request);
+      EXPECT_TRUE(upstream_request->request.request_body);
+      EXPECT_EQ(1u, upstream_request->request.request_body->elements()->size());
+      auto& element =
+          (*upstream_request->request.request_body->elements_mutable())[0];
+      if (element.type() != network::DataElement::Tag::kChunkedDataPipe) {
+        ADD_FAILURE() << "element type mismatch";
+        return "";
+      }
+      chunked_data_pipe_getter_.Bind(
+          element.As<network::DataElementChunkedDataPipe>()
+              .ReleaseChunkedDataPipeGetter());
+    }
+    mojo::ScopedDataPipeProducerHandle producer_handle;
+    mojo::ScopedDataPipeConsumerHandle consumer_handle;
+    EXPECT_EQ(mojo::CreateDataPipe(nullptr, producer_handle, consumer_handle),
+              MOJO_RESULT_OK);
+    chunked_data_pipe_getter_->StartReading(std::move(producer_handle));
+    upstream_data_pipe_ = std::move(consumer_handle);
+  }
+  EXPECT_TRUE(upstream_data_pipe_.is_valid());
+
+  std::string out;
+  while (true) {
+    base::RunLoop().RunUntilIdle();
+
+    const void* data;
+    uint32_t num_bytes;
+    MojoResult mojo_result = upstream_data_pipe_->BeginReadData(
+        &data, &num_bytes, MOJO_READ_DATA_FLAG_NONE);
+    if (mojo_result == MOJO_RESULT_OK) {
+      out.append(static_cast<const char*>(data), num_bytes);
+      upstream_data_pipe_->EndReadData(num_bytes);
+      continue;
+    }
+    if (mojo_result == MOJO_RESULT_SHOULD_WAIT)
+      break;
+
+    ADD_FAILURE() << "Mojo pipe unexpectedly closed";
+    break;
+  }
+  return out;
+}
+
+std::string NetworkSpeechRecognitionEngineImplTest::SerializeProtobufResponse(
+    const proto::SpeechRecognitionEvent& msg) {
+  std::string msg_string;
+  msg.SerializeToString(&msg_string);
+
+  // Prepend 4 byte prefix length indication to the protobuf message as
+  // envisaged by the google streaming recognition webservice protocol.
+  uint32_t prefix = HostToNet32(checked_cast<uint32_t>(msg_string.size()));
+  msg_string.insert(0, reinterpret_cast<char*>(&prefix), sizeof(prefix));
+
+  return msg_string;
+}
+
+}  // namespace content
diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc
index 4f91320..a8a39b8 100644
--- a/content/browser/speech/speech_recognition_browsertest.cc
+++ b/content/browser/speech/speech_recognition_browsertest.cc
@@ -19,7 +19,7 @@
 #include "base/sys_byteorder.h"
 #include "base/task/single_thread_task_runner.h"
 #include "build/build_config.h"
-#include "content/browser/speech/speech_recognition_engine.h"
+#include "content/browser/speech/network_speech_recognition_engine_impl.h"
 #include "content/browser/speech/speech_recognition_manager_impl.h"
 #include "content/browser/speech/speech_recognizer_impl.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -210,7 +210,7 @@
     const int capture_packet_interval_ms =
         (1000 * audio_parameters.frames_per_buffer()) /
         audio_parameters.sample_rate();
-    ASSERT_EQ(SpeechRecognitionEngine::kAudioPacketIntervalMs,
+    ASSERT_EQ(NetworkSpeechRecognitionEngineImpl::kAudioPacketIntervalMs,
               capture_packet_interval_ms);
     FeedAudioCapturerSource(audio_parameters, capture_callback, 500 /* ms */,
                             /*noise=*/false);
@@ -269,7 +269,7 @@
     const int ms_per_buffer = audio_params.GetBufferDuration().InMilliseconds();
     // We can only simulate durations that are integer multiples of the
     // buffer size. In this regard see
-    // SpeechRecognitionEngine::GetDesiredAudioChunkDurationMs().
+    // NetworkSpeechRecognitionEngineImpl::GetDesiredAudioChunkDurationMs().
     ASSERT_EQ(0, duration_ms % ms_per_buffer);
 
     const int n_buffers = duration_ms / ms_per_buffer;
@@ -313,7 +313,7 @@
   // Use a base path that doesn't end in a slash to mimic the default URL.
   std::string web_service_base_url =
       embedded_test_server()->base_url().spec() + "foo";
-  SpeechRecognitionEngine::set_web_service_base_url_for_tests(
+  NetworkSpeechRecognitionEngineImpl::set_web_service_base_url_for_tests(
       web_service_base_url.c_str());
 
   // Need to watch for two navigations. Can't use
@@ -350,7 +350,8 @@
   EXPECT_EQ("goodresult1", GetPageFragment());
 
   // Remove reference to URL string that's on the stack.
-  SpeechRecognitionEngine::set_web_service_base_url_for_tests(nullptr);
+  NetworkSpeechRecognitionEngineImpl::set_web_service_base_url_for_tests(
+      nullptr);
 }
 
 }  // namespace content
diff --git a/content/browser/speech/speech_recognition_engine.cc b/content/browser/speech/speech_recognition_engine.cc
index f0718d3..3fa5abc 100644
--- a/content/browser/speech/speech_recognition_engine.cc
+++ b/content/browser/speech/speech_recognition_engine.cc
@@ -4,727 +4,17 @@
 
 #include "content/browser/speech/speech_recognition_engine.h"
 
-#include <algorithm>
-#include <memory>
-#include <vector>
-
-#include "base/functional/bind.h"
-#include "base/metrics/histogram_functions.h"
-#include "base/numerics/byte_conversions.h"
-#include "base/numerics/safe_conversions.h"
-#include "base/rand_util.h"
-#include "base/strings/escape.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/time/time.h"
-#include "components/speech/audio_buffer.h"
-#include "content/public/browser/google_streaming_api.pb.h"
-#include "google_apis/google_api_keys.h"
-#include "media/base/audio_timestamp_helper.h"
-#include "mojo/public/c/system/types.h"
-#include "mojo/public/cpp/bindings/receiver_set.h"
-#include "net/base/load_flags.h"
-#include "net/traffic_annotation/network_traffic_annotation.h"
-#include "services/network/public/cpp/shared_url_loader_factory.h"
-#include "third_party/blink/public/mojom/speech/speech_recognition_error.mojom.h"
-#include "third_party/blink/public/mojom/speech/speech_recognition_result.mojom.h"
+#include "media/base/audio_parameters.h"
 
 namespace content {
-namespace {
 
-const char kWebServiceBaseUrl[] =
-    "https://www.google.com/speech-api/full-duplex/v1";
-const char kDownstreamUrl[] = "/down?";
-const char kUpstreamUrl[] = "/up?";
-
-constexpr char kWebSpeechAudioDuration[] = "Accessibility.WebSpeech.Duration";
-
-// Used to override |kWebServiceBaseUrl| when non-null, only set in tests.
-const char* web_service_base_url_for_tests = nullptr;
-
-// This matches the maximum maxAlternatives value supported by the server.
-const uint32_t kMaxMaxAlternatives = 30;
-
-// TODO(hans): Remove this and other logging when we don't need it anymore.
-void DumpResponse(const std::string& response) {
-  DVLOG(1) << "------------";
-  proto::SpeechRecognitionEvent event;
-  if (!event.ParseFromString(response)) {
-    DVLOG(1) << "Parse failed!";
-    return;
-  }
-  if (event.has_status())
-    DVLOG(1) << "STATUS\t" << event.status();
-  if (event.has_endpoint())
-    DVLOG(1) << "ENDPOINT\t" << event.endpoint();
-  for (int i = 0; i < event.result_size(); ++i) {
-    DVLOG(1) << "RESULT #" << i << ":";
-    const proto::SpeechRecognitionResult& res = event.result(i);
-    if (res.has_final())
-      DVLOG(1) << "  final:\t" << res.final();
-    if (res.has_stability())
-      DVLOG(1) << "  STABILITY:\t" << res.stability();
-    for (int j = 0; j < res.alternative_size(); ++j) {
-      const proto::SpeechRecognitionAlternative& alt =
-          res.alternative(j);
-      if (alt.has_confidence())
-        DVLOG(1) << "    CONFIDENCE:\t" << alt.confidence();
-      if (alt.has_transcript())
-        DVLOG(1) << "    TRANSCRIPT:\t" << alt.transcript();
-    }
-  }
+void SpeechRecognitionEngine::set_delegate(Delegate* delegate) {
+  delegate_ = delegate;
 }
 
-const int kDefaultConfigSampleRate = 8000;
-const int kDefaultConfigBitsPerSample = 16;
-const uint32_t kDefaultMaxHypotheses = 1;
-
-}  // namespace
-
-SpeechRecognitionEngine::Config::Config()
-    : filter_profanities(false),
-      continuous(true),
-      interim_results(true),
-      max_hypotheses(kDefaultMaxHypotheses),
-      audio_sample_rate(kDefaultConfigSampleRate),
-      audio_num_bits_per_sample(kDefaultConfigBitsPerSample) {}
-
-SpeechRecognitionEngine::Config::~Config() {}
-
-const int SpeechRecognitionEngine::kAudioPacketIntervalMs = 100;
-const int SpeechRecognitionEngine::kWebserviceStatusNoError = 0;
-const int SpeechRecognitionEngine::kWebserviceStatusErrorNoMatch = 5;
-
-SpeechRecognitionEngine::SpeechRecognitionEngine(
-    scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory,
-    const std::string& accept_language)
-    : shared_url_loader_factory_(std::move(shared_url_loader_factory)),
-      accept_language_(accept_language),
-      got_last_definitive_result_(false),
-      is_dispatching_event_(false),
-      use_framed_post_data_(false),
-      state_(STATE_IDLE) {}
-
-SpeechRecognitionEngine::~SpeechRecognitionEngine() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-}
-
-void SpeechRecognitionEngine::set_web_service_base_url_for_tests(
-    const char* base_url_for_tests) {
-  web_service_base_url_for_tests = base_url_for_tests;
-}
-
-void SpeechRecognitionEngine::SetConfig(const Config& config) {
-  config_ = config;
-}
-
-void SpeechRecognitionEngine::StartRecognition() {
-  upstream_audio_duration_ = base::TimeDelta();
-  FSMEventArgs event_args(EVENT_START_RECOGNITION);
-  DispatchEvent(event_args);
-}
-
-void SpeechRecognitionEngine::EndRecognition() {
-  base::UmaHistogramLongTimes100(kWebSpeechAudioDuration,
-                                 upstream_audio_duration_);
-
-  FSMEventArgs event_args(EVENT_END_RECOGNITION);
-  DispatchEvent(event_args);
-}
-
-void SpeechRecognitionEngine::TakeAudioChunk(const AudioChunk& data) {
-  FSMEventArgs event_args(EVENT_AUDIO_CHUNK);
-  event_args.audio_data = &data;
-  DispatchEvent(event_args);
-}
-
-void SpeechRecognitionEngine::AudioChunksEnded() {
-  FSMEventArgs event_args(EVENT_AUDIO_CHUNKS_ENDED);
-  DispatchEvent(event_args);
-}
-
-void SpeechRecognitionEngine::OnUpstreamDataComplete(bool success,
-                                                     int response_code) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
-  DVLOG(1) << "Upstream complete success: " << success
-           << " response_code: " << response_code;
-
-  if (!success) {
-    FSMEventArgs event_args(EVENT_UPSTREAM_ERROR);
-    DispatchEvent(event_args);
-    return;
-  }
-
-  // Do nothing on clean completion of upstream request.
-}
-
-void SpeechRecognitionEngine::OnDownstreamDataReceived(
-    base::StringPiece new_response_data) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
-  DVLOG(1) << "Downstream length: " << new_response_data.size();
-
-  // The downstream response is organized in chunks, whose size is determined
-  // by a 4 bytes prefix, transparently handled by the ChunkedByteBuffer class.
-  // Such chunks are sent by the speech recognition webservice over the HTTP
-  // downstream channel using HTTP chunked transfer (unrelated to our chunks).
-  // This function is called every time an HTTP chunk is received by the
-  // url fetcher. However there isn't any particular matching beween our
-  // protocol chunks and HTTP chunks, in the sense that a single HTTP chunk can
-  // contain a portion of one chunk or even more chunks together.
-  chunked_byte_buffer_.Append(new_response_data);
-
-  // A single HTTP chunk can contain more than one data chunk, thus the while.
-  while (chunked_byte_buffer_.HasChunks()) {
-    FSMEventArgs event_args(EVENT_DOWNSTREAM_RESPONSE);
-    event_args.response = chunked_byte_buffer_.PopChunk();
-    DCHECK(event_args.response.get());
-    DumpResponse(std::string(event_args.response->begin(),
-                             event_args.response->end()));
-    DispatchEvent(event_args);
-  }
-}
-
-void SpeechRecognitionEngine::OnDownstreamDataComplete(bool success,
-                                                       int response_code) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
-  DVLOG(1) << "Downstream complete success: " << success
-           << " response_code: " << response_code;
-
-  if (!success) {
-    FSMEventArgs event_args(EVENT_DOWNSTREAM_ERROR);
-    DispatchEvent(event_args);
-    return;
-  }
-
-  FSMEventArgs event_args(EVENT_DOWNSTREAM_CLOSED);
-  DispatchEvent(event_args);
-}
-
-bool SpeechRecognitionEngine::IsRecognitionPending() const {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  return state_ != STATE_IDLE;
-}
-
-int SpeechRecognitionEngine::GetDesiredAudioChunkDurationMs() const {
-  return kAudioPacketIntervalMs;
-}
-
-// -----------------------  Core FSM implementation ---------------------------
-
-void SpeechRecognitionEngine::DispatchEvent(
-    const FSMEventArgs& event_args) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  DCHECK_LE(event_args.event, EVENT_MAX_VALUE);
-  DCHECK_LE(state_, STATE_MAX_VALUE);
-
-  // Event dispatching must be sequential, otherwise it will break all the rules
-  // and the assumptions of the finite state automata model.
-  DCHECK(!is_dispatching_event_);
-  is_dispatching_event_ = true;
-
-  state_ = ExecuteTransitionAndGetNextState(event_args);
-
-  is_dispatching_event_ = false;
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::ExecuteTransitionAndGetNextState(
-    const FSMEventArgs& event_args) {
-  const FSMEvent event = event_args.event;
-  switch (state_) {
-    case STATE_IDLE:
-      switch (event) {
-        case EVENT_START_RECOGNITION:
-          return ConnectBothStreams(event_args);
-        case EVENT_END_RECOGNITION:
-        // Note AUDIO_CHUNK and AUDIO_END events can remain enqueued in case of
-        // abort, so we just silently drop them here.
-        case EVENT_AUDIO_CHUNK:
-        case EVENT_AUDIO_CHUNKS_ENDED:
-        // DOWNSTREAM_CLOSED can be received if we end up here due to an error.
-        case EVENT_DOWNSTREAM_CLOSED:
-          return DoNothing(event_args);
-        case EVENT_UPSTREAM_ERROR:
-        case EVENT_DOWNSTREAM_ERROR:
-        case EVENT_DOWNSTREAM_RESPONSE:
-          return NotFeasible(event_args);
-      }
-      break;
-    case STATE_BOTH_STREAMS_CONNECTED:
-      switch (event) {
-        case EVENT_AUDIO_CHUNK:
-          return TransmitAudioUpstream(event_args);
-        case EVENT_DOWNSTREAM_RESPONSE:
-          return ProcessDownstreamResponse(event_args);
-        case EVENT_AUDIO_CHUNKS_ENDED:
-          return CloseUpstreamAndWaitForResults(event_args);
-        case EVENT_END_RECOGNITION:
-          return AbortSilently(event_args);
-        case EVENT_UPSTREAM_ERROR:
-        case EVENT_DOWNSTREAM_ERROR:
-        case EVENT_DOWNSTREAM_CLOSED:
-          return AbortWithError(event_args);
-        case EVENT_START_RECOGNITION:
-          return NotFeasible(event_args);
-      }
-      break;
-    case STATE_WAITING_DOWNSTREAM_RESULTS:
-      switch (event) {
-        case EVENT_DOWNSTREAM_RESPONSE:
-          return ProcessDownstreamResponse(event_args);
-        case EVENT_DOWNSTREAM_CLOSED:
-          return RaiseNoMatchErrorIfGotNoResults(event_args);
-        case EVENT_END_RECOGNITION:
-          return AbortSilently(event_args);
-        case EVENT_UPSTREAM_ERROR:
-        case EVENT_DOWNSTREAM_ERROR:
-          return AbortWithError(event_args);
-        case EVENT_START_RECOGNITION:
-        case EVENT_AUDIO_CHUNK:
-        case EVENT_AUDIO_CHUNKS_ENDED:
-          return NotFeasible(event_args);
-      }
-      break;
-  }
-  return NotFeasible(event_args);
-}
-
-// ----------- Contract for all the FSM evolution functions below -------------
-//  - Are guaranteed to be executed in the same thread (IO, except for tests);
-//  - Are guaranteed to be not reentrant (themselves and each other);
-//  - event_args members are guaranteed to be stable during the call;
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::ConnectBothStreams(const FSMEventArgs&) {
-  DCHECK(!upstream_loader_.get());
-  DCHECK(!downstream_loader_.get());
-
-  encoder_ = std::make_unique<AudioEncoder>(config_.audio_sample_rate,
-                                            config_.audio_num_bits_per_sample);
-  DCHECK(encoder_.get());
-  const std::string request_key = GenerateRequestKey();
-
-  // Only use the framed post data format when a preamble needs to be logged.
-  use_framed_post_data_ = (config_.preamble &&
-                           !config_.preamble->sample_data.empty() &&
-                           !config_.auth_token.empty() &&
-                           !config_.auth_scope.empty());
-  if (use_framed_post_data_) {
-    preamble_encoder_ = std::make_unique<AudioEncoder>(
-        config_.preamble->sample_rate, config_.preamble->sample_depth * 8);
-  }
-
-  const char* web_service_base_url = !web_service_base_url_for_tests
-                                         ? kWebServiceBaseUrl
-                                         : web_service_base_url_for_tests;
-
-  // Setup downstream fetcher.
-  std::vector<std::string> downstream_args;
-  downstream_args.push_back(
-      "key=" + base::EscapeQueryParamValue(google_apis::GetAPIKey(), true));
-  downstream_args.push_back("pair=" + request_key);
-  downstream_args.push_back("output=pb");
-  GURL downstream_url(std::string(web_service_base_url) +
-                      std::string(kDownstreamUrl) +
-                      base::JoinString(downstream_args, "&"));
-
-  net::NetworkTrafficAnnotationTag downstream_traffic_annotation =
-      net::DefineNetworkTrafficAnnotation("speech_recognition_downstream", R"(
-        semantics {
-          sender: "Speech Recognition"
-          description:
-            "Chrome provides translation from speech audio recorded with a "
-            "microphone to text, by using the Google speech recognition web "
-            "service. Audio is sent to Google's servers (upstream) and text is "
-            "returned (downstream). This network request (downstream) sends an "
-            "id for getting the text response. Then the (upstream) request "
-            "sends the audio data along with the id. When the server has "
-            "finished processing the audio data and produced a text response, "
-            "it replies to this request."
-          trigger:
-            "The user chooses to start the recognition by clicking the "
-            "microphone icon in the Google search field."
-          data: "A unique random id for this speech recognition request."
-          destination: GOOGLE_OWNED_SERVICE
-        }
-        policy {
-          cookies_allowed: NO
-          setting:
-            "The user must allow the browser to access the microphone in a "
-            "permission prompt. This is set per site (hostname pattern). In "
-            "the content settings menu, microphone access can be turned off "
-            "for all sites and site specific settings can be changed."
-          chrome_policy {
-            AudioCaptureAllowed {
-              policy_options {mode: MANDATORY}
-              AudioCaptureAllowed: false
-            }
-          }
-          chrome_policy {
-            AudioCaptureAllowedUrls {
-              policy_options {mode: MANDATORY}
-              AudioCaptureAllowedUrls: {}
-            }
-          }
-        })");
-  auto downstream_request = std::make_unique<network::ResourceRequest>();
-  downstream_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
-  downstream_request->url = downstream_url;
-  downstream_loader_ = std::make_unique<speech::DownstreamLoader>(
-      std::move(downstream_request), downstream_traffic_annotation,
-      shared_url_loader_factory_.get(), this);
-
-  // Setup upstream fetcher.
-  // TODO(hans): Support for user-selected grammars.
-  std::vector<std::string> upstream_args;
-  upstream_args.push_back(
-      "key=" + base::EscapeQueryParamValue(google_apis::GetAPIKey(), true));
-  upstream_args.push_back("pair=" + request_key);
-  upstream_args.push_back("output=pb");
-  upstream_args.push_back(
-      "lang=" + base::EscapeQueryParamValue(GetAcceptedLanguages(), true));
-  upstream_args.push_back(
-      config_.filter_profanities ? "pFilter=2" : "pFilter=0");
-  if (config_.max_hypotheses > 0U) {
-    uint32_t max_alternatives =
-        std::min(kMaxMaxAlternatives, config_.max_hypotheses);
-    upstream_args.push_back("maxAlternatives=" +
-                            base::NumberToString(max_alternatives));
-  }
-  upstream_args.push_back("app=chromium");
-  for (const blink::mojom::SpeechRecognitionGrammar& grammar :
-       config_.grammars) {
-    std::string grammar_value(base::NumberToString(grammar.weight) + ":" +
-                              grammar.url.spec());
-    upstream_args.push_back("grammar=" +
-                            base::EscapeQueryParamValue(grammar_value, true));
-  }
-  if (config_.continuous)
-    upstream_args.push_back("continuous");
-  else
-    upstream_args.push_back("endpoint=1");
-  if (config_.interim_results)
-    upstream_args.push_back("interim");
-  if (!config_.auth_token.empty() && !config_.auth_scope.empty()) {
-    upstream_args.push_back(
-        "authScope=" + base::EscapeQueryParamValue(config_.auth_scope, true));
-    upstream_args.push_back(
-        "authToken=" + base::EscapeQueryParamValue(config_.auth_token, true));
-  }
-  if (use_framed_post_data_) {
-    std::string audio_format;
-    if (preamble_encoder_)
-      audio_format = preamble_encoder_->GetMimeType() + ",";
-    audio_format += encoder_->GetMimeType();
-    upstream_args.push_back("audioFormat=" +
-                            base::EscapeQueryParamValue(audio_format, true));
-  }
-
-  GURL upstream_url(std::string(web_service_base_url) +
-                    std::string(kUpstreamUrl) +
-                    base::JoinString(upstream_args, "&"));
-
-  net::NetworkTrafficAnnotationTag upstream_traffic_annotation =
-      net::DefineNetworkTrafficAnnotation("speech_recognition_upstream", R"(
-        semantics {
-          sender: "Speech Recognition"
-          description:
-            "Chrome provides translation from speech audio recorded with a "
-            "microphone to text, by using the Google speech recognition web "
-            "service. Audio is sent to Google's servers (upstream) and text is "
-            "returned (downstream)."
-          trigger:
-            "The user chooses to start the recognition by clicking the "
-            "microphone icon in the Google search field."
-          data:
-            "Audio recorded with the microphone, and the unique id of "
-            "downstream speech recognition request."
-          destination: GOOGLE_OWNED_SERVICE
-        }
-        policy {
-          cookies_allowed: NO
-          setting:
-            "The user must allow the browser to access the microphone in a "
-            "permission prompt. This is set per site (hostname pattern). In "
-            "the content settings menu, microphone access can be turned off "
-            "for all sites and site specific settings can be changed."
-          chrome_policy {
-            AudioCaptureAllowed {
-              policy_options {mode: MANDATORY}
-              AudioCaptureAllowed: false
-            }
-          }
-          chrome_policy {
-            AudioCaptureAllowedUrls {
-              policy_options {mode: MANDATORY}
-              AudioCaptureAllowedUrls: {}
-            }
-          }
-        })");
-
-  auto upstream_request = std::make_unique<network::ResourceRequest>();
-  upstream_request->url = upstream_url;
-  upstream_request->method = "POST";
-  upstream_request->referrer = GURL(config_.origin_url);
-  upstream_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
-  if (use_framed_post_data_) {
-    upstream_request->headers.SetHeader(net::HttpRequestHeaders::kContentType,
-                                        "application/octet-stream");
-  } else {
-    upstream_request->headers.SetHeader(net::HttpRequestHeaders::kContentType,
-                                        encoder_->GetMimeType());
-  }
-
-  upstream_loader_ = std::make_unique<speech::UpstreamLoader>(
-      std::move(upstream_request), upstream_traffic_annotation,
-      shared_url_loader_factory_.get(), this);
-
-  if (preamble_encoder_) {
-    // Encode and send preamble right away.
-    scoped_refptr<AudioChunk> chunk = new AudioChunk(
-        reinterpret_cast<const uint8_t*>(config_.preamble->sample_data.data()),
-        config_.preamble->sample_data.size(), config_.preamble->sample_depth);
-    preamble_encoder_->Encode(*chunk);
-    preamble_encoder_->Flush();
-    scoped_refptr<AudioChunk> encoded_data(
-        preamble_encoder_->GetEncodedDataAndClear());
-    UploadAudioChunk(encoded_data->AsString(), FRAME_PREAMBLE_AUDIO, false);
-  }
-  return STATE_BOTH_STREAMS_CONNECTED;
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::TransmitAudioUpstream(
-    const FSMEventArgs& event_args) {
-  DCHECK(upstream_loader_.get());
-  DCHECK(event_args.audio_data.get());
-  const AudioChunk& audio = *(event_args.audio_data.get());
-
-  base::TimeDelta duration = media::AudioTimestampHelper::FramesToTime(
-      audio.NumSamples(), config_.audio_sample_rate);
-  upstream_audio_duration_ += duration;
-
-  DCHECK_EQ(audio.bytes_per_sample(), config_.audio_num_bits_per_sample / 8);
-  encoder_->Encode(audio);
-  scoped_refptr<AudioChunk> encoded_data(encoder_->GetEncodedDataAndClear());
-  UploadAudioChunk(encoded_data->AsString(), FRAME_RECOGNITION_AUDIO, false);
-  return state_;
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::ProcessDownstreamResponse(
-    const FSMEventArgs& event_args) {
-  DCHECK(event_args.response.get());
-
-  proto::SpeechRecognitionEvent ws_event;
-  if (!ws_event.ParseFromString(std::string(event_args.response->begin(),
-                                            event_args.response->end())))
-    return AbortWithError(event_args);
-
-  if (ws_event.has_status()) {
-    switch (ws_event.status()) {
-      case proto::SpeechRecognitionEvent::STATUS_SUCCESS:
-        break;
-      case proto::SpeechRecognitionEvent::STATUS_NO_SPEECH:
-        return Abort(blink::mojom::SpeechRecognitionErrorCode::kNoSpeech);
-      case proto::SpeechRecognitionEvent::STATUS_ABORTED:
-        return Abort(blink::mojom::SpeechRecognitionErrorCode::kAborted);
-      case proto::SpeechRecognitionEvent::STATUS_AUDIO_CAPTURE:
-        return Abort(blink::mojom::SpeechRecognitionErrorCode::kAudioCapture);
-      case proto::SpeechRecognitionEvent::STATUS_NETWORK:
-        return Abort(blink::mojom::SpeechRecognitionErrorCode::kNetwork);
-      case proto::SpeechRecognitionEvent::STATUS_NOT_ALLOWED:
-        return Abort(blink::mojom::SpeechRecognitionErrorCode::kNotAllowed);
-      case proto::SpeechRecognitionEvent::STATUS_SERVICE_NOT_ALLOWED:
-        return Abort(
-            blink::mojom::SpeechRecognitionErrorCode::kServiceNotAllowed);
-      case proto::SpeechRecognitionEvent::STATUS_BAD_GRAMMAR:
-        return Abort(blink::mojom::SpeechRecognitionErrorCode::kBadGrammar);
-      case proto::SpeechRecognitionEvent::STATUS_LANGUAGE_NOT_SUPPORTED:
-        return Abort(
-            blink::mojom::SpeechRecognitionErrorCode::kLanguageNotSupported);
-    }
-  }
-
-  if (!config_.continuous && ws_event.has_endpoint() &&
-      ws_event.endpoint() == proto::SpeechRecognitionEvent::END_OF_UTTERANCE) {
-    delegate_->OnSpeechRecognitionEngineEndOfUtterance();
-  }
-
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
-  for (int i = 0; i < ws_event.result_size(); ++i) {
-    const proto::SpeechRecognitionResult& ws_result = ws_event.result(i);
-    results.push_back(blink::mojom::SpeechRecognitionResult::New());
-    blink::mojom::SpeechRecognitionResultPtr& result = results.back();
-    result->is_provisional = !(ws_result.has_final() && ws_result.final());
-
-    if (!result->is_provisional)
-      got_last_definitive_result_ = true;
-
-    for (int j = 0; j < ws_result.alternative_size(); ++j) {
-      const proto::SpeechRecognitionAlternative& ws_alternative =
-          ws_result.alternative(j);
-      blink::mojom::SpeechRecognitionHypothesisPtr hypothesis =
-          blink::mojom::SpeechRecognitionHypothesis::New();
-      if (ws_alternative.has_confidence())
-        hypothesis->confidence = ws_alternative.confidence();
-      else if (ws_result.has_stability())
-        hypothesis->confidence = ws_result.stability();
-      DCHECK(ws_alternative.has_transcript());
-      // TODO(hans): Perhaps the transcript should be required in the proto?
-      if (ws_alternative.has_transcript())
-        hypothesis->utterance = base::UTF8ToUTF16(ws_alternative.transcript());
-
-      result->hypotheses.push_back(std::move(hypothesis));
-    }
-  }
-  if (results.size()) {
-    delegate_->OnSpeechRecognitionEngineResults(results);
-  }
-
-  return state_;
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::RaiseNoMatchErrorIfGotNoResults(
-    const FSMEventArgs& event_args) {
-  if (!got_last_definitive_result_) {
-    // Provide an empty result to notify that recognition is ended with no
-    // errors, yet neither any further results.
-    delegate_->OnSpeechRecognitionEngineResults(
-        std::vector<blink::mojom::SpeechRecognitionResultPtr>());
-  }
-  return AbortSilently(event_args);
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::CloseUpstreamAndWaitForResults(
-    const FSMEventArgs&) {
-  DCHECK(upstream_loader_.get());
-  DCHECK(encoder_.get());
-
-  DVLOG(1) <<  "Closing upstream.";
-
-  // The encoder requires a non-empty final buffer. So we encode a packet
-  // of silence in case encoder had no data already.
-  size_t sample_count =
-      config_.audio_sample_rate * kAudioPacketIntervalMs / 1000;
-  scoped_refptr<AudioChunk> dummy_chunk = new AudioChunk(
-      sample_count * sizeof(int16_t), encoder_->GetBitsPerSample() / 8);
-  encoder_->Encode(*dummy_chunk.get());
-  encoder_->Flush();
-  scoped_refptr<AudioChunk> encoded_dummy_data =
-      encoder_->GetEncodedDataAndClear();
-  DCHECK(!encoded_dummy_data->IsEmpty());
-  encoder_.reset();
-
-  UploadAudioChunk(encoded_dummy_data->AsString(),
-                   FRAME_RECOGNITION_AUDIO,
-                   true);
-  got_last_definitive_result_ = false;
-  return STATE_WAITING_DOWNSTREAM_RESULTS;
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::CloseDownstream(const FSMEventArgs&) {
-  DCHECK(!upstream_loader_.get());
-  DCHECK(downstream_loader_.get());
-
-  DVLOG(1) <<  "Closing downstream.";
-  downstream_loader_.reset();
-  return STATE_IDLE;
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::AbortSilently(const FSMEventArgs&) {
-  return Abort(blink::mojom::SpeechRecognitionErrorCode::kNone);
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::AbortWithError(const FSMEventArgs&) {
-  return Abort(blink::mojom::SpeechRecognitionErrorCode::kNetwork);
-}
-
-SpeechRecognitionEngine::FSMState SpeechRecognitionEngine::Abort(
-    blink::mojom::SpeechRecognitionErrorCode error_code) {
-  DVLOG(1) << "Aborting with error " << error_code;
-
-  if (error_code != blink::mojom::SpeechRecognitionErrorCode::kNone) {
-    delegate_->OnSpeechRecognitionEngineError(
-        blink::mojom::SpeechRecognitionError(
-            error_code, blink::mojom::SpeechAudioErrorDetails::kNone));
-  }
-  downstream_loader_.reset();
-  upstream_loader_.reset();
-  encoder_.reset();
-  return STATE_IDLE;
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::DoNothing(const FSMEventArgs&) {
-  return state_;
-}
-
-SpeechRecognitionEngine::FSMState
-SpeechRecognitionEngine::NotFeasible(const FSMEventArgs& event_args) {
-  NOTREACHED() << "Unfeasible event " << event_args.event
-               << " in state " << state_;
-  return state_;
-}
-
-std::string SpeechRecognitionEngine::GetAcceptedLanguages() const {
-  std::string langs = config_.language;
-  if (langs.empty() && !accept_language_.empty()) {
-    // If no language is provided then we use the first from the accepted
-    // language list. If this list is empty then it defaults to "en-US".
-    // Example of the contents of this list: "es,en-GB;q=0.8", ""
-    size_t separator = accept_language_.find_first_of(",;");
-    if (separator != std::string::npos)
-      langs = accept_language_.substr(0, separator);
-  }
-  if (langs.empty())
-    langs = "en-US";
-  return langs;
-}
-
-// TODO(primiano): Is there any utility in the codebase that already does this?
-std::string SpeechRecognitionEngine::GenerateRequestKey() const {
-  const int64_t kKeepLowBytes = 0x00000000FFFFFFFFLL;
-  const int64_t kKeepHighBytes = 0xFFFFFFFF00000000LL;
-
-  // Just keep the least significant bits of timestamp, in order to reduce
-  // probability of collisions.
-  int64_t key = (base::Time::Now().ToInternalValue() & kKeepLowBytes) |
-                (base::RandUint64() & kKeepHighBytes);
-  return base::HexEncode(reinterpret_cast<void*>(&key), sizeof(key));
-}
-
-void SpeechRecognitionEngine::UploadAudioChunk(const std::string& data,
-                                               FrameType type,
-                                               bool is_final) {
-  if (use_framed_post_data_) {
-    std::string frame(data.size() + 8u, char{0});
-    auto frame_span = base::as_writable_byte_span(frame);
-    frame_span.subspan<0u, 4u>().copy_from(
-        base::numerics::U32ToBigEndian(static_cast<uint32_t>(data.size())));
-    frame_span.subspan<4u, 4u>().copy_from(
-        base::numerics::U32ToBigEndian(base::checked_cast<uint32_t>(type)));
-    frame.replace(8u, data.size(), data);
-    upstream_loader_->AppendChunkToUpload(frame, is_final);
-  } else {
-    upstream_loader_->AppendChunkToUpload(data, is_final);
-  }
-}
-
-SpeechRecognitionEngine::FSMEventArgs::FSMEventArgs(FSMEvent event_value)
-    : event(event_value) {
-}
-
-SpeechRecognitionEngine::FSMEventArgs::~FSMEventArgs() {
+void SpeechRecognitionEngine::SetAudioParameters(
+    media::AudioParameters audio_parameters) {
+  audio_parameters_ = audio_parameters;
 }
 
 }  // namespace content
diff --git a/content/browser/speech/speech_recognition_engine.h b/content/browser/speech/speech_recognition_engine.h
index 82d04c5..53c90cd 100644
--- a/content/browser/speech/speech_recognition_engine.h
+++ b/content/browser/speech/speech_recognition_engine.h
@@ -5,61 +5,23 @@
 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_
 
-#include <stdint.h>
-#include <memory>
-#include <string>
 #include <vector>
 
-#include "base/memory/raw_ptr.h"
-#include "base/memory/ref_counted.h"
-#include "base/sequence_checker.h"
-#include "base/strings/string_piece.h"
-#include "components/speech/audio_encoder.h"
-#include "components/speech/chunked_byte_buffer.h"
-#include "components/speech/downstream_loader.h"
-#include "components/speech/downstream_loader_client.h"
-#include "components/speech/upstream_loader.h"
-#include "components/speech/upstream_loader_client.h"
+#include "components/speech/audio_buffer.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/speech_recognition_session_preamble.h"
-#include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
+#include "media/base/audio_parameters.h"
 #include "third_party/blink/public/mojom/speech/speech_recognition_error.mojom.h"
-#include "third_party/blink/public/mojom/speech/speech_recognition_grammar.mojom.h"
 #include "third_party/blink/public/mojom/speech/speech_recognition_result.mojom.h"
 
-class AudioChunk;
-
-namespace base {
-class TimeDelta;
-}
-
 namespace blink {
 namespace mojom {
 class SpeechRecognitionError;
 }  // namespace mojom
 }  // namespace blink
 
-namespace network {
-class SharedURLLoaderFactory;
-}
-
 namespace content {
 
-// A speech recognition engine supporting continuous recognition by means of
-// interaction with the Google streaming speech recognition webservice.
-//
-// This class establishes two HTTPS connections with the webservice for each
-// session, herein called "upstream" and "downstream". Audio chunks are sent on
-// the upstream by means of a chunked HTTP POST upload. Recognition results are
-// retrieved in a full-duplex fashion (i.e. while pushing audio on the upstream)
-// on the downstream by means of a chunked HTTP GET request. Pairing between the
-// two stream is handled through a randomly generated key, unique for each
-// request, which is passed in the &pair= arg to both stream request URLs. In
-// the case of a regular session, the upstream is closed when the audio capture
-// ends (notified through a |AudioChunksEnded| call) and the downstream waits
-// for a corresponding server closure (eventually some late results can come
-// after closing the upstream). Both streams are guaranteed to be closed when
-// |EndRecognition| call is issued.
+// This is the interface for any speech recognition engine, local or network.
 //
 // The expected call sequence is:
 // StartRecognition      Mandatory at beginning of SR.
@@ -71,9 +33,7 @@
 // EndRecognition. If a recognition was started, the caller can free the
 // SpeechRecognitionEngine only after calling EndRecognition.
 
-class CONTENT_EXPORT SpeechRecognitionEngine
-    : public speech::UpstreamLoaderClient,
-      public speech::DownstreamLoaderClient {
+class CONTENT_EXPORT SpeechRecognitionEngine {
  public:
   class Delegate {
    public:
@@ -86,161 +46,25 @@
         const blink::mojom::SpeechRecognitionError& error) = 0;
 
    protected:
-    virtual ~Delegate() {}
+    virtual ~Delegate() = default;
   };
 
-  // Engine configuration.
-  struct CONTENT_EXPORT Config {
-    Config();
-    ~Config();
+  SpeechRecognitionEngine() = default;
+  virtual ~SpeechRecognitionEngine() = default;
+  virtual void StartRecognition() = 0;
+  virtual void EndRecognition() = 0;
+  virtual void TakeAudioChunk(const AudioChunk& data) = 0;
+  virtual void AudioChunksEnded() = 0;
+  virtual int GetDesiredAudioChunkDurationMs() const = 0;
 
-    std::string language;
-    std::vector<blink::mojom::SpeechRecognitionGrammar> grammars;
-    bool filter_profanities;
-    bool continuous;
-    bool interim_results;
-    uint32_t max_hypotheses;
-    std::string origin_url;
-    int audio_sample_rate;
-    int audio_num_bits_per_sample;
-    std::string auth_token;
-    std::string auth_scope;
-    scoped_refptr<SpeechRecognitionSessionPreamble> preamble;
-  };
+  void SetAudioParameters(media::AudioParameters audio_parameters);
 
   // set_delegate detached from constructor for lazy dependency injection.
-  void set_delegate(Delegate* delegate) { delegate_ = delegate; }
+  void set_delegate(Delegate* delegate);
 
-  // Duration of each audio packet.
-  static const int kAudioPacketIntervalMs;
-
-  // |accept_language| is the default Accept-Language header.
-  SpeechRecognitionEngine(
-      scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory,
-      const std::string& accept_language);
-
-  SpeechRecognitionEngine(const SpeechRecognitionEngine&) = delete;
-  SpeechRecognitionEngine& operator=(const SpeechRecognitionEngine&) = delete;
-
-  ~SpeechRecognitionEngine() override;
-
-  // Sets the URL requests are sent to for tests.
-  static void set_web_service_base_url_for_tests(
-      const char* base_url_for_tests);
-
-  void SetConfig(const Config& config);
-  void StartRecognition();
-  void EndRecognition();
-  void TakeAudioChunk(const AudioChunk& data);
-  void AudioChunksEnded();
-  bool IsRecognitionPending() const;
-  int GetDesiredAudioChunkDurationMs() const;
-
- private:
-  friend class speech::UpstreamLoaderClient;
-  friend class speech::DownstreamLoader;
-
-  raw_ptr<Delegate> delegate_;
-
-  // Response status codes from the speech recognition webservice.
-  static const int kWebserviceStatusNoError;
-  static const int kWebserviceStatusErrorNoMatch;
-
-  // Frame type for framed POST data. Do NOT change these. They must match
-  // values the server expects.
-  enum FrameType {
-    FRAME_PREAMBLE_AUDIO = 0,
-    FRAME_RECOGNITION_AUDIO = 1
-  };
-
-  // Data types for the internal Finite State Machine (FSM).
-  enum FSMState {
-    STATE_IDLE = 0,
-    STATE_BOTH_STREAMS_CONNECTED,
-    STATE_WAITING_DOWNSTREAM_RESULTS,
-    STATE_MAX_VALUE = STATE_WAITING_DOWNSTREAM_RESULTS
-  };
-
-  enum FSMEvent {
-    EVENT_END_RECOGNITION = 0,
-    EVENT_START_RECOGNITION,
-    EVENT_AUDIO_CHUNK,
-    EVENT_AUDIO_CHUNKS_ENDED,
-    EVENT_UPSTREAM_ERROR,
-    EVENT_DOWNSTREAM_ERROR,
-    EVENT_DOWNSTREAM_RESPONSE,
-    EVENT_DOWNSTREAM_CLOSED,
-    EVENT_MAX_VALUE = EVENT_DOWNSTREAM_CLOSED
-  };
-
-  struct FSMEventArgs {
-    explicit FSMEventArgs(FSMEvent event_value);
-
-    FSMEventArgs(const FSMEventArgs&) = delete;
-    FSMEventArgs& operator=(const FSMEventArgs&) = delete;
-
-    ~FSMEventArgs();
-
-    FSMEvent event;
-
-    // In case of EVENT_AUDIO_CHUNK, holds the chunk pushed by |TakeAudioChunk|.
-    scoped_refptr<const AudioChunk> audio_data;
-
-    // In case of EVENT_DOWNSTREAM_RESPONSE, hold the current chunk bytes.
-    std::unique_ptr<std::vector<uint8_t>> response;
-  };
-
-  // speech::UpstreamLoaderClient
-  void OnUpstreamDataComplete(bool success, int response_code) override;
-
-  // speech::DownstreamLoaderClient
-  void OnDownstreamDataReceived(base::StringPiece new_response_data) override;
-  void OnDownstreamDataComplete(bool success, int response_code) override;
-
-  // Entry point for pushing any new external event into the recognizer FSM.
-  void DispatchEvent(const FSMEventArgs& event_args);
-
-  // Defines the behavior of the recognizer FSM, selecting the appropriate
-  // transition according to the current state and event.
-  FSMState ExecuteTransitionAndGetNextState(const FSMEventArgs& event_args);
-
-  // The methods below handle transitions of the recognizer FSM.
-  FSMState ConnectBothStreams(const FSMEventArgs& event_args);
-  FSMState TransmitAudioUpstream(const FSMEventArgs& event_args);
-  FSMState ProcessDownstreamResponse(const FSMEventArgs& event_args);
-  FSMState RaiseNoMatchErrorIfGotNoResults(const FSMEventArgs& event_args);
-  FSMState CloseUpstreamAndWaitForResults(const FSMEventArgs& event_args);
-  FSMState CloseDownstream(const FSMEventArgs& event_args);
-  FSMState AbortSilently(const FSMEventArgs& event_args);
-  FSMState AbortWithError(const FSMEventArgs& event_args);
-  FSMState Abort(blink::mojom::SpeechRecognitionErrorCode error);
-  FSMState DoNothing(const FSMEventArgs& event_args);
-  FSMState NotFeasible(const FSMEventArgs& event_args);
-
-  std::string GetAcceptedLanguages() const;
-  std::string GenerateRequestKey() const;
-
-  // Upload a single chunk of audio data. Handles both unframed and framed
-  // upload formats, and uses the appropriate one.
-  void UploadAudioChunk(const std::string& data, FrameType type, bool is_final);
-
-  // The total audio duration of the upstream request.
-  base::TimeDelta upstream_audio_duration_;
-
-  Config config_;
-  std::unique_ptr<speech::UpstreamLoader> upstream_loader_;
-  std::unique_ptr<speech::DownstreamLoader> downstream_loader_;
-  scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory_;
-  const std::string accept_language_;
-  std::unique_ptr<AudioEncoder> encoder_;
-  std::unique_ptr<AudioEncoder> preamble_encoder_;
-  speech::ChunkedByteBuffer chunked_byte_buffer_;
-  bool got_last_definitive_result_;
-  bool is_dispatching_event_;
-  bool use_framed_post_data_;
-  FSMState state_;
-
-  SEQUENCE_CHECKER(sequence_checker_);
+ protected:
+  raw_ptr<Delegate> delegate_ = nullptr;
+  media::AudioParameters audio_parameters_;
 };
 
 }  // namespace content
diff --git a/content/browser/speech/speech_recognition_engine_unittest.cc b/content/browser/speech/speech_recognition_engine_unittest.cc
deleted file mode 100644
index 8186ab1..0000000
--- a/content/browser/speech/speech_recognition_engine_unittest.cc
+++ /dev/null
@@ -1,771 +0,0 @@
-// Copyright 2012 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/speech/speech_recognition_engine.h"
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <memory>
-
-#include "base/containers/queue.h"
-#include "base/numerics/byte_conversions.h"
-#include "base/numerics/safe_conversions.h"
-#include "base/run_loop.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/sys_byteorder.h"
-#include "base/test/task_environment.h"
-#include "components/speech/audio_buffer.h"
-#include "content/public/browser/google_streaming_api.pb.h"
-#include "mojo/public/cpp/bindings/remote.h"
-#include "net/base/net_errors.h"
-#include "net/http/http_response_headers.h"
-#include "net/http/http_util.h"
-#include "services/network/public/cpp/url_loader_completion_status.h"
-#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
-#include "services/network/test/test_url_loader_factory.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/mojom/speech/speech_recognition_error.mojom.h"
-#include "third_party/blink/public/mojom/speech/speech_recognition_result.mojom.h"
-
-using base::HostToNet32;
-using base::checked_cast;
-
-namespace content {
-
-// Frame types for framed POST data.
-static const uint32_t kFrameTypePreamble = 0;
-static const uint32_t kFrameTypeRecognitionAudio = 1;
-
-// Note: the terms upstream and downstream are from the point-of-view of the
-// client (engine_under_test_).
-
-class SpeechRecognitionEngineTest
-    : public SpeechRecognitionEngine::Delegate,
-      public testing::Test {
- public:
-  SpeechRecognitionEngineTest()
-      : last_number_of_upstream_chunks_seen_(0U),
-        error_(blink::mojom::SpeechRecognitionErrorCode::kNone),
-        end_of_utterance_counter_(0) {}
-
-  // SpeechRecognitionRequestDelegate methods.
-  void OnSpeechRecognitionEngineResults(
-      const std::vector<blink::mojom::SpeechRecognitionResultPtr>& results)
-      override {
-    results_.push(mojo::Clone(results));
-  }
-  void OnSpeechRecognitionEngineEndOfUtterance() override {
-    ++end_of_utterance_counter_;
-  }
-  void OnSpeechRecognitionEngineError(
-      const blink::mojom::SpeechRecognitionError& error) override {
-    error_ = error.code;
-  }
-
-  // testing::Test methods.
-  void SetUp() override;
-  void TearDown() override;
-
- protected:
-  enum DownstreamError {
-    DOWNSTREAM_ERROR_NONE,
-    DOWNSTREAM_ERROR_HTTP500,
-    DOWNSTREAM_ERROR_NETWORK,
-    DOWNSTREAM_ERROR_WEBSERVICE_NO_MATCH
-  };
-  static bool ResultsAreEqual(
-      const std::vector<blink::mojom::SpeechRecognitionResultPtr>& a,
-      const std::vector<blink::mojom::SpeechRecognitionResultPtr>& b);
-  static std::string SerializeProtobufResponse(
-      const proto::SpeechRecognitionEvent& msg);
-
-  const network::TestURLLoaderFactory::PendingRequest* GetUpstreamRequest();
-  const network::TestURLLoaderFactory::PendingRequest* GetDownstreamRequest();
-  void StartMockRecognition();
-  void EndMockRecognition();
-  void InjectDummyAudioChunk();
-  void ProvideMockResponseStartDownstreamIfNeeded();
-  void ProvideMockProtoResultDownstream(
-      const proto::SpeechRecognitionEvent& result);
-  void ProvideMockResultDownstream(
-      const blink::mojom::SpeechRecognitionResultPtr& result);
-  void ExpectResultsReceived(
-      const std::vector<blink::mojom::SpeechRecognitionResultPtr>& result);
-  void ExpectFramedChunk(const std::string& chunk, uint32_t type);
-  // Reads and returns all pending upload data from |upstream_data_pipe_|,
-  // initializing the pipe from |GetUpstreamRequest()|, if needed.
-  std::string ConsumeChunkedUploadData();
-  void CloseMockDownstream(DownstreamError error);
-
-  base::test::SingleThreadTaskEnvironment task_environment_;
-
-  network::TestURLLoaderFactory url_loader_factory_;
-  mojo::ScopedDataPipeProducerHandle downstream_data_pipe_;
-  mojo::Remote<network::mojom::ChunkedDataPipeGetter> chunked_data_pipe_getter_;
-  mojo::ScopedDataPipeConsumerHandle upstream_data_pipe_;
-
-  std::unique_ptr<SpeechRecognitionEngine> engine_under_test_;
-  size_t last_number_of_upstream_chunks_seen_;
-  std::string response_buffer_;
-  blink::mojom::SpeechRecognitionErrorCode error_;
-  int end_of_utterance_counter_;
-  base::queue<std::vector<blink::mojom::SpeechRecognitionResultPtr>> results_;
-};
-
-TEST_F(SpeechRecognitionEngineTest, SingleDefinitiveResult) {
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-  ASSERT_EQ("", ConsumeChunkedUploadData());
-
-  // Inject some dummy audio chunks and check a corresponding chunked upload
-  // is performed every time on the server.
-  for (int i = 0; i < 3; ++i) {
-    InjectDummyAudioChunk();
-    ASSERT_FALSE(ConsumeChunkedUploadData().empty());
-  }
-
-  // Ensure that a final (empty) audio chunk is uploaded on chunks end.
-  engine_under_test_->AudioChunksEnded();
-  ASSERT_FALSE(ConsumeChunkedUploadData().empty());
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Simulate a protobuf message streamed from the server containing a single
-  // result with two hypotheses.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
-  results.push_back(blink::mojom::SpeechRecognitionResult::New());
-  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
-  result->is_provisional = false;
-  result->hypotheses.push_back(
-      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis 1", 0.1F));
-  result->hypotheses.push_back(
-      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis 2", 0.2F));
-
-  ProvideMockResultDownstream(result);
-  ExpectResultsReceived(results);
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Ensure everything is closed cleanly after the downstream is closed.
-  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-  EndMockRecognition();
-  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
-  ASSERT_EQ(0U, results_.size());
-}
-
-TEST_F(SpeechRecognitionEngineTest, SeveralStreamingResults) {
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-  ASSERT_EQ("", ConsumeChunkedUploadData());
-
-  for (int i = 0; i < 4; ++i) {
-    InjectDummyAudioChunk();
-    ASSERT_NE("", ConsumeChunkedUploadData());
-
-    std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
-    results.push_back(blink::mojom::SpeechRecognitionResult::New());
-    blink::mojom::SpeechRecognitionResultPtr& result = results.back();
-    result->is_provisional = (i % 2 == 0);  // Alternate result types.
-    float confidence = result->is_provisional ? 0.0F : (i * 0.1F);
-    result->hypotheses.push_back(blink::mojom::SpeechRecognitionHypothesis::New(
-        u"hypothesis", confidence));
-
-    ProvideMockResultDownstream(result);
-    ExpectResultsReceived(results);
-    ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-  }
-
-  // Ensure that a final (empty) audio chunk is uploaded on chunks end.
-  engine_under_test_->AudioChunksEnded();
-  ASSERT_NE("", ConsumeChunkedUploadData());
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Simulate a final definitive result.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
-  results.push_back(blink::mojom::SpeechRecognitionResult::New());
-  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
-  result->is_provisional = false;
-  result->hypotheses.push_back(blink::mojom::SpeechRecognitionHypothesis::New(
-      u"The final result", 1.0F));
-  ProvideMockResultDownstream(result);
-  ExpectResultsReceived(results);
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Ensure everything is closed cleanly after the downstream is closed.
-  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-  EndMockRecognition();
-  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
-  ASSERT_EQ(0U, results_.size());
-}
-
-TEST_F(SpeechRecognitionEngineTest, NoFinalResultAfterAudioChunksEnded) {
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-  ASSERT_EQ("", ConsumeChunkedUploadData());
-
-  // Simulate one pushed audio chunk.
-  InjectDummyAudioChunk();
-  ASSERT_NE("", ConsumeChunkedUploadData());
-
-  // Simulate the corresponding definitive result.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
-  results.push_back(blink::mojom::SpeechRecognitionResult::New());
-  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
-  result->hypotheses.push_back(
-      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis", 1.0F));
-  ProvideMockResultDownstream(result);
-  ExpectResultsReceived(results);
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Simulate a silent downstream closure after |AudioChunksEnded|.
-  engine_under_test_->AudioChunksEnded();
-  ASSERT_NE("", ConsumeChunkedUploadData());
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
-
-  // Expect an empty result, aimed at notifying recognition ended with no
-  // actual results nor errors.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> empty_results;
-  ExpectResultsReceived(empty_results);
-
-  // Ensure everything is closed cleanly after the downstream is closed.
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-  EndMockRecognition();
-  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
-  ASSERT_EQ(0U, results_.size());
-}
-
-// Simulate the network service repeatedly re-requesting data (Possibly due to
-// using a stale socket, for instance).
-TEST_F(SpeechRecognitionEngineTest, ReRequestData) {
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-  ASSERT_EQ("", ConsumeChunkedUploadData());
-
-  // Simulate one pushed audio chunk.
-  InjectDummyAudioChunk();
-  std::string uploaded_data = ConsumeChunkedUploadData();
-  ASSERT_NE(uploaded_data, ConsumeChunkedUploadData());
-
-  // The network service closes the data pipe.
-  upstream_data_pipe_.reset();
-
-  // Re-opening the data pipe should result in the data being re-uploaded.
-  ASSERT_EQ(uploaded_data, ConsumeChunkedUploadData());
-
-  // Simulate the corresponding definitive result.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
-  results.push_back(blink::mojom::SpeechRecognitionResult::New());
-  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
-  result->hypotheses.push_back(
-      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis", 1.0F));
-  ProvideMockResultDownstream(result);
-  ExpectResultsReceived(results);
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Simulate a silent downstream closure after |AudioChunksEnded|.
-  engine_under_test_->AudioChunksEnded();
-  std::string new_uploaded_data = ConsumeChunkedUploadData();
-  ASSERT_NE(new_uploaded_data, ConsumeChunkedUploadData());
-  uploaded_data += new_uploaded_data;
-
-  // The network service closes the data pipe.
-  upstream_data_pipe_.reset();
-
-  // Re-opening the data pipe should result in the data being re-uploaded.
-  ASSERT_EQ(uploaded_data, ConsumeChunkedUploadData());
-
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
-
-  // Expect an empty result, aimed at notifying recognition ended with no
-  // actual results nor errors.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> empty_results;
-  ExpectResultsReceived(empty_results);
-
-  // Ensure everything is closed cleanly after the downstream is closed.
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-  EndMockRecognition();
-  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
-  ASSERT_EQ(0U, results_.size());
-}
-
-TEST_F(SpeechRecognitionEngineTest, NoMatchError) {
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-  ASSERT_EQ("", ConsumeChunkedUploadData());
-
-  for (int i = 0; i < 3; ++i) {
-    InjectDummyAudioChunk();
-    ASSERT_NE("", ConsumeChunkedUploadData());
-  }
-  engine_under_test_->AudioChunksEnded();
-  ASSERT_NE("", ConsumeChunkedUploadData());
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Simulate only a provisional result.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
-  results.push_back(blink::mojom::SpeechRecognitionResult::New());
-  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
-  result->is_provisional = true;
-  result->hypotheses.push_back(blink::mojom::SpeechRecognitionHypothesis::New(
-      u"The final result", 0.0F));
-  ProvideMockResultDownstream(result);
-  ExpectResultsReceived(results);
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  CloseMockDownstream(DOWNSTREAM_ERROR_WEBSERVICE_NO_MATCH);
-
-  // Expect an empty result.
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-  EndMockRecognition();
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> empty_result;
-  ExpectResultsReceived(empty_result);
-}
-
-TEST_F(SpeechRecognitionEngineTest, HTTPError) {
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-  ASSERT_EQ("", ConsumeChunkedUploadData());
-
-  InjectDummyAudioChunk();
-  ASSERT_NE("", ConsumeChunkedUploadData());
-
-  // Close the downstream with a HTTP 500 error.
-  CloseMockDownstream(DOWNSTREAM_ERROR_HTTP500);
-
-  // Expect a blink::mojom::SpeechRecognitionErrorCode::kNetwork error to be
-  // raised.
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-  EndMockRecognition();
-  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNetwork, error_);
-  ASSERT_EQ(0U, results_.size());
-}
-
-TEST_F(SpeechRecognitionEngineTest, NetworkError) {
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-  ASSERT_EQ("", ConsumeChunkedUploadData());
-
-  InjectDummyAudioChunk();
-  ASSERT_NE("", ConsumeChunkedUploadData());
-
-  // Close the downstream fetcher simulating a network failure.
-  CloseMockDownstream(DOWNSTREAM_ERROR_NETWORK);
-
-  // Expect a blink::mojom::SpeechRecognitionErrorCode::kNetwork error to be
-  // raised.
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-  EndMockRecognition();
-  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNetwork, error_);
-  ASSERT_EQ(0U, results_.size());
-}
-
-TEST_F(SpeechRecognitionEngineTest, Stability) {
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-  ASSERT_EQ("", ConsumeChunkedUploadData());
-
-  // Upload a dummy audio chunk.
-  InjectDummyAudioChunk();
-  ASSERT_NE("", ConsumeChunkedUploadData());
-  engine_under_test_->AudioChunksEnded();
-
-  // Simulate a protobuf message with an intermediate result without confidence,
-  // but with stability.
-  proto::SpeechRecognitionEvent proto_event;
-  proto_event.set_status(proto::SpeechRecognitionEvent::STATUS_SUCCESS);
-  proto::SpeechRecognitionResult* proto_result = proto_event.add_result();
-  proto_result->set_stability(0.5);
-  proto::SpeechRecognitionAlternative *proto_alternative =
-      proto_result->add_alternative();
-  proto_alternative->set_transcript("foo");
-  ProvideMockProtoResultDownstream(proto_event);
-
-  // Set up expectations.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
-  results.push_back(blink::mojom::SpeechRecognitionResult::New());
-  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
-  result->is_provisional = true;
-  result->hypotheses.push_back(
-      blink::mojom::SpeechRecognitionHypothesis::New(u"foo", 0.5));
-
-  // Check that the protobuf generated the expected result.
-  ExpectResultsReceived(results);
-
-  // Since it was a provisional result, recognition is still pending.
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Shut down.
-  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-  EndMockRecognition();
-
-  // Since there was no final result, we get an empty "no match" result.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> empty_result;
-  ExpectResultsReceived(empty_result);
-  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
-  ASSERT_EQ(0U, results_.size());
-}
-
-TEST_F(SpeechRecognitionEngineTest, EndOfUtterance) {
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-
-  // Simulate a END_OF_UTTERANCE proto event with continuous true.
-  SpeechRecognitionEngine::Config config;
-  config.continuous = true;
-  engine_under_test_->SetConfig(config);
-  proto::SpeechRecognitionEvent proto_event;
-  proto_event.set_endpoint(proto::SpeechRecognitionEvent::END_OF_UTTERANCE);
-  ASSERT_EQ(0, end_of_utterance_counter_);
-  ProvideMockProtoResultDownstream(proto_event);
-  ASSERT_EQ(0, end_of_utterance_counter_);
-
-  // Simulate a END_OF_UTTERANCE proto event with continuous false.
-  config.continuous = false;
-  engine_under_test_->SetConfig(config);
-  ProvideMockProtoResultDownstream(proto_event);
-  ASSERT_EQ(1, end_of_utterance_counter_);
-
-  // Shut down.
-  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
-  EndMockRecognition();
-}
-
-TEST_F(SpeechRecognitionEngineTest, SendPreamble) {
-  const size_t kPreambleLength = 100;
-  scoped_refptr<SpeechRecognitionSessionPreamble> preamble =
-      new SpeechRecognitionSessionPreamble();
-  preamble->sample_rate = 16000;
-  preamble->sample_depth = 2;
-  preamble->sample_data.assign(kPreambleLength, 0);
-  SpeechRecognitionEngine::Config config;
-  config.auth_token = "foo";
-  config.auth_scope = "bar";
-  config.preamble = preamble;
-  engine_under_test_->SetConfig(config);
-
-  StartMockRecognition();
-  ASSERT_TRUE(GetUpstreamRequest());
-  // First chunk uploaded should be the preamble.
-  std::string chunk = ConsumeChunkedUploadData();
-  ASSERT_NE("", chunk);
-  ExpectFramedChunk(chunk, kFrameTypePreamble);
-
-  for (int i = 0; i < 3; ++i) {
-    InjectDummyAudioChunk();
-    chunk = ConsumeChunkedUploadData();
-    ASSERT_NE("", chunk);
-    ExpectFramedChunk(chunk, kFrameTypeRecognitionAudio);
-  }
-  engine_under_test_->AudioChunksEnded();
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Simulate a protobuf message streamed from the server containing a single
-  // result with one hypotheses.
-  std::vector<blink::mojom::SpeechRecognitionResultPtr> results;
-  results.push_back(blink::mojom::SpeechRecognitionResult::New());
-  blink::mojom::SpeechRecognitionResultPtr& result = results.back();
-  result->is_provisional = false;
-  result->hypotheses.push_back(
-      blink::mojom::SpeechRecognitionHypothesis::New(u"hypothesis 1", 0.1F));
-
-  ProvideMockResultDownstream(result);
-  ExpectResultsReceived(results);
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  // Ensure everything is closed cleanly after the downstream is closed.
-  CloseMockDownstream(DOWNSTREAM_ERROR_NONE);
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-  EndMockRecognition();
-  ASSERT_EQ(blink::mojom::SpeechRecognitionErrorCode::kNone, error_);
-  ASSERT_EQ(0U, results_.size());
-}
-
-void SpeechRecognitionEngineTest::SetUp() {
-  engine_under_test_ = std::make_unique<SpeechRecognitionEngine>(
-      base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
-          &url_loader_factory_),
-      "" /* accept_language */);
-  engine_under_test_->set_delegate(this);
-}
-
-void SpeechRecognitionEngineTest::TearDown() {
-  engine_under_test_.reset();
-}
-
-const network::TestURLLoaderFactory::PendingRequest*
-SpeechRecognitionEngineTest::GetUpstreamRequest() {
-  for (const auto& pending_request : *url_loader_factory_.pending_requests()) {
-    if (pending_request.request.url.spec().find("/up") != std::string::npos)
-      return &pending_request;
-  }
-  return nullptr;
-}
-
-const network::TestURLLoaderFactory::PendingRequest*
-SpeechRecognitionEngineTest::GetDownstreamRequest() {
-  for (const auto& pending_request : *url_loader_factory_.pending_requests()) {
-    if (pending_request.request.url.spec().find("/down") != std::string::npos)
-      return &pending_request;
-  }
-  return nullptr;
-}
-
-// Starts recognition on the engine, ensuring that both stream fetchers are
-// created.
-void SpeechRecognitionEngineTest::StartMockRecognition() {
-  DCHECK(engine_under_test_.get());
-
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-
-  engine_under_test_->StartRecognition();
-  ASSERT_TRUE(engine_under_test_->IsRecognitionPending());
-
-  ASSERT_TRUE(GetUpstreamRequest());
-  ASSERT_TRUE(GetDownstreamRequest());
-}
-
-void SpeechRecognitionEngineTest::EndMockRecognition() {
-  DCHECK(engine_under_test_.get());
-  engine_under_test_->EndRecognition();
-  ASSERT_FALSE(engine_under_test_->IsRecognitionPending());
-
-  // TODO(primiano): In order to be very pedantic we should check that both the
-  // upstream and downstream URL fetchers have been disposed at this time.
-  // Unfortunately it seems that there is no direct way to detect (in tests)
-  // if a url_fetcher has been freed or not, since they are not automatically
-  // de-registered from the TestURLFetcherFactory on destruction.
-}
-
-void SpeechRecognitionEngineTest::InjectDummyAudioChunk() {
-  // Enough data so that the encoder will output something, as can't read 0
-  // bytes from a Mojo stream.
-  unsigned char dummy_audio_buffer_data[2000 * 2] = {'\0'};
-  scoped_refptr<AudioChunk> dummy_audio_chunk(
-      new AudioChunk(&dummy_audio_buffer_data[0],
-                     sizeof(dummy_audio_buffer_data),
-                     2 /* bytes per sample */));
-  DCHECK(engine_under_test_.get());
-  engine_under_test_->TakeAudioChunk(*dummy_audio_chunk.get());
-}
-
-void SpeechRecognitionEngineTest::ProvideMockResponseStartDownstreamIfNeeded() {
-  if (downstream_data_pipe_.get())
-    return;
-  const network::TestURLLoaderFactory::PendingRequest* downstream_request =
-      GetDownstreamRequest();
-  ASSERT_TRUE(downstream_request);
-
-  auto head = network::mojom::URLResponseHead::New();
-  std::string headers("HTTP/1.1 200 OK\n\n");
-  head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(
-      net::HttpUtil::AssembleRawHeaders(headers));
-
-  mojo::ScopedDataPipeProducerHandle producer_handle;
-  mojo::ScopedDataPipeConsumerHandle consumer_handle;
-  ASSERT_EQ(mojo::CreateDataPipe(nullptr, producer_handle, consumer_handle),
-            MOJO_RESULT_OK);
-
-  downstream_request->client->OnReceiveResponse(
-      std::move(head), std::move(consumer_handle), std::nullopt);
-  downstream_data_pipe_ = std::move(producer_handle);
-}
-
-void SpeechRecognitionEngineTest::ProvideMockProtoResultDownstream(
-    const proto::SpeechRecognitionEvent& result) {
-  ProvideMockResponseStartDownstreamIfNeeded();
-  ASSERT_TRUE(downstream_data_pipe_.get());
-  ASSERT_TRUE(downstream_data_pipe_.is_valid());
-
-  std::string response_string = SerializeProtobufResponse(result);
-  response_buffer_.append(response_string);
-  uint32_t written = 0;
-  while (written < response_string.size()) {
-    uint32_t write_bytes = response_string.size() - written;
-    MojoResult mojo_result = downstream_data_pipe_->WriteData(
-        response_string.data() + written, &write_bytes,
-        MOJO_WRITE_DATA_FLAG_NONE);
-    if (mojo_result == MOJO_RESULT_OK) {
-      written += write_bytes;
-      continue;
-    }
-    if (mojo_result == MOJO_RESULT_SHOULD_WAIT) {
-      base::RunLoop().RunUntilIdle();
-      continue;
-    }
-
-    FAIL() << "Mojo pipe unexpectedly closed";
-  }
-  base::RunLoop().RunUntilIdle();
-}
-
-void SpeechRecognitionEngineTest::ProvideMockResultDownstream(
-    const blink::mojom::SpeechRecognitionResultPtr& result) {
-  proto::SpeechRecognitionEvent proto_event;
-  proto_event.set_status(proto::SpeechRecognitionEvent::STATUS_SUCCESS);
-  proto::SpeechRecognitionResult* proto_result = proto_event.add_result();
-  proto_result->set_final(!result->is_provisional);
-  for (size_t i = 0; i < result->hypotheses.size(); ++i) {
-    proto::SpeechRecognitionAlternative* proto_alternative =
-        proto_result->add_alternative();
-    const blink::mojom::SpeechRecognitionHypothesisPtr& hypothesis =
-        result->hypotheses[i];
-    proto_alternative->set_confidence(hypothesis->confidence);
-    proto_alternative->set_transcript(base::UTF16ToUTF8(hypothesis->utterance));
-  }
-  ProvideMockProtoResultDownstream(proto_event);
-  base::RunLoop().RunUntilIdle();
-}
-
-void SpeechRecognitionEngineTest::CloseMockDownstream(
-    DownstreamError error) {
-  if (error == DOWNSTREAM_ERROR_HTTP500) {
-    // Can't provide a network error if already gave the consumer a 200
-    // response.
-    ASSERT_FALSE(downstream_data_pipe_.get());
-
-    const network::TestURLLoaderFactory::PendingRequest* downstream_request =
-        GetDownstreamRequest();
-    ASSERT_TRUE(downstream_request);
-    auto head = network::mojom::URLResponseHead::New();
-    std::string headers("HTTP/1.1 500 Server Sad\n\n");
-    head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(
-        net::HttpUtil::AssembleRawHeaders(headers));
-    downstream_request->client->OnReceiveResponse(
-        std::move(head), mojo::ScopedDataPipeConsumerHandle(), std::nullopt);
-    // Wait for the response to be handled.
-    base::RunLoop().RunUntilIdle();
-    return;
-  }
-
-  ProvideMockResponseStartDownstreamIfNeeded();
-  const network::TestURLLoaderFactory::PendingRequest* downstream_request =
-      GetDownstreamRequest();
-  ASSERT_TRUE(downstream_request);
-
-  network::URLLoaderCompletionStatus status;
-  status.decoded_body_length = response_buffer_.size();
-  status.error_code =
-      (error == DOWNSTREAM_ERROR_NETWORK) ? net::ERR_FAILED : net::OK;
-  downstream_request->client->OnComplete(status);
-  downstream_data_pipe_.reset();
-  // Wait for the completion events to be handled.
-  base::RunLoop().RunUntilIdle();
-}
-
-void SpeechRecognitionEngineTest::ExpectResultsReceived(
-    const std::vector<blink::mojom::SpeechRecognitionResultPtr>& results) {
-  ASSERT_GE(1U, results_.size());
-  ASSERT_TRUE(ResultsAreEqual(results, results_.front()));
-  results_.pop();
-}
-
-bool SpeechRecognitionEngineTest::ResultsAreEqual(
-    const std::vector<blink::mojom::SpeechRecognitionResultPtr>& a,
-    const std::vector<blink::mojom::SpeechRecognitionResultPtr>& b) {
-  if (a.size() != b.size())
-    return false;
-
-  auto it_a = a.begin();
-  auto it_b = b.begin();
-  for (; it_a != a.end() && it_b != b.end(); ++it_a, ++it_b) {
-    if ((*it_a)->is_provisional != (*it_b)->is_provisional ||
-        (*it_a)->hypotheses.size() != (*it_b)->hypotheses.size()) {
-      return false;
-    }
-    for (size_t i = 0; i < (*it_a)->hypotheses.size(); ++i) {
-      const blink::mojom::SpeechRecognitionHypothesisPtr& hyp_a =
-          (*it_a)->hypotheses[i];
-      const blink::mojom::SpeechRecognitionHypothesisPtr& hyp_b =
-          (*it_b)->hypotheses[i];
-      if (hyp_a->utterance != hyp_b->utterance ||
-          hyp_a->confidence != hyp_b->confidence) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-void SpeechRecognitionEngineTest::ExpectFramedChunk(
-    const std::string& chunk, uint32_t type) {
-  uint32_t value = base::numerics::U32FromBigEndian(
-      base::as_byte_span(chunk).subspan<0u, 4u>());
-  EXPECT_EQ(chunk.size() - 8, value);
-  value = base::numerics::U32FromBigEndian(
-      base::as_byte_span(chunk).subspan<4u, 4u>());
-  EXPECT_EQ(type, value);
-}
-
-std::string SpeechRecognitionEngineTest::ConsumeChunkedUploadData() {
-  std::string result;
-  base::RunLoop().RunUntilIdle();
-
-  if (!upstream_data_pipe_.get()) {
-    if (!chunked_data_pipe_getter_) {
-      const network::TestURLLoaderFactory::PendingRequest* upstream_request =
-          GetUpstreamRequest();
-      EXPECT_TRUE(upstream_request);
-      EXPECT_TRUE(upstream_request->request.request_body);
-      EXPECT_EQ(1u, upstream_request->request.request_body->elements()->size());
-      auto& element =
-          (*upstream_request->request.request_body->elements_mutable())[0];
-      if (element.type() != network::DataElement::Tag::kChunkedDataPipe) {
-        ADD_FAILURE() << "element type mismatch";
-        return "";
-      }
-      chunked_data_pipe_getter_.Bind(
-          element.As<network::DataElementChunkedDataPipe>()
-              .ReleaseChunkedDataPipeGetter());
-    }
-    mojo::ScopedDataPipeProducerHandle producer_handle;
-    mojo::ScopedDataPipeConsumerHandle consumer_handle;
-    EXPECT_EQ(mojo::CreateDataPipe(nullptr, producer_handle, consumer_handle),
-              MOJO_RESULT_OK);
-    chunked_data_pipe_getter_->StartReading(std::move(producer_handle));
-    upstream_data_pipe_ = std::move(consumer_handle);
-  }
-  EXPECT_TRUE(upstream_data_pipe_.is_valid());
-
-  std::string out;
-  while (true) {
-    base::RunLoop().RunUntilIdle();
-
-    const void* data;
-    uint32_t num_bytes;
-    MojoResult mojo_result = upstream_data_pipe_->BeginReadData(
-        &data, &num_bytes, MOJO_READ_DATA_FLAG_NONE);
-    if (mojo_result == MOJO_RESULT_OK) {
-      out.append(static_cast<const char*>(data), num_bytes);
-      upstream_data_pipe_->EndReadData(num_bytes);
-      continue;
-    }
-    if (mojo_result == MOJO_RESULT_SHOULD_WAIT)
-      break;
-
-    ADD_FAILURE() << "Mojo pipe unexpectedly closed";
-    break;
-  }
-  return out;
-}
-
-std::string SpeechRecognitionEngineTest::SerializeProtobufResponse(
-    const proto::SpeechRecognitionEvent& msg) {
-  std::string msg_string;
-  msg.SerializeToString(&msg_string);
-
-  // Prepend 4 byte prefix length indication to the protobuf message as
-  // envisaged by the google streaming recognition webservice protocol.
-  uint32_t prefix = HostToNet32(checked_cast<uint32_t>(msg_string.size()));
-  msg_string.insert(0, reinterpret_cast<char*>(&prefix), sizeof(prefix));
-
-  return msg_string;
-}
-
-}  // namespace content
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
index 96fb5823..afa429b 100644
--- a/content/browser/speech/speech_recognition_manager_impl.cc
+++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -19,7 +19,7 @@
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
-#include "content/browser/speech/speech_recognition_engine.h"
+#include "content/browser/speech/network_speech_recognition_engine_impl.h"
 #include "content/browser/speech/speech_recognizer_impl.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -180,14 +180,14 @@
   session->context = config.initial_context;
 
 #if !BUILDFLAG(IS_ANDROID)
-  // A SpeechRecognitionEngine (and corresponding Config) is required only
-  // when using SpeechRecognizerImpl, which performs the audio capture and
+  // A NetworkSpeechRecognitionEngineImpl (and corresponding Config) is required
+  // only when using SpeechRecognizerImpl, which performs the audio capture and
   // endpointing in the browser. This is not the case of Android where, not
   // only the speech recognition, but also the audio capture and endpointing
   // activities performed outside of the browser (delegated via JNI to the
   // Android API implementation).
 
-  SpeechRecognitionEngine::Config remote_engine_config;
+  NetworkSpeechRecognitionEngineImpl::Config remote_engine_config;
   remote_engine_config.language = config.language;
   remote_engine_config.grammars = config.grammars;
   remote_engine_config.audio_sample_rate =
@@ -203,13 +203,14 @@
   remote_engine_config.auth_scope = config.auth_scope;
   remote_engine_config.preamble = config.preamble;
 
-  SpeechRecognitionEngine* google_remote_engine = new SpeechRecognitionEngine(
-      config.shared_url_loader_factory, config.accept_language);
+  std::unique_ptr<NetworkSpeechRecognitionEngineImpl> google_remote_engine =
+      std::make_unique<NetworkSpeechRecognitionEngineImpl>(
+          config.shared_url_loader_factory, config.accept_language);
   google_remote_engine->SetConfig(remote_engine_config);
 
   session->recognizer = new SpeechRecognizerImpl(
       this, audio_system_, session_id, config.continuous,
-      config.interim_results, google_remote_engine);
+      config.interim_results, std::move(google_remote_engine));
 #else
   session->recognizer = new SpeechRecognizerImplAndroid(this, session_id);
 #endif
diff --git a/content/browser/speech/speech_recognition_manager_impl.h b/content/browser/speech/speech_recognition_manager_impl.h
index 9f26103..9653e84 100644
--- a/content/browser/speech/speech_recognition_manager_impl.h
+++ b/content/browser/speech/speech_recognition_manager_impl.h
@@ -43,8 +43,8 @@
 // The SpeechRecognitionManager has the following responsibilities:
 //  - Handles requests received from various render frames and makes sure only
 //    one of them accesses the audio device at any given time.
-//  - Handles the instantiation of SpeechRecognitionEngine objects when
-//    requested by SpeechRecognitionSessions.
+//  - Handles the instantiation of NetworkSpeechRecognitionEngineImpl objects
+//    when requested by SpeechRecognitionSessions.
 //  - Relays recognition results/status/error events of each session to the
 //    corresponding listener (demuxing on the base of their session_id).
 //  - Relays also recognition results/status/error events of every session to
diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc
index f58aa95..3fd07172 100644
--- a/content/browser/speech/speech_recognizer_impl.cc
+++ b/content/browser/speech/speech_recognizer_impl.cc
@@ -183,10 +183,10 @@
     int session_id,
     bool continuous,
     bool provisional_results,
-    SpeechRecognitionEngine* engine)
+    std::unique_ptr<SpeechRecognitionEngine> engine)
     : SpeechRecognizer(listener, session_id),
       audio_system_(audio_system),
-      recognition_engine_(engine),
+      recognition_engine_(std::move(engine)),
       endpointer_(kAudioSampleRate),
       is_dispatching_event_(false),
       provisional_results_(provisional_results),
@@ -631,6 +631,7 @@
   // and WebSpeech specific output format.
   audio_converter_ =
       std::make_unique<OnDataConverter>(input_parameters, output_parameters);
+  recognition_engine_->SetAudioParameters(output_parameters);
 
   // The endpointer needs to estimate the environment/background noise before
   // starting to treat the audio as user input. We wait in the state
diff --git a/content/browser/speech/speech_recognizer_impl.h b/content/browser/speech/speech_recognizer_impl.h
index af9f8617..b0f89e7 100644
--- a/content/browser/speech/speech_recognizer_impl.h
+++ b/content/browser/speech/speech_recognizer_impl.h
@@ -52,7 +52,7 @@
                        int session_id,
                        bool continuous,
                        bool provisional_results,
-                       SpeechRecognitionEngine* engine);
+                       std::unique_ptr<SpeechRecognitionEngine> engine);
 
   SpeechRecognizerImpl(const SpeechRecognizerImpl&) = delete;
   SpeechRecognizerImpl& operator=(const SpeechRecognizerImpl&) = delete;
diff --git a/content/browser/speech/speech_recognizer_impl_unittest.cc b/content/browser/speech/speech_recognizer_impl_unittest.cc
index 28f87d96..47b2d38 100644
--- a/content/browser/speech/speech_recognizer_impl_unittest.cc
+++ b/content/browser/speech/speech_recognizer_impl_unittest.cc
@@ -16,7 +16,7 @@
 #include "base/sys_byteorder.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/threading/thread.h"
-#include "content/browser/speech/speech_recognition_engine.h"
+#include "content/browser/speech/network_speech_recognition_engine_impl.h"
 #include "content/browser/speech/speech_recognizer_impl.h"
 #include "content/public/browser/google_streaming_api.pb.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
@@ -89,11 +89,12 @@
         /*disabled_features=*/{features::kAudioServiceOutOfProcess});
 
     // SpeechRecognizer takes ownership of sr_engine.
-    SpeechRecognitionEngine* sr_engine = new SpeechRecognitionEngine(
-        base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
-            &url_loader_factory_),
-        "" /* accept_language */);
-    SpeechRecognitionEngine::Config config;
+    std::unique_ptr<NetworkSpeechRecognitionEngineImpl> sr_engine =
+        std::make_unique<NetworkSpeechRecognitionEngineImpl>(
+            base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
+                &url_loader_factory_),
+            "" /* accept_language */);
+    NetworkSpeechRecognitionEngineImpl::Config config;
     config.audio_num_bits_per_sample =
         SpeechRecognizerImpl::kNumBitsPerAudioSample;
     config.audio_sample_rate = SpeechRecognizerImpl::kAudioSampleRate;
@@ -110,14 +111,16 @@
         std::make_unique<media::AudioSystemImpl>(audio_manager_.get());
     SpeechRecognizerImpl::SetAudioEnvironmentForTesting(
         audio_system_.get(), audio_capturer_source_.get());
-    recognizer_ = new SpeechRecognizerImpl(
-        this, audio_system_.get(), kTestingSessionId, false, false, sr_engine);
+    recognizer_ =
+        new SpeechRecognizerImpl(this, audio_system_.get(), kTestingSessionId,
+                                 false, false, std::move(sr_engine));
 
     int audio_packet_length_bytes =
         (SpeechRecognizerImpl::kAudioSampleRate *
-         SpeechRecognitionEngine::kAudioPacketIntervalMs *
+         NetworkSpeechRecognitionEngineImpl::kAudioPacketIntervalMs *
          ChannelLayoutToChannelCount(SpeechRecognizerImpl::kChannelLayout) *
-         SpeechRecognizerImpl::kNumBitsPerAudioSample) / (8 * 1000);
+         SpeechRecognizerImpl::kNumBitsPerAudioSample) /
+        (8 * 1000);
     audio_packet_.resize(audio_packet_length_bytes);
 
     const int channels =
@@ -648,8 +651,10 @@
   WaitForAudioThreadToPostDeviceInfo();
   base::RunLoop().RunUntilIdle();  // EVENT_START processing.
 
-  int num_packets = (SpeechRecognizerImpl::kNoSpeechTimeoutMs) /
-                     SpeechRecognitionEngine::kAudioPacketIntervalMs + 1;
+  int num_packets =
+      (SpeechRecognizerImpl::kNoSpeechTimeoutMs) /
+          NetworkSpeechRecognitionEngineImpl::kAudioPacketIntervalMs +
+      1;
   // The vector is already filled with zero value samples on create.
   for (int i = 0; i < num_packets; ++i) {
     Capture(audio_bus_.get());
@@ -674,7 +679,7 @@
   base::RunLoop().RunUntilIdle();  // EVENT_START processing.
 
   int num_packets = (SpeechRecognizerImpl::kNoSpeechTimeoutMs) /
-                     SpeechRecognitionEngine::kAudioPacketIntervalMs;
+                    NetworkSpeechRecognitionEngineImpl::kAudioPacketIntervalMs;
 
   // The vector is already filled with zero value samples on create.
   for (int i = 0; i < num_packets / 2; ++i) {
@@ -709,7 +714,7 @@
 
   // Feed some samples to begin with for the endpointer to do noise estimation.
   int num_packets = SpeechRecognizerImpl::kEndpointerEstimationTimeMs /
-                    SpeechRecognitionEngine::kAudioPacketIntervalMs;
+                    NetworkSpeechRecognitionEngineImpl::kAudioPacketIntervalMs;
   FillPacketWithNoise();
   for (int i = 0; i < num_packets; ++i) {
     Capture(audio_bus_.get());
diff --git a/content/common/service_worker/race_network_request_write_buffer_manager.cc b/content/common/service_worker/race_network_request_write_buffer_manager.cc
index 20255a4..2378d39 100644
--- a/content/common/service_worker/race_network_request_write_buffer_manager.cc
+++ b/content/common/service_worker/race_network_request_write_buffer_manager.cc
@@ -129,12 +129,6 @@
 
   SCOPED_CRASH_KEY_NUMBER("SWRace", "physical_memory_mb",
                           base::SysInfo::AmountOfPhysicalMemoryMB());
-  SCOPED_CRASH_KEY_NUMBER("SWRace", "available_physical_memory_mb",
-                          base::SysInfo::AmountOfAvailablePhysicalMemory());
-  SCOPED_CRASH_KEY_NUMBER("SWRace", "is_lowend_device",
-                          base::SysInfo::IsLowEndDevice());
-  SCOPED_CRASH_KEY_NUMBER("SWRace", "data_pipe_buffer_size",
-                          data_pipe_buffer_size_);
   SCOPED_CRASH_KEY_NUMBER("SWRace", "num_bytes_to_consume",
                           num_bytes_to_consume);
 
@@ -150,11 +144,6 @@
   for (size_t i = 0; i < read_buffer.size(); ++i) {
     read_buffer_v[i];
   }
-  volatile const char* write_buffer_v =
-      static_cast<volatile char*>(buffer_.data());
-  for (size_t i = 0; i < buffer_size(); ++i) {
-    write_buffer_v[i];
-  }
   memcpy(buffer_.data(), read_buffer.data(), num_bytes_to_consume);
   MojoResult result = EndWriteData(num_bytes_to_consume);
   CHECK_EQ(result, MOJO_RESULT_OK);
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index c976396..4cf1462 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -3308,7 +3308,7 @@
       "../browser/picture_in_picture/document_picture_in_picture_navigation_throttle_unittest.cc",
       "../browser/serial/serial_unittest.cc",
       "../browser/speech/endpointer/endpointer_unittest.cc",
-      "../browser/speech/speech_recognition_engine_unittest.cc",
+      "../browser/speech/network_speech_recognition_engine_impl_unittest.cc",
       "../browser/speech/speech_recognizer_impl_unittest.cc",
       "../browser/tracing/tracing_ui_unittest.cc",
     ]
diff --git a/crypto/user_verifying_key.cc b/crypto/user_verifying_key.cc
index 02cec3d..74b66d6 100644
--- a/crypto/user_verifying_key.cc
+++ b/crypto/user_verifying_key.cc
@@ -12,6 +12,15 @@
 UserVerifyingSigningKey::~UserVerifyingSigningKey() = default;
 UserVerifyingKeyProvider::~UserVerifyingKeyProvider() = default;
 
+RefCountedUserVerifyingSigningKey::RefCountedUserVerifyingSigningKey(
+    std::unique_ptr<crypto::UserVerifyingSigningKey> key)
+    : key_(std::move(key)) {
+  CHECK(key_);
+}
+
+RefCountedUserVerifyingSigningKey::~RefCountedUserVerifyingSigningKey() =
+    default;
+
 #if BUILDFLAG(IS_WIN)
 std::unique_ptr<UserVerifyingKeyProvider> GetUserVerifyingKeyProviderWin();
 #endif
diff --git a/crypto/user_verifying_key.h b/crypto/user_verifying_key.h
index 29688fbbf..bcb39a9a 100644
--- a/crypto/user_verifying_key.h
+++ b/crypto/user_verifying_key.h
@@ -12,6 +12,7 @@
 
 #include "base/containers/span.h"
 #include "base/functional/callback.h"
+#include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
 #include "crypto/signature_verifier.h"
@@ -53,6 +54,27 @@
   virtual const UserVerifyingKeyLabel& GetKeyLabel() const = 0;
 };
 
+// Reference-counted wrapper for UserVeriyingSigningKey.
+class CRYPTO_EXPORT RefCountedUserVerifyingSigningKey
+    : public base::RefCountedThreadSafe<RefCountedUserVerifyingSigningKey> {
+ public:
+  explicit RefCountedUserVerifyingSigningKey(
+      std::unique_ptr<crypto::UserVerifyingSigningKey> key);
+
+  RefCountedUserVerifyingSigningKey(const RefCountedUserVerifyingSigningKey&) =
+      delete;
+  RefCountedUserVerifyingSigningKey& operator=(
+      const RefCountedUserVerifyingSigningKey&) = delete;
+
+  crypto::UserVerifyingSigningKey& key() const { return *key_; }
+
+ private:
+  friend class base::RefCountedThreadSafe<RefCountedUserVerifyingSigningKey>;
+  ~RefCountedUserVerifyingSigningKey();
+
+  const std::unique_ptr<crypto::UserVerifyingSigningKey> key_;
+};
+
 // UserVerifyingKeyProvider creates |UserVerifyingSigningKey|s.
 // Only one call to |GenerateUserVerifyingSigningKey| or
 // |GetUserVerifyingSigningKey| can be outstanding at one time for a single
diff --git a/infra/config/generated/builders/gn_args_locations.json b/infra/config/generated/builders/gn_args_locations.json
index aa4d166..ab6303c 100644
--- a/infra/config/generated/builders/gn_args_locations.json
+++ b/infra/config/generated/builders/gn_args_locations.json
@@ -536,6 +536,8 @@
     "mac13-blink-rel": "try/mac13-blink-rel/gn-args.json",
     "mac13.arm64-blink-rel": "try/mac13.arm64-blink-rel/gn-args.json",
     "mac13.arm64-skia-alt-blink-rel": "try/mac13.arm64-skia-alt-blink-rel/gn-args.json",
+    "mac14-blink-rel": "try/mac14-blink-rel/gn-args.json",
+    "mac14.arm64-blink-rel": "try/mac14.arm64-blink-rel/gn-args.json",
     "win10.20h2-blink-rel": "try/win10.20h2-blink-rel/gn-args.json",
     "win11-arm64-blink-rel": "try/win11-arm64-blink-rel/gn-args.json",
     "win11-blink-rel": "try/win11-blink-rel/gn-args.json"
diff --git a/infra/config/generated/builders/try/mac14-blink-rel/gn-args.json b/infra/config/generated/builders/try/mac14-blink-rel/gn-args.json
new file mode 100644
index 0000000..e1a1b3b
--- /dev/null
+++ b/infra/config/generated/builders/try/mac14-blink-rel/gn-args.json
@@ -0,0 +1,11 @@
+{
+  "gn_args": {
+    "dcheck_always_on": false,
+    "ffmpeg_branding": "Chrome",
+    "is_component_build": false,
+    "is_debug": false,
+    "proprietary_codecs": true,
+    "symbol_level": 1,
+    "use_remoteexec": true
+  }
+}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/mac14-blink-rel/properties.json b/infra/config/generated/builders/try/mac14-blink-rel/properties.json
new file mode 100644
index 0000000..6337c7c
--- /dev/null
+++ b/infra/config/generated/builders/try/mac14-blink-rel/properties.json
@@ -0,0 +1,59 @@
+{
+  "$build/chromium_tests_builder_config": {
+    "builder_config": {
+      "additional_exclusions": [
+        "infra/config/generated/builders/try/mac14-blink-rel/gn-args.json"
+      ],
+      "builder_db": {
+        "entries": [
+          {
+            "builder_id": {
+              "bucket": "try",
+              "builder": "mac14-blink-rel",
+              "project": "chromium"
+            },
+            "builder_spec": {
+              "builder_group": "tryserver.blink",
+              "execution_mode": "COMPILE_AND_TEST",
+              "legacy_chromium_config": {
+                "apply_configs": [
+                  "mb"
+                ],
+                "build_config": "Release",
+                "config": "chromium",
+                "target_bits": 64,
+                "target_platform": "mac"
+              },
+              "legacy_gclient_config": {
+                "config": "chromium"
+              }
+            }
+          }
+        ]
+      },
+      "builder_ids": [
+        {
+          "bucket": "try",
+          "builder": "mac14-blink-rel",
+          "project": "chromium"
+        }
+      ],
+      "retry_failed_shards": false
+    }
+  },
+  "$build/reclient": {
+    "instance": "rbe-chromium-untrusted",
+    "jobs": 150,
+    "metrics_project": "chromium-reclient-metrics",
+    "scandeps_server": true
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "tryserver.blink",
+  "recipe": "chromium_trybot"
+}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/mac14.arm64-blink-rel/gn-args.json b/infra/config/generated/builders/try/mac14.arm64-blink-rel/gn-args.json
new file mode 100644
index 0000000..73da9ed
--- /dev/null
+++ b/infra/config/generated/builders/try/mac14.arm64-blink-rel/gn-args.json
@@ -0,0 +1,12 @@
+{
+  "gn_args": {
+    "dcheck_always_on": false,
+    "ffmpeg_branding": "Chrome",
+    "is_component_build": false,
+    "is_debug": false,
+    "proprietary_codecs": true,
+    "symbol_level": 1,
+    "target_cpu": "arm64",
+    "use_remoteexec": true
+  }
+}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/mac14.arm64-blink-rel/properties.json b/infra/config/generated/builders/try/mac14.arm64-blink-rel/properties.json
new file mode 100644
index 0000000..0ccf4f1
--- /dev/null
+++ b/infra/config/generated/builders/try/mac14.arm64-blink-rel/properties.json
@@ -0,0 +1,59 @@
+{
+  "$build/chromium_tests_builder_config": {
+    "builder_config": {
+      "additional_exclusions": [
+        "infra/config/generated/builders/try/mac14.arm64-blink-rel/gn-args.json"
+      ],
+      "builder_db": {
+        "entries": [
+          {
+            "builder_id": {
+              "bucket": "try",
+              "builder": "mac14.arm64-blink-rel",
+              "project": "chromium"
+            },
+            "builder_spec": {
+              "builder_group": "tryserver.blink",
+              "execution_mode": "COMPILE_AND_TEST",
+              "legacy_chromium_config": {
+                "apply_configs": [
+                  "mb"
+                ],
+                "build_config": "Release",
+                "config": "chromium",
+                "target_bits": 64,
+                "target_platform": "mac"
+              },
+              "legacy_gclient_config": {
+                "config": "chromium"
+              }
+            }
+          }
+        ]
+      },
+      "builder_ids": [
+        {
+          "bucket": "try",
+          "builder": "mac14.arm64-blink-rel",
+          "project": "chromium"
+        }
+      ],
+      "retry_failed_shards": true
+    }
+  },
+  "$build/reclient": {
+    "instance": "rbe-chromium-untrusted",
+    "jobs": 150,
+    "metrics_project": "chromium-reclient-metrics",
+    "scandeps_server": true
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "tryserver.blink",
+  "recipe": "chromium_trybot"
+}
\ No newline at end of file
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
index b2dae0bf..cc964dc 100644
--- a/infra/config/generated/luci/commit-queue.cfg
+++ b/infra/config/generated/luci/commit-queue.cfg
@@ -4534,6 +4534,14 @@
         includable_only: true
       }
       builders {
+        name: "chromium/try/mac14-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac14.arm64-blink-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/mac_chromium_10.15_rel_ng"
         includable_only: true
       }
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 4dfd9d31..b71219f 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -97967,6 +97967,196 @@
       }
     }
     builders {
+      name: "mac14-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-13"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      exe {
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
+      }
+      properties:
+        '{'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/try/mac14-blink-rel/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/heads/main",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "tryserver.blink",'
+        '  "led_builder_is_bootstrapped": true,'
+        '  "recipe": "chromium_trybot"'
+        '}'
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      grace_period {
+        seconds: 120
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium_swarming.expose_merge_script_failures"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "swarming.prpc.cli"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "    Runs web tests against content-shell on Mac 14 (Intel).    "
+      contact_team_email: "chrome-blink-engprod@google.com"
+    }
+    builders {
+      name: "mac14.arm64-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-13"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      exe {
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
+      }
+      properties:
+        '{'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/try/mac14.arm64-blink-rel/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/heads/main",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "tryserver.blink",'
+        '  "led_builder_is_bootstrapped": true,'
+        '  "recipe": "chromium_trybot"'
+        '}'
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      grace_period {
+        seconds: 120
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium_swarming.expose_merge_script_failures"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "swarming.prpc.cli"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "    Runs web tests against content-shell on Mac 14 (ARM).    "
+      contact_team_email: "chrome-blink-engprod@google.com"
+    }
+    builders {
       name: "mac_chromium_10.15_rel_ng"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index b70b7cb..54f904a 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -18421,6 +18421,12 @@
     name: "buildbucket/luci.chromium.try/mac13.arm64-skia-alt-blink-rel"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/mac14-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac14.arm64-blink-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.15_rel_ng"
   }
   builders {
@@ -18705,6 +18711,12 @@
     name: "buildbucket/luci.chromium.try/mac13.arm64-skia-alt-blink-rel"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/mac14-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac14.arm64-blink-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/win10.20h2-blink-rel"
   }
   builders {
diff --git a/infra/config/generated/testing/mixins.pyl b/infra/config/generated/testing/mixins.pyl
index f40e6c10..5c1b91b 100644
--- a/infra/config/generated/testing/mixins.pyl
+++ b/infra/config/generated/testing/mixins.pyl
@@ -782,6 +782,14 @@
       },
     },
   },
+  'mac_14_x64': {
+    'swarming': {
+      'dimensions': {
+        'cpu': 'x86-64',
+        'os': 'Mac-14',
+      },
+    },
+  },
   'mac_arm64_apple_m1_gpu_experimental': {
     'swarming': {
       'dimensions': {
diff --git a/infra/config/generated/testing/variants.pyl b/infra/config/generated/testing/variants.pyl
index 7e07b6c..ac7dc153 100644
--- a/infra/config/generated/testing/variants.pyl
+++ b/infra/config/generated/testing/variants.pyl
@@ -291,16 +291,16 @@
   },
   'LACROS_VERSION_SKEW_BETA': {
     'identifier': 'Lacros version skew testing ash beta',
-    'description': 'Run with ash-chrome version 122.0.6261.84',
+    'description': 'Run with ash-chrome version 122.0.6261.98',
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome',
     ],
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
-          'location': 'lacros_version_skew_tests_v122.0.6261.84',
-          'revision': 'version:122.0.6261.84',
+          'location': 'lacros_version_skew_tests_v122.0.6261.98',
+          'revision': 'version:122.0.6261.98',
         },
       ],
     },
diff --git a/infra/config/subprojects/chromium/try/tryserver.blink.star b/infra/config/subprojects/chromium/try/tryserver.blink.star
index 631041b..f9b9b1ca 100644
--- a/infra/config/subprojects/chromium/try/tryserver.blink.star
+++ b/infra/config/subprojects/chromium/try/tryserver.blink.star
@@ -427,3 +427,70 @@
         ],
     ),
 )
+
+blink_mac_builder(
+    name = "mac14-blink-rel",
+    description_html = """\
+    Runs web tests against content-shell on Mac 14 (Intel).\
+    """,
+    builder_spec = builder_config.builder_spec(
+        gclient_config = builder_config.gclient_config(
+            config = "chromium",
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "chromium",
+            apply_configs = [
+                "mb",
+            ],
+            build_config = builder_config.build_config.RELEASE,
+            target_bits = 64,
+            target_platform = builder_config.target_platform.MAC,
+        ),
+    ),
+    builder_config_settings = builder_config.try_settings(
+        retry_failed_shards = False,
+    ),
+    gn_args = gn_args.config(
+        configs = [
+            "release_builder",
+            "reclient",
+            "chrome_with_codecs",
+            "minimal_symbols",
+        ],
+    ),
+    contact_team_email = "chrome-blink-engprod@google.com",
+)
+
+blink_mac_builder(
+    name = "mac14.arm64-blink-rel",
+    description_html = """\
+    Runs web tests against content-shell on Mac 14 (ARM).\
+    """,
+    builder_spec = builder_config.builder_spec(
+        gclient_config = builder_config.gclient_config(
+            config = "chromium",
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "chromium",
+            apply_configs = [
+                "mb",
+            ],
+            build_config = builder_config.build_config.RELEASE,
+            target_bits = 64,
+            target_platform = builder_config.target_platform.MAC,
+        ),
+    ),
+    builder_config_settings = builder_config.try_settings(
+        retry_failed_shards = True,
+    ),
+    gn_args = gn_args.config(
+        configs = [
+            "release_builder",
+            "reclient",
+            "chrome_with_codecs",
+            "arm64",
+            "minimal_symbols",
+        ],
+    ),
+    contact_team_email = "chrome-blink-engprod@google.com",
+)
diff --git a/infra/config/targets/lacros-version-skew-variants.json b/infra/config/targets/lacros-version-skew-variants.json
index 9443570..0b3c1fb 100644
--- a/infra/config/targets/lacros-version-skew-variants.json
+++ b/infra/config/targets/lacros-version-skew-variants.json
@@ -33,16 +33,16 @@
   },
   "LACROS_VERSION_SKEW_BETA": {
     "args": [
-      "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+      "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
     ],
-    "description": "Run with ash-chrome version 122.0.6261.84",
+    "description": "Run with ash-chrome version 122.0.6261.98",
     "identifier": "Lacros version skew testing ash beta",
     "swarming": {
       "cipd_packages": [
         {
           "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-          "location": "lacros_version_skew_tests_v122.0.6261.84",
-          "revision": "version:122.0.6261.84"
+          "location": "lacros_version_skew_tests_v122.0.6261.98",
+          "revision": "version:122.0.6261.98"
         }
       ]
     }
diff --git a/infra/config/targets/mixins.star b/infra/config/targets/mixins.star
index d45c72e6..239bc2b2 100644
--- a/infra/config/targets/mixins.star
+++ b/infra/config/targets/mixins.star
@@ -1002,6 +1002,16 @@
 )
 
 targets.mixin(
+    name = "mac_14_x64",
+    swarming = targets.swarming(
+        dimensions = {
+            "cpu": "x86-64",
+            "os": "Mac-14",
+        },
+    ),
+)
+
+targets.mixin(
     name = "mac_arm64_apple_m1_gpu_experimental",
     swarming = targets.swarming(
         dimensions = {
diff --git a/infra/inclusive_language_presubmit_exempt_dirs.txt b/infra/inclusive_language_presubmit_exempt_dirs.txt
index e2b3851..466eb9a 100644
--- a/infra/inclusive_language_presubmit_exempt_dirs.txt
+++ b/infra/inclusive_language_presubmit_exempt_dirs.txt
@@ -204,7 +204,7 @@
 extensions/shell/common 1 1
 google_apis/gaia 1 1
 gpu/config 1 1
-infra 4 2
+infra 5 3
 infra/config/generated/luci 1 1
 infra/config/gn_args 1 1
 infra/config/subprojects/webrtc/consoles 1 1
@@ -370,7 +370,6 @@
 third_party/blink/public/mojom/printing 1 1
 third_party/blink/public/mojom/service_worker 4 3
 third_party/blink/public/mojom/storage_key 1 1
-third_party/blink/public/web 1 1
 third_party/blink/renderer/bindings 4 1
 third_party/blink/renderer/bindings/core/v8 1 1
 third_party/blink/renderer/core 1 1
diff --git a/media/gpu/v4l2/v4l2_stateful_video_decoder.cc b/media/gpu/v4l2/v4l2_stateful_video_decoder.cc
index 328dd85..a00f741 100644
--- a/media/gpu/v4l2/v4l2_stateful_video_decoder.cc
+++ b/media/gpu/v4l2/v4l2_stateful_video_decoder.cc
@@ -52,7 +52,7 @@
 // POLLPRI (meaning a resolution change event) and from |device_fd|, this
 // function calls |dequeue_callback| or |resolution_change_callback|,
 // respectively. Since it blocks, it needs to work on its own
-// SequencedTaskRunner, in this case |event_task_runner_|.
+// SingleThreadTaskRunner, in this case |event_task_runner_|.
 // TODO(mcasas): Add an error callback too.
 void WaitOnceForEvents(int device_fd,
                        int wake_event,
@@ -477,8 +477,12 @@
 
   if (!event_task_runner_) {
     CHECK(!CAPTURE_queue_);  // It's the first configuration event.
-    event_task_runner_ = base::ThreadPool::CreateSequencedTaskRunner(
-        {base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
+    // |event_task_runner_| will block on OS resources, so it has to be a full
+    // ThreadRunner ISO a SequencedTaskRunner, to avoid interfering with other
+    // runners of the pool.
+    event_task_runner_ = base::ThreadPool::CreateSingleThreadTaskRunner(
+        {base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
+        base::SingleThreadTaskRunnerThreadMode::DEDICATED);
     CHECK(event_task_runner_);
   }
   RearmCAPTUREQueueMonitoring();
@@ -831,7 +835,7 @@
   //   thread that is blocked on a poll() upon the closing of an FD from a
   //   different thread, concretely the "result is unspecified").
   // - Both |device_fd_| and |wake_event_| are posted for destruction on said
-  //   background SequencedTaskRunner so that the FDs monitored by poll() are
+  //   background SingleThreadTaskRunner so that the FDs monitored by poll() are
   //   guaranteed to stay alive until poll() returns, thus avoiding unspecified
   //   behavior.
   cancelable_task_tracker_.PostTask(
diff --git a/media/gpu/v4l2/v4l2_stateful_video_decoder.h b/media/gpu/v4l2/v4l2_stateful_video_decoder.h
index 5667c6f2..4f42d7d 100644
--- a/media/gpu/v4l2/v4l2_stateful_video_decoder.h
+++ b/media/gpu/v4l2/v4l2_stateful_video_decoder.h
@@ -19,7 +19,7 @@
 
 namespace base {
 class Location;
-class SequencedTaskRunner;
+class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace media {
@@ -166,7 +166,7 @@
 
   // A sequenced TaskRunner to wait for events coming from |CAPTURE_queue_| or
   // |wake_event_|.
-  scoped_refptr<base::SequencedTaskRunner> event_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> event_task_runner_;
   // Used to (try to) cancel the Tasks sent by RearmCAPTUREQueueMonitoring(),
   // and not serviced yet, when no longer needed.
   base::CancelableTaskTracker cancelable_task_tracker_
diff --git a/net/socket/udp_socket_win.h b/net/socket/udp_socket_win.h
index 4e05a72..b4008db 100644
--- a/net/socket/udp_socket_win.h
+++ b/net/socket/udp_socket_win.h
@@ -10,7 +10,7 @@
 #include <winsock2.h>
 
 // Must be after winsock2.h:
-#include <mswsock.h>
+#include <MSWSock.h>
 
 #include <atomic>
 #include <memory>
diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc
index 821bdd64..c2eb732d 100644
--- a/services/network/cors/cors_url_loader.cc
+++ b/services/network/cors/cors_url_loader.cc
@@ -350,6 +350,8 @@
       context_(context),
       shared_dictionary_storage_(std::move(shared_dictionary_storage)),
       shared_dictionary_observer_(shared_dictionary_observer) {
+  TRACE_EVENT("loading", "CorsURLLoader::CorsURLLoader",
+              perfetto::Flow::ProcessScoped(net_log_.source().id));
   CHECK(url_loader_network_service_observer_ != nullptr);
   if (ignore_isolated_world_origin)
     request_.isolated_world_origin = std::nullopt;
@@ -392,12 +394,16 @@
 }
 
 CorsURLLoader::~CorsURLLoader() {
+  TRACE_EVENT("loading", "CorsURLLoader::~CorsURLLoader",
+              perfetto::Flow::ProcessScoped(net_log_.source().id));
   // Reset pipes first to ignore possible subsequent callback invocations
   // caused by `network_loader_`
   network_client_receiver_.reset();
 }
 
 void CorsURLLoader::Start() {
+  TRACE_EVENT("loading", "CorsURLLoader::Start",
+              perfetto::Flow::ProcessScoped(net_log_.source().id));
   if (fetch_cors_flag_ && IsCorsEnabledRequestMode(request_.mode)) {
     // Username and password should be stripped in a CORS-enabled request.
     if (request_.url.has_username() || request_.url.has_password()) {
@@ -819,6 +825,8 @@
 }
 
 void CorsURLLoader::StartRequest() {
+  TRACE_EVENT("loading", "CorsURLLoader::StartRequest",
+              perfetto::Flow::ProcessScoped(net_log_.source().id));
   // All results should be reported to `forwarding_client_` as part of a
   // `URLResponseHead`, then `pna_preflight_result_` reset to `kNone`.
   CHECK_EQ(pna_preflight_result_,
@@ -1060,6 +1068,8 @@
 }
 
 void CorsURLLoader::StartNetworkRequest() {
+  TRACE_EVENT("loading", "CorsURLLoader::StartNetworkRequest",
+              perfetto::Flow::ProcessScoped(net_log_.source().id));
   // Here we overwrite the credentials mode sent to URLLoader because
   // network::URLLoader doesn't understand |kSameOrigin|.
   // TODO(crbug.com/943939): Fix this.
diff --git a/services/network/cors/cors_url_loader_factory.cc b/services/network/cors/cors_url_loader_factory.cc
index d606a2a..535eb069 100644
--- a/services/network/cors/cors_url_loader_factory.cc
+++ b/services/network/cors/cors_url_loader_factory.cc
@@ -10,6 +10,7 @@
 #include "base/functional/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_functions.h"
+#include "base/trace_event/typed_macros.h"
 #include "base/types/optional_util.h"
 #include "mojo/public/cpp/bindings/message.h"
 #include "mojo/public/cpp/bindings/remote.h"
@@ -233,6 +234,8 @@
           params->require_cross_site_request_for_cookies),
       origin_access_list_(origin_access_list),
       resource_block_list_(resource_block_list) {
+  TRACE_EVENT("loading", "CorsURLLoaderFactory::CorsURLLoaderFactory",
+              perfetto::Flow::FromPointer(this));
   DCHECK(context_);
   DCHECK(origin_access_list_);
   DCHECK_NE(mojom::kInvalidProcessId, process_id_);
@@ -337,6 +340,8 @@
     const ResourceRequest& resource_request,
     mojo::PendingRemote<mojom::URLLoaderClient> client,
     const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
+  TRACE_EVENT("loading", "CorsURLLoaderFactory::CreateLoaderAndStart",
+              perfetto::Flow::FromPointer(this));
 #if BUILDFLAG(IS_ANDROID)
   // Use pseudo flag to investigate histogram issue.
   // See https://crbug.com/1439721.
@@ -779,6 +784,7 @@
 mojo::PendingRemote<mojom::DevToolsObserver>
 CorsURLLoaderFactory::GetDevToolsObserver(
     const ResourceRequest& resource_request) const {
+  TRACE_EVENT("loading", "CorsURLLoaderFactory::GetDevToolsObserver");
   mojo::PendingRemote<mojom::DevToolsObserver> devtools_observer;
   if (resource_request.trusted_params &&
       resource_request.trusted_params->devtools_observer) {
diff --git a/services/network/public/cpp/resource_request.cc b/services/network/public/cpp/resource_request.cc
index 435ded68..5c9cb572 100644
--- a/services/network/public/cpp/resource_request.cc
+++ b/services/network/public/cpp/resource_request.cc
@@ -5,6 +5,7 @@
 #include "services/network/public/cpp/resource_request.h"
 
 #include "base/strings/string_number_conversions.h"
+#include "base/trace_event/typed_macros.h"
 #include "base/types/optional_util.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "net/base/load_flags.h"
@@ -241,7 +242,10 @@
 #else
 ResourceRequest::ResourceRequest() = default;
 #endif
-ResourceRequest::ResourceRequest(const ResourceRequest& request) = default;
+ResourceRequest::ResourceRequest(const ResourceRequest& request) {
+  TRACE_EVENT("loading", "ResourceRequest::ResourceRequest.copy_constructor");
+  *this = request;
+}
 ResourceRequest::~ResourceRequest() = default;
 
 bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
diff --git a/services/network/shared_dictionary/shared_dictionary_manager.cc b/services/network/shared_dictionary/shared_dictionary_manager.cc
index 0d2b4cc..6f2330c 100644
--- a/services/network/shared_dictionary/shared_dictionary_manager.cc
+++ b/services/network/shared_dictionary/shared_dictionary_manager.cc
@@ -5,6 +5,7 @@
 #include "services/network/shared_dictionary/shared_dictionary_manager.h"
 
 #include "base/location.h"
+#include "base/trace_event/typed_macros.h"
 #include "services/network/shared_dictionary/shared_dictionary_manager_in_memory.h"
 #include "services/network/shared_dictionary/shared_dictionary_manager_on_disk.h"
 #include "services/network/shared_dictionary/shared_dictionary_storage.h"
@@ -56,6 +57,7 @@
 
 scoped_refptr<SharedDictionaryStorage> SharedDictionaryManager::GetStorage(
     const net::SharedDictionaryIsolationKey& isolation_key) {
+  TRACE_EVENT("loading", "SharedDictionaryManager::GetStorage");
   auto cached_storages_it = cached_storages_.Get(isolation_key);
   if (cached_storages_it != cached_storages_.end()) {
     return cached_storages_it->second;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 0f7cb42..184c5e1 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -583,8 +583,6 @@
           request.request_body->AllowHTTP1ForStreamingUpload()),
       accept_ch_frame_observer_(std::move(accept_ch_frame_observer)),
       provide_data_use_updates_(context.DataUseUpdatesEnabled()) {
-  TRACE_EVENT("loading", "URLLoader::URLLoader",
-              perfetto::Flow::FromPointer(this));
   DCHECK(delete_callback_);
 
   mojom::TrustedURLLoaderHeaderClient* url_loader_header_client =
@@ -613,6 +611,10 @@
       GURL(request.url), request.priority, this, traffic_annotation,
       /*is_for_websockets=*/false, request.net_log_create_info);
 
+  TRACE_EVENT(
+      "loading", "URLLoader::URLLoader",
+      perfetto::Flow::ProcessScoped(url_request_->net_log().source().id));
+
   url_request_->set_method(request.method);
   url_request_->set_site_for_cookies(request.site_for_cookies);
   if (ShouldForceIgnoreSiteForCookies(request))
@@ -1084,6 +1086,9 @@
 }
 
 void URLLoader::ScheduleStart() {
+  TRACE_EVENT(
+      "loading", "URLLoader::ScheduleStart",
+      perfetto::Flow::ProcessScoped(url_request_->net_log().source().id));
   bool defer = false;
   if (resource_scheduler_client_) {
     resource_scheduler_request_handle_ =
@@ -1100,8 +1105,9 @@
 }
 
 URLLoader::~URLLoader() {
-  TRACE_EVENT("loading", "URLLoader::~URLLoader",
-              perfetto::TerminatingFlow::FromPointer(this));
+  TRACE_EVENT(
+      "loading", "URLLoader::~URLLoader",
+      perfetto::Flow::ProcessScoped(url_request_->net_log().source().id));
   if (keepalive_ && keepalive_statistics_recorder_) {
     keepalive_statistics_recorder_->OnLoadFinished(
         *factory_params_->top_frame_id, keepalive_request_size_);
@@ -2304,8 +2310,10 @@
 }
 
 void URLLoader::SendResponseToClient() {
-  TRACE_EVENT("loading", "network::URLLoader::SendResponseToClient",
-              perfetto::Flow::FromPointer(this), "url", url_request_->url());
+  TRACE_EVENT(
+      "loading", "network::URLLoader::SendResponseToClient",
+      perfetto::Flow::ProcessScoped(url_request_->net_log().source().id), "url",
+      url_request_->url());
   DCHECK_EQ(emitted_devtools_raw_request_, emitted_devtools_raw_response_);
   response_->emitted_extra_info = emitted_devtools_raw_request_;
 
diff --git a/skia/ext/legacy_display_globals.cc b/skia/ext/legacy_display_globals.cc
index d6e81211..02873f9 100644
--- a/skia/ext/legacy_display_globals.cc
+++ b/skia/ext/legacy_display_globals.cc
@@ -4,15 +4,27 @@
 
 #include "skia/ext/legacy_display_globals.h"
 
+#include "base/no_destructor.h"
+#include "base/synchronization/lock.h"
+
 namespace skia {
 
 namespace {
 SkPixelGeometry g_pixel_geometry = kRGB_H_SkPixelGeometry;
+
+// Lock to prevent data races between setting and getting values. It is
+// not ideal to have mismatched `SkSurfaceProps` between threads, but it
+// is not catastrophic.
+base::Lock& GetLock() {
+  static base::NoDestructor<base::Lock> lock;
+  return *lock;
+}
 }
 
 // static
 void LegacyDisplayGlobals::SetCachedPixelGeometry(
     SkPixelGeometry pixel_geometry) {
+  base::AutoLock lock(GetLock());
   g_pixel_geometry = pixel_geometry;
 }
 
@@ -23,6 +35,7 @@
 
 // static
 SkSurfaceProps LegacyDisplayGlobals::GetSkSurfaceProps(uint32_t flags) {
+  base::AutoLock lock(GetLock());
   return SkSurfaceProps{flags, g_pixel_geometry};
 }
 
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index ade205f..dd83db8 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -5347,9 +5347,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -5359,8 +5359,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
@@ -5503,9 +5503,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter;../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -5515,8 +5515,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
diff --git a/testing/buildbot/chromium.coverage.json b/testing/buildbot/chromium.coverage.json
index 8428f7e..1cb8702 100644
--- a/testing/buildbot/chromium.coverage.json
+++ b/testing/buildbot/chromium.coverage.json
@@ -20284,9 +20284,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -20296,8 +20296,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
@@ -20434,9 +20434,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter;../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -20446,8 +20446,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index f34c9ca..be1c5e4b 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -39952,9 +39952,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -39963,8 +39963,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
@@ -40102,9 +40102,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter;../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -40113,8 +40113,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
@@ -41450,9 +41450,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -41462,8 +41462,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
@@ -41606,9 +41606,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter;../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -41618,8 +41618,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
@@ -42932,9 +42932,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -42943,8 +42943,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
@@ -43082,9 +43082,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter;../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -43093,8 +43093,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index dabdf8b..b6b67a60 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -16310,12 +16310,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -16325,8 +16325,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
@@ -16486,12 +16486,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter;../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 122.0.6261.84",
+        "description": "Run with ash-chrome version 122.0.6261.98",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -16501,8 +16501,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v122.0.6261.84",
-              "revision": "version:122.0.6261.84"
+              "location": "lacros_version_skew_tests_v122.0.6261.98",
+              "revision": "version:122.0.6261.98"
             }
           ],
           "dimensions": {
diff --git a/testing/buildbot/mixins.pyl b/testing/buildbot/mixins.pyl
index f40e6c10..5c1b91b 100644
--- a/testing/buildbot/mixins.pyl
+++ b/testing/buildbot/mixins.pyl
@@ -782,6 +782,14 @@
       },
     },
   },
+  'mac_14_x64': {
+    'swarming': {
+      'dimensions': {
+        'cpu': 'x86-64',
+        'os': 'Mac-14',
+      },
+    },
+  },
   'mac_arm64_apple_m1_gpu_experimental': {
     'swarming': {
       'dimensions': {
diff --git a/testing/buildbot/tryserver.blink.json b/testing/buildbot/tryserver.blink.json
index a305d13..81aa7d82 100644
--- a/testing/buildbot/tryserver.blink.json
+++ b/testing/buildbot/tryserver.blink.json
@@ -726,6 +726,126 @@
       }
     ]
   },
+  "mac14-blink-rel": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "--num-retries=3",
+          "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json"
+        ],
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "blink_web_tests",
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-14"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 5
+        },
+        "test": "blink_web_tests",
+        "test_id_prefix": "ninja://:blink_web_tests/"
+      },
+      {
+        "args": [
+          "--num-retries=3",
+          "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json"
+        ],
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "blink_wpt_tests",
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Mac-14"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 7
+        },
+        "test": "blink_wpt_tests",
+        "test_id_prefix": "ninja://:blink_wpt_tests/"
+      }
+    ]
+  },
+  "mac14.arm64-blink-rel": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "--num-retries=3",
+          "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json"
+        ],
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "blink_web_tests",
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "dimensions": {
+            "cpu": "arm64",
+            "os": "Mac-14"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 5
+        },
+        "test": "blink_web_tests",
+        "test_id_prefix": "ninja://:blink_web_tests/"
+      },
+      {
+        "args": [
+          "--num-retries=3",
+          "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json"
+        ],
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "blink_wpt_tests",
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "dimensions": {
+            "cpu": "arm64",
+            "os": "Mac-14"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 7
+        },
+        "test": "blink_wpt_tests",
+        "test_id_prefix": "ninja://:blink_wpt_tests/"
+      }
+    ]
+  },
   "win10.20h2-blink-rel": {
     "isolated_scripts": [
       {
diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index 7e07b6c..ac7dc153 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -291,16 +291,16 @@
   },
   'LACROS_VERSION_SKEW_BETA': {
     'identifier': 'Lacros version skew testing ash beta',
-    'description': 'Run with ash-chrome version 122.0.6261.84',
+    'description': 'Run with ash-chrome version 122.0.6261.98',
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.84/test_ash_chrome',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v122.0.6261.98/test_ash_chrome',
     ],
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
-          'location': 'lacros_version_skew_tests_v122.0.6261.84',
-          'revision': 'version:122.0.6261.84',
+          'location': 'lacros_version_skew_tests_v122.0.6261.98',
+          'revision': 'version:122.0.6261.98',
         },
       ],
     },
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 6ab1ef8..f17bf29 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -6832,6 +6832,22 @@
           'isolated_scripts': 'chromium_web_tests_graphite_isolated_scripts',
         },
       },
+      'mac14-blink-rel': {
+        'mixins': [
+          'mac_14_x64',
+        ],
+        'test_suites': {
+          'isolated_scripts': 'chromium_webkit_isolated_scripts',
+        },
+      },
+      'mac14.arm64-blink-rel': {
+        'mixins': [
+          'mac_14_arm64',
+        ],
+        'test_suites': {
+          'isolated_scripts': 'chromium_webkit_isolated_scripts',
+        },
+      },
       'win10.20h2-blink-rel': {
         'mixins': [
             'win10',
diff --git a/testing/scripts/check_static_initializers.py b/testing/scripts/check_static_initializers.py
index 75cd7d8..4e6e1e3 100755
--- a/testing/scripts/check_static_initializers.py
+++ b/testing/scripts/check_static_initializers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2018 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -69,24 +69,16 @@
   return 'buildername' in args.properties and \
       'chromeos' in args.properties['buildername']
 
-def get_mod_init_count(executable, hermetic_xcode_path):
-  # Find the __DATA,__mod_init_func section.
+def get_mod_init_count(src_dir, executable, hermetic_xcode_path):
+  show_mod_init_func = os.path.join(src_dir, 'tools', 'mac',
+      'show_mod_init_func.py')
+  args = [show_mod_init_func]
+  args.append(executable)
   if os.path.exists(hermetic_xcode_path):
-    otool_path = os.path.join(hermetic_xcode_path, 'Contents', 'Developer',
-        'Toolchains', 'XcodeDefault.xctoolchain', 'usr', 'bin', 'otool')
-  else:
-    otool_path = 'otool'
-
-  stdout = run_process([otool_path, '-l', executable])
-  section_index = stdout.find('sectname __mod_init_func')
-  if section_index == -1:
-    return 0
-
-  # If the section exists, the "size" line must follow it.
-  initializers_s = re.search('size 0x([0-9a-f]+)',
-                             stdout[section_index:]).group(1)
-  word_size = 8  # Assume 64 bit
-  return int(initializers_s, 16) / word_size
+    args.extend(['--xcode-path', hermetic_xcode_path])
+  stdout = run_process(args)
+  si_count = len(stdout.splitlines()) - 1  # -1 for executable name
+  return (stdout, si_count)
 
 def run_process(command):
   p = subprocess.Popen(command, stdout=subprocess.PIPE, universal_newlines=True)
@@ -103,24 +95,14 @@
     app_bundle = base_name + '.app'
     chromium_executable = os.path.join(app_bundle, base_name)
     if os.path.exists(chromium_executable):
-      si_count = get_mod_init_count(chromium_executable,
-                                    hermetic_xcode_path)
-      if si_count > 0:
-        allowed_si_count = FALLBACK_EXPECTED_IOS_SI_COUNT
-        if si_count > allowed_si_count:
-          print('Expected <= %d static initializers in %s, but found %d' %
-              (allowed_si_count, chromium_executable,
-              si_count))
-          ret = 1
-          show_mod_init_func = os.path.join(src_dir, 'tools', 'mac',
-                                            'show_mod_init_func.py')
-          args = [show_mod_init_func]
-          args.append(chromium_executable)
-
-          if os.path.exists(hermetic_xcode_path):
-            args.extend(['--xcode-path', hermetic_xcode_path])
-          stdout = run_process(args)
-          print(stdout)
+      stdout, si_count = get_mod_init_count(src_dir, chromium_executable,
+                                            hermetic_xcode_path)
+      expected_si_count = FALLBACK_EXPECTED_IOS_SI_COUNT
+      if si_count != expected_si_count:
+        print('Expected %d static initializers in %s, but found %d' %
+            (expected_si_count, chromium_executable, si_count))
+        print(stdout)
+        ret = 1
   return ret
 
 
@@ -131,59 +113,24 @@
     app_bundle = base_name + '.app'
     framework_name = base_name + ' Framework'
     framework_bundle = framework_name + '.framework'
-    framework_dsym_bundle = framework_bundle + '.dSYM'
-    framework_unstripped_name = framework_name + '.unstripped'
     chromium_executable = os.path.join(app_bundle, 'Contents', 'MacOS',
                                        base_name)
     chromium_framework_executable = os.path.join(framework_bundle,
                                                  framework_name)
-    chromium_framework_dsym = os.path.join(framework_dsym_bundle, 'Contents',
-                                           'Resources', 'DWARF', framework_name)
     if os.path.exists(chromium_executable):
-      # Count the number of files with at least one static initializer.
-      si_count = get_mod_init_count(chromium_framework_executable,
-                                    hermetic_xcode_path)
-
-      # Print the list of static initializers.
-      if si_count > 0:
-        # First look for a dSYM to get information about the initializers. If
-        # one is not present, check if there is an unstripped copy of the build
-        # output.
-        mac_tools_path = os.path.join(src_dir, 'tools', 'mac')
-        if os.path.exists(chromium_framework_dsym):
-          dump_static_initializers = os.path.join(
-              mac_tools_path, 'dump-static-initializers.py')
-          stdout = run_process(
-              [dump_static_initializers, chromium_framework_dsym])
-          for line in stdout:
-            if re.match('0x[0-9a-f]+', line) and not any(
-                re.match(f, line) for f in _MAC_SI_FILE_ALLOWLIST):
-              ret = 1
-              print('Found invalid static initializer: {}'.format(line))
-          print(stdout)
-        else:
-          allowed_si_count = FALLBACK_EXPECTED_MAC_SI_COUNT
-          if allow_coverage_initializer:
-            allowed_si_count = COVERAGE_BUILD_FALLBACK_EXPECTED_MAC_SI_COUNT
-          if si_count > allowed_si_count:
-            print('Expected <= %d static initializers in %s, but found %d' %
-                (allowed_si_count, chromium_framework_executable,
-                si_count))
-            ret = 1
-            show_mod_init_func = os.path.join(mac_tools_path,
-                                              'show_mod_init_func.py')
-            args = [show_mod_init_func]
-            if os.path.exists(framework_unstripped_name):
-              args.append(framework_unstripped_name)
-            else:
-              print('# Warning: Falling back to potentially stripped output.')
-              args.append(chromium_framework_executable)
-
-            if os.path.exists(hermetic_xcode_path):
-              args.extend(['--xcode-path', hermetic_xcode_path])
-
-            stdout = run_process(args)
-            print(stdout)
+      # Count the number static initializers.
+      stdout, si_count = get_mod_init_count(src_dir,
+                                            chromium_framework_executable,
+                                            hermetic_xcode_path)
+      min_si_count = allowed_si_count = FALLBACK_EXPECTED_MAC_SI_COUNT
+      if allow_coverage_initializer:
+        allowed_si_count = COVERAGE_BUILD_FALLBACK_EXPECTED_MAC_SI_COUNT
+      if si_count > allowed_si_count or si_count < min_si_count:
+        print('Expected %d static initializers in %s, but found %d' %
+              (allowed_si_count, chromium_framework_executable,
+              si_count))
+        print(stdout)
+        ret = 1
   return ret
 
 
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index 2542189..f0e2d00 100644
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -7288,33 +7288,6 @@
             ]
         }
     ],
-    "FenderLcpInfluencerScriptsPriority": [
-        {
-            "platforms": [
-                "android",
-                "chromeos",
-                "chromeos_lacros",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "VeryHighPriorityForScriptAndLcpImage_20240215",
-                    "params": {
-                        "lcpscriptobserver_adjust_image_load_priority": "true",
-                        "lcpscriptobserver_image_load_priority": "very_high",
-                        "lcpscriptobserver_script_load_priority": "very_high",
-                        "lcpscriptobserver_script_max_url_count_per_origin": "5",
-                        "lcpscriptobserver_script_max_url_length": "1024"
-                    },
-                    "enable_features": [
-                        "LCPScriptObserver"
-                    ]
-                }
-            ]
-        }
-    ],
     "FenderScriptScheduling": [
         {
             "platforms": [
diff --git a/third_party/angle b/third_party/angle
index 434a5b0..a971e5b4 160000
--- a/third_party/angle
+++ b/third_party/angle
@@ -1 +1 @@
-Subproject commit 434a5b01707deca484b50a2a16c55f466b3d4a2b
+Subproject commit a971e5b42e1e8e61ccb0d8e4b3f2245aaa4f2d4d
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
index 79adf45..c4abecb 100644
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -1285,6 +1285,10 @@
 const base::FeatureParam<bool> kLCPScriptObserverAdjustImageLoadPriority{
     &kLCPScriptObserver, "lcpscriptobserver_adjust_image_load_priority", false};
 
+BASE_FEATURE(kLCPTimingPredictorPrerender2,
+             "LCPTimingPredictorPrerender2",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
 BASE_FEATURE(kLCPPAutoPreconnectLcpOrigin,
              "LCPPAutoPreconnectLcpOrigin",
              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/third_party/blink/common/loader/lcp_critical_path_predictor_util.cc b/third_party/blink/common/loader/lcp_critical_path_predictor_util.cc
index 14ed75c..ea99d9a 100644
--- a/third_party/blink/common/loader/lcp_critical_path_predictor_util.cc
+++ b/third_party/blink/common/loader/lcp_critical_path_predictor_util.cc
@@ -21,7 +21,9 @@
          base::FeatureList::IsEnabled(
              blink::features::kHttpDiskCachePrewarming) ||
          base::FeatureList::IsEnabled(
-             blink::features::kLCPPAutoPreconnectLcpOrigin);
+             blink::features::kLCPPAutoPreconnectLcpOrigin) ||
+         base::FeatureList::IsEnabled(
+             blink::features::kLCPTimingPredictorPrerender2);
 }
 
 bool LcppScriptObserverEnabled() {
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
index 563f7a83..be0bff2d 100644
--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -742,6 +742,10 @@
 BLINK_COMMON_EXPORT extern const base::FeatureParam<bool>
     kLCPScriptObserverAdjustImageLoadPriority;
 
+// If enabled, Prerender2 by Speculation Rules API is delayed until
+// LCP is finished.
+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kLCPTimingPredictorPrerender2);
+
 // If enabled, LCP image origin is predicted and preconnected automatically.
 BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kLCPPAutoPreconnectLcpOrigin);
 
diff --git a/third_party/blink/public/mojom/speculation_rules/speculation_rules.mojom b/third_party/blink/public/mojom/speculation_rules/speculation_rules.mojom
index 3a79998..eeb9a27 100644
--- a/third_party/blink/public/mojom/speculation_rules/speculation_rules.mojom
+++ b/third_party/blink/public/mojom/speculation_rules/speculation_rules.mojom
@@ -22,6 +22,8 @@
   // Pushes a new set of speculation candidates, which replaces any previously
   // sent.
   UpdateSpeculationCandidates(array<SpeculationCandidate> candidates);
+  // Called when LCP is predicted.
+  OnLCPPredicted();
   // Enables matching prefetches according to No-Vary-Search response headers.
   EnableNoVarySearchSupport();
   // Initiates previewing the given `url`.
diff --git a/third_party/blink/renderer/core/editing/commands/apply_block_element_command.cc b/third_party/blink/renderer/core/editing/commands/apply_block_element_command.cc
index 20e47e95..38d1617 100644
--- a/third_party/blink/renderer/core/editing/commands/apply_block_element_command.cc
+++ b/third_party/blink/renderer/core/editing/commands/apply_block_element_command.cc
@@ -318,17 +318,13 @@
     if (end_style->ShouldPreserveBreaks() && start == end &&
         end.OffsetInContainerNode() <
             static_cast<int>(To<Text>(end.ComputeContainerNode())->length())) {
-      if (!RuntimeEnabledFeatures::
-              NoIncreasingEndOffsetOnSplittingTextNodesEnabled()) {
-        int end_offset = end.OffsetInContainerNode();
-        // TODO(yosin) We should use |PositionMoveType::CodePoint| for
-        // |previousPositionOf()|.
-        if (!IsNewLineAtPosition(
-                PreviousPositionOf(end, PositionMoveType::kCodeUnit)) &&
-            IsNewLineAtPosition(end)) {
-          end = Position(end.ComputeContainerNode(), end_offset + 1);
-        }
-      }
+      int end_offset = end.OffsetInContainerNode();
+      // TODO(yosin) We should use |PositionMoveType::CodePoint| for
+      // |previousPositionOf()|.
+      if (!IsNewLineAtPosition(
+              PreviousPositionOf(end, PositionMoveType::kCodeUnit)) &&
+          IsNewLineAtPosition(end))
+        end = Position(end.ComputeContainerNode(), end_offset + 1);
       if (is_end_and_end_of_last_paragraph_on_same_node &&
           end.OffsetInContainerNode() >=
               end_of_last_paragraph.OffsetInContainerNode())
diff --git a/third_party/blink/renderer/core/fetch/fetch_manager.cc b/third_party/blink/renderer/core/fetch/fetch_manager.cc
index 92a4462..0b7203e5 100644
--- a/third_party/blink/renderer/core/fetch/fetch_manager.cc
+++ b/third_party/blink/renderer/core/fetch/fetch_manager.cc
@@ -721,7 +721,8 @@
     // https://fetch.spec.whatwg.org/#fetching
     // The user agent should ignore the suspension request if the ongoing
     // fetch is updating the response in the HTTP cache for the request.
-    place_holder_body_->Update(BufferingBytesConsumer::CreateWithDelay(&body));
+    place_holder_body_->Update(BufferingBytesConsumer::CreateWithDelay(
+        &body, GetExecutionContext()->GetTaskRunner(TaskType::kNetworking)));
   } else {
     place_holder_body_->Update(&body);
   }
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index fecf450..4f33aff 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -402,15 +402,6 @@
 
   bool is_local_root = IsLocalRoot();
 
-  if (LcppScriptObserverEnabled()) {
-    // Force attach LCPP during Frame creation to avoid missing script
-    // executions from being observed. This is a temporary fix until
-    // script observer probe can be refactored out and be directly attached to
-    // the frame. More info at:
-    // https://crrev.com/c/chromium/src/+/5294177/comment/2c12a4bd_eedc9810/
-    std::ignore = GetLCPP();
-  }
-
   if (is_local_root && View())
     View()->SetParentVisible(false);
 
diff --git a/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc b/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc
index bd64caaf..9af2ec2 100644
--- a/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc
+++ b/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc
@@ -596,6 +596,11 @@
                       .set_image(std::move(skia_image),
                                  paint_image.GetContentIdForFrame(0u))
                       .TakePaintImage();
+
+    // Update source alpha states after redecoding.
+    parsed_options.source_is_unpremul =
+        paint_image.GetAlphaType() == kUnpremul_SkAlphaType;
+
   } else if (paint_image.IsLazyGenerated()) {
     // Other Image types can still produce lazy generated images (for example
     // SVGs).
diff --git a/third_party/blink/renderer/core/imagebitmap/image_bitmap_test.cc b/third_party/blink/renderer/core/imagebitmap/image_bitmap_test.cc
index 543ad2a0..fdfe240a 100644
--- a/third_party/blink/renderer/core/imagebitmap/image_bitmap_test.cc
+++ b/third_party/blink/renderer/core/imagebitmap/image_bitmap_test.cc
@@ -341,4 +341,67 @@
   DCHECK(image_bitmap);
 }
 
+TEST_F(ImageBitmapTest, ImageAlphaState) {
+  auto dummy = std::make_unique<DummyPageHolder>(gfx::Size(800, 600));
+  auto* image_element =
+      MakeGarbageCollected<HTMLImageElement>(dummy->GetDocument());
+
+  // Load a 2x2 png file which has pixels (255, 102, 153, 0). It is a fully
+  // transparent image.
+  ResourceRequest resource_request(
+      "data:image/"
+      "png;base64,"
+      "iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEUlEQVR42mP8nzaTAQQYYQwA"
+      "LssD/5ca+r8AAAAASUVORK5CYII=");
+
+  FetchParameters params =
+      FetchParameters::CreateForTest(std::move(resource_request));
+
+  ImageResourceContent* resource_content =
+      ImageResourceContent::Fetch(params, dummy->GetDocument().Fetcher());
+
+  image_element->SetImageForTest(resource_content);
+
+  ImageBitmapOptions* options = ImageBitmapOptions::Create();
+  // ImageBitmap created from unpremul source image result.
+  options->setPremultiplyAlpha("none");
+
+  // Additional operation shouldn't affect alpha op.
+  options->setImageOrientation("flipY");
+
+  std::optional<gfx::Rect> crop_rect =
+      gfx::Rect(0, 0, image_element->width(), image_element->height());
+  auto* image_bitmap =
+      MakeGarbageCollected<ImageBitmap>(image_element, crop_rect, options);
+  ASSERT_TRUE(image_bitmap);
+
+  // Read 1 pixel
+  sk_sp<SkImage> result =
+      image_bitmap->BitmapImage()->PaintImageForCurrentFrame().GetSwSkImage();
+  SkPixmap pixmap;
+  ASSERT_TRUE(result->peekPixels(&pixmap));
+  const uint32_t* pixels = pixmap.addr32();
+
+  SkColorType result_color_type = result->colorType();
+  SkColor expected = SkColorSetARGB(0, 0, 0, 0);
+
+  switch (result_color_type) {
+    case SkColorType::kRGBA_8888_SkColorType:
+      // Set ABGR value as reverse of RGBA
+      expected =
+          SkColorSetARGB(/* a */ 0, /* b */ 153, /* g */ 102, /* r */ 255);
+      break;
+    case SkColorType::kBGRA_8888_SkColorType:
+      // Set ARGB value as reverse of BGRA
+      expected =
+          SkColorSetARGB(/* a */ 0, /* r */ 255, /* g */ 102, /* b */ 153);
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+
+  ASSERT_EQ(pixels[0], expected);
+}
+
 }  // namespace blink
diff --git a/third_party/blink/renderer/core/paint/object_paint_properties.h b/third_party/blink/renderer/core/paint/object_paint_properties.h
index 3e4cb18..448dba9 100644
--- a/third_party/blink/renderer/core/paint/object_paint_properties.h
+++ b/third_party/blink/renderer/core/paint/object_paint_properties.h
@@ -400,6 +400,19 @@
         << "Isolation nodes have to be created for all of transform, clip, and "
            "effect trees.";
   }
+
+  void AddTransformNodesToPrinter(PropertyTreePrinter& printer) const {
+    AddNodesToPrinter(NodeId::kFirstTransform, NodeId::kLastTransform, printer);
+  }
+  void AddClipNodesToPrinter(PropertyTreePrinter& printer) const {
+    AddNodesToPrinter(NodeId::kFirstClip, NodeId::kLastClip, printer);
+  }
+  void AddEffectNodesToPrinter(PropertyTreePrinter& printer) const {
+    AddNodesToPrinter(NodeId::kFirstEffect, NodeId::kLastEffect, printer);
+  }
+  void AddScrollNodesToPrinter(PropertyTreePrinter& printer) const {
+    AddNodesToPrinter(NodeId::kFirstScroll, NodeId::kLastScroll, printer);
+  }
 #endif
 
   // Direct update method implementations.
@@ -426,18 +439,7 @@
   }
 
  private:
-  // We have to use a variant to keep track of which subtype of node is
-  // instantiated, since the base PaintPropertyNode class is templated and
-  // thus doesn't have a reasonable base class for us to use.
-  using NodeVariant =
-      std::variant<scoped_refptr<TransformPaintPropertyNode>,
-                   scoped_refptr<EffectPaintPropertyNode>,
-                   scoped_refptr<ClipPaintPropertyNode>,
-                   scoped_refptr<TransformPaintPropertyNodeAlias>,
-                   scoped_refptr<EffectPaintPropertyNodeAlias>,
-                   scoped_refptr<ClipPaintPropertyNodeAlias>,
-                   scoped_refptr<ScrollPaintPropertyNode>>;
-  using NodeList = SparseVector<NodeId, NodeVariant>;
+  using NodeList = SparseVector<NodeId, scoped_refptr<PaintPropertyNode>>;
 
   template <typename NodeType, typename ParentType>
   PaintPropertyChangeType Update(
@@ -491,9 +493,7 @@
   template <typename NodeType>
   const NodeType* GetNode(NodeId node_id) const {
     if (nodes_.HasField(node_id)) {
-      const NodeVariant& field = nodes_.GetField(node_id);
-      CHECK(std::holds_alternative<scoped_refptr<NodeType>>(field));
-      return std::get<scoped_refptr<NodeType>>(field).get();
+      return static_cast<const NodeType*>(nodes_.GetField(node_id).get());
     }
     return nullptr;
   }
@@ -515,6 +515,19 @@
     return false;
   }
 
+#if DCHECK_IS_ON()
+  void AddNodesToPrinter(NodeId first_id,
+                         NodeId last_id,
+                         PropertyTreePrinter& printer) const {
+    for (NodeId i = first_id; i <= last_id;
+         i = static_cast<NodeId>(static_cast<int>(i) + 1)) {
+      if (nodes_.HasField(i)) {
+        printer.AddNode(nodes_.GetField(i).get());
+      }
+    }
+  }
+#endif
+
   NodeList nodes_;
 
 #if DCHECK_IS_ON()
diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_printer.cc b/third_party/blink/renderer/core/paint/paint_property_tree_printer.cc
index 6495d06..a91ef647 100644
--- a/third_party/blink/renderer/core/paint/paint_property_tree_printer.cc
+++ b/third_party/blink/renderer/core/paint/paint_property_tree_printer.cc
@@ -4,6 +4,9 @@
 
 #include "third_party/blink/renderer/core/paint/paint_property_tree_printer.h"
 
+#include <iomanip>
+#include <sstream>
+
 #include "third_party/blink/renderer/core/editing/frame_selection.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/core/frame/local_frame_view.h"
@@ -17,31 +20,38 @@
 #include "third_party/blink/renderer/core/view_transition/view_transition.h"
 #include "third_party/blink/renderer/core/view_transition/view_transition_utils.h"
 
-#include <iomanip>
-#include <sstream>
-
 #if DCHECK_IS_ON()
 
 namespace blink {
 namespace {
 
-template <typename PropertyTreeNode>
-class PropertyTreePrinterTraits;
-
-template <typename PropertyTreeNode>
-class FrameViewPropertyTreePrinter
-    : public PropertyTreePrinter<PropertyTreeNode> {
+class NodeCollector {
  public:
+  virtual ~NodeCollector() = default;
+
+  virtual void AddVisualViewportProperties(const VisualViewport&,
+                                           PropertyTreePrinter&) const {}
+  virtual void AddOtherProperties(const LocalFrameView&,
+                                  PropertyTreePrinter&) const {}
+  virtual void AddViewTransitionProperties(const LayoutObject&,
+                                           PropertyTreePrinter&) const {}
+  virtual void AddObjectPaintProperties(const ObjectPaintProperties&,
+                                        PropertyTreePrinter&) const {}
+};
+
+class FrameViewPropertyTreePrinter : public PropertyTreePrinter {
+ public:
+  explicit FrameViewPropertyTreePrinter(const NodeCollector& collector)
+      : collector_(collector) {}
+
   String TreeAsString(const LocalFrameView& frame_view) {
     CollectNodes(frame_view);
-    return PropertyTreePrinter<PropertyTreeNode>::NodesAsTreeString();
+    return PropertyTreePrinter::NodesAsTreeString();
   }
 
  private:
-  using Traits = PropertyTreePrinterTraits<PropertyTreeNode>;
-
   void CollectNodes(const LocalFrameView& frame_view) {
-    Traits::AddVisualViewportProperties(
+    collector_.AddVisualViewportProperties(
         frame_view.GetPage()->GetVisualViewport(), *this);
     if (LayoutView* layout_view = frame_view.GetLayoutView())
       CollectNodes(*layout_view);
@@ -53,15 +63,15 @@
       if (LocalFrameView* child_view = child_local_frame->View())
         CollectNodes(*child_view);
     }
-    Traits::AddOtherProperties(frame_view, *this);
+    collector_.AddOtherProperties(frame_view, *this);
   }
 
   void CollectNodes(const LayoutObject& object) {
-    Traits::AddViewTransitionProperties(object, *this);
+    collector_.AddViewTransitionProperties(object, *this);
 
     for (const FragmentData& fragment : FragmentDataIterator(object)) {
       if (const auto* properties = fragment.PaintProperties()) {
-        Traits::AddObjectPaintProperties(*properties, *this);
+        collector_.AddObjectPaintProperties(*properties, *this);
       }
     }
     for (const auto* child = object.SlowFirstChild(); child;
@@ -69,95 +79,44 @@
       CollectNodes(*child);
     }
   }
+
+  const NodeCollector& collector_;
 };
 
-template <>
-class PropertyTreePrinterTraits<TransformPaintPropertyNodeOrAlias> {
+class TransformNodeCollector : public NodeCollector {
  public:
-  static void AddVisualViewportProperties(
+  void AddVisualViewportProperties(
       const VisualViewport& visual_viewport,
-      PropertyTreePrinter<TransformPaintPropertyNodeOrAlias>& printer) {
+      PropertyTreePrinter& printer) const override {
     printer.AddNode(visual_viewport.GetDeviceEmulationTransformNode());
     printer.AddNode(visual_viewport.GetOverscrollElasticityTransformNode());
     printer.AddNode(visual_viewport.GetPageScaleNode());
     printer.AddNode(visual_viewport.GetScrollTranslationNode());
   }
-  static void AddObjectPaintProperties(
-      const ObjectPaintProperties& properties,
-      PropertyTreePrinter<TransformPaintPropertyNodeOrAlias>& printer) {
-    printer.AddNode(properties.PaintOffsetTranslation());
-    printer.AddNode(properties.StickyTranslation());
-    printer.AddNode(properties.AnchorPositionScrollTranslation());
-    printer.AddNode(properties.Translate());
-    printer.AddNode(properties.Rotate());
-    printer.AddNode(properties.Scale());
-    printer.AddNode(properties.Offset());
-    printer.AddNode(properties.Transform());
-    printer.AddNode(properties.Perspective());
-    printer.AddNode(properties.ReplacedContentTransform());
-    printer.AddNode(properties.ScrollTranslation());
-    printer.AddNode(properties.TransformIsolationNode());
+  void AddObjectPaintProperties(const ObjectPaintProperties& properties,
+                                PropertyTreePrinter& printer) const override {
+    properties.AddTransformNodesToPrinter(printer);
   }
-  static void AddViewTransitionProperties(
-      const LayoutObject& object,
-      PropertyTreePrinter<TransformPaintPropertyNodeOrAlias>& printer) {}
-  static void AddOtherProperties(
-      const FrameView& frame_view,
-      PropertyTreePrinter<TransformPaintPropertyNodeOrAlias>& printer) {}
 };
 
-template <>
-class PropertyTreePrinterTraits<ClipPaintPropertyNodeOrAlias> {
+class ClipNodeCollector : public NodeCollector {
  public:
-  static void AddVisualViewportProperties(
-      const VisualViewport& visual_viewport,
-      PropertyTreePrinter<ClipPaintPropertyNodeOrAlias>& printer) {}
-  static void AddObjectPaintProperties(
-      const ObjectPaintProperties& properties,
-      PropertyTreePrinter<ClipPaintPropertyNodeOrAlias>& printer) {
-    printer.AddNode(properties.ClipPathClip());
-    printer.AddNode(properties.MaskClip());
-    printer.AddNode(properties.CssClip());
-    printer.AddNode(properties.CssClipFixedPosition());
-    printer.AddNode(properties.PixelMovingFilterClipExpander());
-    printer.AddNode(properties.OverflowControlsClip());
-    printer.AddNode(properties.BackgroundClip());
-    printer.AddNode(properties.InnerBorderRadiusClip());
-    printer.AddNode(properties.OverflowClip());
-    printer.AddNode(properties.ClipIsolationNode());
+  void AddObjectPaintProperties(const ObjectPaintProperties& properties,
+                                PropertyTreePrinter& printer) const override {
+    properties.AddClipNodesToPrinter(printer);
   }
-  static void AddViewTransitionProperties(
-      const LayoutObject& object,
-      PropertyTreePrinter<ClipPaintPropertyNodeOrAlias>& printer) {}
-  static void AddOtherProperties(
-      const LocalFrameView& frame_view,
-      PropertyTreePrinter<ClipPaintPropertyNodeOrAlias>& printer) {}
 };
 
-template <>
-class PropertyTreePrinterTraits<EffectPaintPropertyNodeOrAlias> {
+class EffectNodeCollector : public NodeCollector {
  public:
-  static void AddVisualViewportProperties(
-      const VisualViewport& visual_viewport,
-      PropertyTreePrinter<EffectPaintPropertyNodeOrAlias>& printer) {}
-
-  static void AddObjectPaintProperties(
-      const ObjectPaintProperties& properties,
-      PropertyTreePrinter<EffectPaintPropertyNodeOrAlias>& printer) {
-    printer.AddNode(properties.Effect());
-    printer.AddNode(properties.Filter());
-    printer.AddNode(properties.VerticalScrollbarEffect());
-    printer.AddNode(properties.HorizontalScrollbarEffect());
-    printer.AddNode(properties.ScrollCornerEffect());
-    printer.AddNode(properties.Mask());
-    printer.AddNode(properties.ClipPathMask());
-    printer.AddNode(properties.ElementCaptureEffect());
-    printer.AddNode(properties.EffectIsolationNode());
+  void AddObjectPaintProperties(const ObjectPaintProperties& properties,
+                                PropertyTreePrinter& printer) const override {
+    properties.AddEffectNodesToPrinter(printer);
   }
 
-  static void AddViewTransitionProperties(
+  void AddViewTransitionProperties(
       const LayoutObject& object,
-      PropertyTreePrinter<EffectPaintPropertyNodeOrAlias>& printer) {
+      PropertyTreePrinter& printer) const override {
     auto* transition = ViewTransitionUtils::GetTransition(object.GetDocument());
     // `NeedsViewTransitionEffectNode` is an indirect way to see if the object
     // is participating in the transition.
@@ -168,48 +127,38 @@
     printer.AddNode(transition->GetEffect(object));
   }
 
-  static void AddOtherProperties(
-      const LocalFrameView& frame_view,
-      PropertyTreePrinter<EffectPaintPropertyNodeOrAlias>& printer) {
+  void AddOtherProperties(const LocalFrameView& frame_view,
+                          PropertyTreePrinter& printer) const override {
     printer.AddNode(&frame_view.GetFrame().Selection().CaretEffectNode());
   }
 };
 
-template <>
-class PropertyTreePrinterTraits<ScrollPaintPropertyNode> {
+class ScrollNodeCollector : public NodeCollector {
  public:
-  static void AddVisualViewportProperties(
+  void AddVisualViewportProperties(
       const VisualViewport& visual_viewport,
-      PropertyTreePrinter<ScrollPaintPropertyNode>& printer) {
+      PropertyTreePrinter& printer) const override {
     printer.AddNode(visual_viewport.GetScrollNode());
   }
 
-  static void AddObjectPaintProperties(
-      const ObjectPaintProperties& properties,
-      PropertyTreePrinter<ScrollPaintPropertyNode>& printer) {
-    printer.AddNode(properties.Scroll());
+  void AddObjectPaintProperties(const ObjectPaintProperties& properties,
+                                PropertyTreePrinter& printer) const override {
+    properties.AddScrollNodesToPrinter(printer);
   }
-
-  static void AddViewTransitionProperties(
-      const LayoutObject& object,
-      PropertyTreePrinter<ScrollPaintPropertyNode>& printer) {}
-  static void AddOtherProperties(
-      const LocalFrameView& frame_view,
-      PropertyTreePrinter<ScrollPaintPropertyNode>& printer) {}
 };
 
-template <typename PropertyTreeNode>
-void SetDebugName(const PropertyTreeNode* node, const String& debug_name) {
-  if (node)
-    const_cast<PropertyTreeNode*>(node)->SetDebugName(debug_name);
+void SetDebugName(const PaintPropertyNode* node, const String& debug_name) {
+  if (node) {
+    const_cast<PaintPropertyNode*>(node)->SetDebugName(debug_name);
+  }
 }
 
-template <typename PropertyTreeNode>
-void SetDebugName(const PropertyTreeNode* node,
+void SetDebugName(const PaintPropertyNode* node,
                   const String& name,
                   const LayoutObject& object) {
-  if (node)
+  if (node) {
     SetDebugName(node, name + " (" + object.DebugName() + ")");
+  }
 }
 
 }  // namespace
@@ -306,25 +255,22 @@
 }
 
 String TransformPropertyTreeAsString(const blink::LocalFrameView& rootFrame) {
-  return blink::FrameViewPropertyTreePrinter<
-             blink::TransformPaintPropertyNodeOrAlias>()
+  return blink::FrameViewPropertyTreePrinter(blink::TransformNodeCollector())
       .TreeAsString(rootFrame);
 }
 
 String ClipPropertyTreeAsString(const blink::LocalFrameView& rootFrame) {
-  return blink::FrameViewPropertyTreePrinter<
-             blink::ClipPaintPropertyNodeOrAlias>()
+  return blink::FrameViewPropertyTreePrinter(blink::ClipNodeCollector())
       .TreeAsString(rootFrame);
 }
 
 String EffectPropertyTreeAsString(const blink::LocalFrameView& rootFrame) {
-  return blink::FrameViewPropertyTreePrinter<
-             blink::EffectPaintPropertyNodeOrAlias>()
+  return blink::FrameViewPropertyTreePrinter(blink::EffectNodeCollector())
       .TreeAsString(rootFrame);
 }
 
 String ScrollPropertyTreeAsString(const blink::LocalFrameView& rootFrame) {
-  return blink::FrameViewPropertyTreePrinter<blink::ScrollPaintPropertyNode>()
+  return blink::FrameViewPropertyTreePrinter(blink::ScrollNodeCollector())
       .TreeAsString(rootFrame);
 }
 
diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
index 315142c..99ef8d54d 100644
--- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
+++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
@@ -25,6 +25,7 @@
 #include "third_party/blink/renderer/core/html/html_anchor_element.h"
 #include "third_party/blink/renderer/core/html/html_area_element.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
+#include "third_party/blink/renderer/core/lcp_critical_path_predictor/lcp_critical_path_predictor.h"
 #include "third_party/blink/renderer/core/loader/speculation_rule_loader.h"
 #include "third_party/blink/renderer/core/probe/core_probes.h"
 #include "third_party/blink/renderer/core/speculation_rules/document_rule_predicate.h"
@@ -214,7 +215,32 @@
 }
 
 DocumentSpeculationRules::DocumentSpeculationRules(Document& document)
-    : Supplement(document), host_(document.GetExecutionContext()) {}
+    : Supplement(document), host_(document.GetExecutionContext()) {
+  if (!base::FeatureList::IsEnabled(features::kLCPTimingPredictorPrerender2)) {
+    return;
+  }
+  auto* frame = GetSupplementable()->GetFrame();
+  if (!frame) {
+    return;
+  }
+  // LCPP is supposed to be attached to outer-most-main-frame only.
+  // This matches with the current implementation of prerender2.
+  LCPCriticalPathPredictor* lcpp = frame->GetLCPP();
+  if (!lcpp) {
+    return;
+  }
+  lcpp->AddLCPPredictedCallback(WTF::BindOnce(
+      &DocumentSpeculationRules::OnLCPPredicted, WrapPersistent(this)));
+}
+
+void DocumentSpeculationRules::OnLCPPredicted(const Element*) {
+  CHECK(base::FeatureList::IsEnabled(features::kLCPTimingPredictorPrerender2));
+  mojom::blink::SpeculationHost* host = GetHost();
+  if (!host) {
+    return;
+  }
+  host->OnLCPPredicted();
+}
 
 void DocumentSpeculationRules::AddRuleSet(SpeculationRuleSet* rule_set) {
   SpeculationRulesLoadOutcome outcome = SpeculationRulesLoadOutcome::kSuccess;
diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h
index 9323dff18..19365f8f 100644
--- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h
+++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h
@@ -113,6 +113,9 @@
   // Populates |selectors_| and notifies the StyleEngine.
   void UpdateSelectors();
 
+  // Called when LCP is predicted.
+  void OnLCPPredicted(const Element* lcp_candidate);
+
   // Tracks when the next update to speculation candidates is scheduled to
   // occur. See `SetPendingUpdateState` for details.
   enum class PendingUpdateState : uint8_t {
diff --git a/third_party/blink/renderer/core/speculation_rules/stub_speculation_host.h b/third_party/blink/renderer/core/speculation_rules/stub_speculation_host.h
index b11a16b..97fe3ca 100644
--- a/third_party/blink/renderer/core/speculation_rules/stub_speculation_host.h
+++ b/third_party/blink/renderer/core/speculation_rules/stub_speculation_host.h
@@ -46,6 +46,7 @@
 
   // mojom::blink::SpeculationHost.
   void UpdateSpeculationCandidates(Candidates candidates) override;
+  void OnLCPPredicted() override {}
   void EnableNoVarySearchSupport() override;
   void InitiatePreview(const KURL& url) override;
 
diff --git a/third_party/blink/renderer/modules/ml/webnn/ml_graph_builder.cc b/third_party/blink/renderer/modules/ml/webnn/ml_graph_builder.cc
index 795417b..38bacb6 100644
--- a/third_party/blink/renderer/modules/ml/webnn/ml_graph_builder.cc
+++ b/third_party/blink/renderer/modules/ml/webnn/ml_graph_builder.cc
@@ -726,10 +726,8 @@
 MLOperand* MLGraphBuilder::input(String name,
                                  const MLOperandDescriptor* desc,
                                  ExceptionState& exception_state) {
-  // If no dimensions, it represents a scalar. Set dimensions to empty.
-  Vector<uint32_t> dimensions = desc->getDimensionsOr({});
   auto input_operand = MLOperand::ValidateAndCreateInput(
-      this, desc->dataType().AsEnum(), std::move(dimensions), std::move(name));
+      this, desc->dataType().AsEnum(), desc->dimensions(), std::move(name));
   if (!input_operand.has_value()) {
     exception_state.ThrowDOMException(DOMExceptionCode::kDataError,
                                       input_operand.error());
@@ -741,12 +739,8 @@
 MLOperand* MLGraphBuilder::constant(const MLOperandDescriptor* desc,
                                     NotShared<DOMArrayBufferView> buffer_view,
                                     ExceptionState& exception_state) {
-  String error_message;
-  // If no dimensions, it represents a scalar. Set dimensions to empty.
-  Vector<uint32_t> dimensions = desc->getDimensionsOr({});
   auto constant_operand = MLOperand::ValidateAndCreateConstant(
-      this, desc->dataType().AsEnum(), std::move(dimensions),
-      buffer_view.Get());
+      this, desc->dataType().AsEnum(), desc->dimensions(), buffer_view.Get());
   if (!constant_operand.has_value()) {
     exception_state.ThrowDOMException(DOMExceptionCode::kDataError,
                                       constant_operand.error());
diff --git a/third_party/blink/renderer/modules/ml/webnn/ml_operand_descriptor.idl b/third_party/blink/renderer/modules/ml/webnn/ml_operand_descriptor.idl
index e3c59b3..32ac26c 100644
--- a/third_party/blink/renderer/modules/ml/webnn/ml_operand_descriptor.idl
+++ b/third_party/blink/renderer/modules/ml/webnn/ml_operand_descriptor.idl
@@ -17,5 +17,5 @@
 
 dictionary MLOperandDescriptor {
   required MLOperandDataType dataType;
-  sequence<[EnforceRange] unsigned long> dimensions;
+  sequence<[EnforceRange] unsigned long> dimensions = [];
 };
diff --git a/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/third_party/blink/renderer/modules/webcodecs/BUILD.gn
index 61f1f00..c52dac3 100644
--- a/third_party/blink/renderer/modules/webcodecs/BUILD.gn
+++ b/third_party/blink/renderer/modules/webcodecs/BUILD.gn
@@ -5,6 +5,7 @@
 import("//media/media_options.gni")
 import("//third_party/blink/renderer/modules/modules.gni")
 import("//third_party/libaom/options.gni")
+import("//third_party/libgav1/options.gni")
 import("//third_party/libprotobuf-mutator/fuzzable_proto_library.gni")
 import("//third_party/protobuf/proto_library.gni")
 
@@ -108,6 +109,8 @@
   if (enable_libaom) {
     deps += [ "//third_party/libaom" ]
   }
+  assert(use_libgav1_parser)
+  deps += [ "//third_party/libgav1:libgav1_parser" ]
   if (media_use_libvpx) {
     deps += [ "//third_party/libvpx" ]
   }
diff --git a/third_party/blink/renderer/modules/webcodecs/video_decoder.cc b/third_party/blink/renderer/modules/webcodecs/video_decoder.cc
index a4c4c372..95d3c9d 100644
--- a/third_party/blink/renderer/modules/webcodecs/video_decoder.cc
+++ b/third_party/blink/renderer/modules/webcodecs/video_decoder.cc
@@ -46,15 +46,13 @@
 #include "third_party/blink/renderer/platform/wtf/cross_thread_copier_std.h"
 #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
 #include "third_party/blink/renderer/platform/wtf/functional.h"
-#include "third_party/libaom/libaom_buildflags.h"
+#include "third_party/libgav1/src/src/buffer_pool.h"
+#include "third_party/libgav1/src/src/decoder_state.h"
+#include "third_party/libgav1/src/src/gav1/status_code.h"
+#include "third_party/libgav1/src/src/obu_parser.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
-#if BUILDFLAG(ENABLE_LIBAOM)
-#include "third_party/libaom/source/libaom/aom/aom_decoder.h"  // nogncheck
-#include "third_party/libaom/source/libaom/aom/aomdx.h"        // nogncheck
-#endif
-
 #if BUILDFLAG(ENABLE_LIBVPX)
 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"        // nogncheck
 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"  // nogncheck
@@ -159,13 +157,16 @@
   return copy;
 }
 
-void ParseAv1KeyFrame(const media::DecoderBuffer& buffer, bool* is_key_frame) {
-#if BUILDFLAG(ENABLE_LIBAOM)
-  aom_codec_stream_info_t stream_info = {0};
-  auto status = aom_codec_peek_stream_info(
-      &aom_codec_av1_dx_algo, buffer.data(), buffer.data_size(), &stream_info);
-  *is_key_frame = (status == AOM_CODEC_OK) && stream_info.is_kf;
-#endif
+void ParseAv1KeyFrame(const media::DecoderBuffer& buffer,
+                      libgav1::BufferPool* buffer_pool,
+                      bool* is_key_frame) {
+  libgav1::DecoderState decoder_state;
+  libgav1::ObuParser parser(buffer.data(), buffer.data_size(),
+                            /*operating_point=*/0, buffer_pool, &decoder_state);
+  libgav1::RefCountedBufferPtr frame;
+  libgav1::StatusCode status_code = parser.ParseOneFrame(&frame);
+  *is_key_frame = status_code == libgav1::kStatusOk &&
+                  parser.frame_header().frame_type == libgav1::kFrameKey;
 }
 
 void ParseVpxKeyFrame(const media::DecoderBuffer& buffer,
@@ -202,6 +203,19 @@
 
 }  // namespace
 
+struct VideoDecoder::DecoderSpecificData {
+  void Reset() {
+    decoder_helper.reset();
+    av1_buffer_pool.reset();
+  }
+
+  // Bitstream converter to annex B for AVC/HEVC.
+  std::unique_ptr<VideoDecoderHelper> decoder_helper;
+
+  // Buffer pool for use with libgav1::ObuParser.
+  std::unique_ptr<libgav1::BufferPool> av1_buffer_pool;
+};
+
 // static
 std::unique_ptr<VideoDecoderTraits::MediaDecoderType>
 VideoDecoderTraits::CreateDecoder(
@@ -412,17 +426,19 @@
                                           String* js_error_message,
                                           bool* needs_converter_out) {
   std::unique_ptr<VideoDecoderHelper> decoder_helper;
+  VideoDecoder::DecoderSpecificData decoder_specific_data;
   return MakeMediaVideoDecoderConfigInternal(
-      config, decoder_helper, js_error_message, needs_converter_out);
+      config, decoder_specific_data, js_error_message, needs_converter_out);
 }
 
 // static
 std::optional<media::VideoDecoderConfig>
 VideoDecoder::MakeMediaVideoDecoderConfigInternal(
     const ConfigType& config,
-    std::unique_ptr<VideoDecoderHelper>& decoder_helper,
+    DecoderSpecificData& decoder_specific_data,
     String* js_error_message,
     bool* needs_converter_out) {
+  decoder_specific_data.Reset();
   media::VideoType video_type;
   if (!ParseCodecString(config.codec(), video_type, *js_error_message)) {
     // Checked by IsValidVideoDecoderConfig().
@@ -455,7 +471,7 @@
       (video_type.codec == media::VideoCodec::kH264 ||
        video_type.codec == media::VideoCodec::kHEVC)) {
     VideoDecoderHelper::Status status;
-    decoder_helper = VideoDecoderHelper::Create(
+    decoder_specific_data.decoder_helper = VideoDecoderHelper::Create(
         video_type, extra_data.data(), static_cast<int>(extra_data.size()),
         &status);
     if (status != VideoDecoderHelper::Status::kSucceed) {
@@ -476,6 +492,15 @@
     }
   }
 
+  if (video_type.codec == media::VideoCodec::kAV1) {
+    decoder_specific_data.av1_buffer_pool =
+        std::make_unique<libgav1::BufferPool>(
+            /*on_frame_buffer_size_changed=*/nullptr,
+            /*get_frame_buffer=*/nullptr,
+            /*release_frame_buffer=*/nullptr,
+            /*callback_private_data=*/nullptr);
+  }
+
   // Guess 720p if no coded size hint is provided. This choice should result in
   // a preference for hardware decode.
   gfx::Size coded_size = gfx::Size(1280, 720);
@@ -533,11 +558,14 @@
 VideoDecoder::VideoDecoder(ScriptState* script_state,
                            const VideoDecoderInit* init,
                            ExceptionState& exception_state)
-    : DecoderTemplate<VideoDecoderTraits>(script_state, init, exception_state) {
+    : DecoderTemplate<VideoDecoderTraits>(script_state, init, exception_state),
+      decoder_specific_data_(std::make_unique<DecoderSpecificData>()) {
   UseCounter::Count(ExecutionContext::From(script_state),
                     WebFeature::kWebCodecs);
 }
 
+VideoDecoder::~VideoDecoder() = default;
+
 bool VideoDecoder::IsValidConfig(const ConfigType& config,
                                  String* js_error_message) {
   return IsValidVideoDecoderConfig(config, js_error_message /* out */)
@@ -549,8 +577,9 @@
     String* js_error_message) {
   DCHECK(js_error_message);
   std::optional<media::VideoDecoderConfig> media_config =
-      MakeMediaVideoDecoderConfigInternal(config, decoder_helper_ /* out */,
-                                          js_error_message /* out */);
+      MakeMediaVideoDecoderConfigInternal(
+          config, *decoder_specific_data_.get() /* out */,
+          js_error_message /* out */);
   if (media_config)
     current_codec_ = media_config->codec();
   return media_config;
@@ -559,13 +588,14 @@
 media::DecoderStatus::Or<scoped_refptr<media::DecoderBuffer>>
 VideoDecoder::MakeInput(const InputType& chunk, bool verify_key_frame) {
   scoped_refptr<media::DecoderBuffer> decoder_buffer = chunk.buffer();
-  if (decoder_helper_) {
+  if (decoder_specific_data_->decoder_helper) {
     const uint8_t* src = chunk.buffer()->data();
     size_t src_size = chunk.buffer()->data_size();
 
     // Note: this may not be safe if support for SharedArrayBuffers is added.
-    uint32_t output_size = decoder_helper_->CalculateNeededOutputBufferSize(
-        src, static_cast<uint32_t>(src_size));
+    uint32_t output_size =
+        decoder_specific_data_->decoder_helper->CalculateNeededOutputBufferSize(
+            src, static_cast<uint32_t>(src_size));
     if (!output_size) {
       return media::DecoderStatus(
           media::DecoderStatus::Codes::kMalformedBitstream,
@@ -573,9 +603,10 @@
     }
 
     std::vector<uint8_t> buf(output_size);
-    if (decoder_helper_->ConvertNalUnitStreamToByteStream(
-            src, static_cast<uint32_t>(src_size), buf.data(), &output_size) !=
-        VideoDecoderHelper::Status::kSucceed) {
+    if (decoder_specific_data_->decoder_helper
+            ->ConvertNalUnitStreamToByteStream(
+                src, static_cast<uint32_t>(src_size), buf.data(),
+                &output_size) != VideoDecoderHelper::Status::kSucceed) {
       return media::DecoderStatus(
           media::DecoderStatus::Codes::kMalformedBitstream,
           "Unable to convert NALU to byte stream.");
@@ -592,7 +623,9 @@
         current_codec_ == media::VideoCodec::kVP8) {
       ParseVpxKeyFrame(*decoder_buffer, current_codec_, &is_key_frame);
     } else if (current_codec_ == media::VideoCodec::kAV1) {
-      ParseAv1KeyFrame(*decoder_buffer, &is_key_frame);
+      ParseAv1KeyFrame(*decoder_buffer,
+                       decoder_specific_data_->av1_buffer_pool.get(),
+                       &is_key_frame);
     } else if (current_codec_ == media::VideoCodec::kH264) {
       ParseH264KeyFrame(*decoder_buffer, &is_key_frame);
 
@@ -600,7 +633,7 @@
       // Use a more helpful error message if we think the user may have forgot
       // to provide a description for AVC H.264. We could try to guess at the
       // NAL unit size and see if a NAL unit parses out, but this seems fine.
-      if (!is_key_frame && !decoder_helper_) {
+      if (!is_key_frame && !decoder_specific_data_->decoder_helper) {
         return media::DecoderStatus(
             media::DecoderStatus::Codes::kKeyFrameRequired,
             "A key frame is required after configure() or flush(). If you're "
@@ -613,7 +646,7 @@
 
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
 #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
-      if (!is_key_frame && !decoder_helper_) {
+      if (!is_key_frame && !decoder_specific_data_->decoder_helper) {
         return media::DecoderStatus(
             media::DecoderStatus::Codes::kKeyFrameRequired,
             "A key frame is required after configure() or flush(). If you're "
diff --git a/third_party/blink/renderer/modules/webcodecs/video_decoder.h b/third_party/blink/renderer/modules/webcodecs/video_decoder.h
index 1ea89cd..4cfd2a7 100644
--- a/third_party/blink/renderer/modules/webcodecs/video_decoder.h
+++ b/third_party/blink/renderer/modules/webcodecs/video_decoder.h
@@ -100,7 +100,7 @@
       bool* needs_converter_out = nullptr);
 
   VideoDecoder(ScriptState*, const VideoDecoderInit*, ExceptionState&);
-  ~VideoDecoder() override = default;
+  ~VideoDecoder() override;
 
   // EventTarget interface
   const AtomicString& InterfaceName() const override;
@@ -119,6 +119,8 @@
       ExecutionContext*) override;
 
  private:
+  struct DecoderSpecificData;
+
   // DecoderTemplate implementation.
   HardwarePreference GetHardwarePreference(const ConfigType& config) override;
   bool GetLowDelayPreference(const ConfigType& config) override;
@@ -127,12 +129,11 @@
   static std::optional<media::VideoDecoderConfig>
   MakeMediaVideoDecoderConfigInternal(
       const ConfigType& config,
-      std::unique_ptr<VideoDecoderHelper>& decoder_helper,
+      DecoderSpecificData& decoder_specific_data,
       String* js_error_message,
       bool* needs_converter_out = nullptr);
 
-  // Bitstream converter to annex B for AVC/HEVC.
-  std::unique_ptr<VideoDecoderHelper> decoder_helper_;
+  std::unique_ptr<DecoderSpecificData> decoder_specific_data_;
 
   media::VideoCodec current_codec_ = media::VideoCodec::kUnknown;
 
diff --git a/third_party/blink/renderer/modules/webcodecs/video_encoder.cc b/third_party/blink/renderer/modules/webcodecs/video_encoder.cc
index 38023c536..9d3e049 100644
--- a/third_party/blink/renderer/modules/webcodecs/video_encoder.cc
+++ b/third_party/blink/renderer/modules/webcodecs/video_encoder.cc
@@ -79,6 +79,7 @@
 #include "third_party/blink/renderer/platform/graphics/gpu/shared_gpu_context.h"
 #include "third_party/blink/renderer/platform/graphics/web_graphics_context_3d_video_frame_pool.h"
 #include "third_party/blink/renderer/platform/heap/cross_thread_handle.h"
+#include "third_party/blink/renderer/platform/heap/heap_barrier_callback.h"
 #include "third_party/blink/renderer/platform/heap/persistent.h"
 #include "third_party/blink/renderer/platform/instrumentation/use_counter.h"
 #include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h"
@@ -1421,9 +1422,21 @@
   active_encodes_ = 0;
 }
 
+void FindAnySupported(ScriptPromiseResolverTyped<VideoEncoderSupport>* resolver,
+                      const HeapVector<Member<VideoEncoderSupport>>& supports) {
+  VideoEncoderSupport* result = nullptr;
+  for (auto& support : supports) {
+    result = support;
+    if (result->supported()) {
+      break;
+    }
+  }
+  resolver->Resolve(result);
+}
+
 static void isConfigSupportedWithSoftwareOnly(
     ScriptState* script_state,
-    ScriptPromiseResolver* resolver,
+    base::OnceCallback<void(VideoEncoderSupport*)> callback,
     VideoEncoderSupport* support,
     VideoEncoderTraits::ParsedConfig* config) {
   std::unique_ptr<media::VideoEncoder> software_encoder;
@@ -1443,19 +1456,20 @@
   }
   if (!software_encoder) {
     support->setSupported(false);
-    resolver->Resolve(support);
+    std::move(callback).Run(support);
     return;
   }
 
-  auto done_callback = [](std::unique_ptr<media::VideoEncoder> encoder,
-                          ScriptPromiseResolver* resolver,
-                          scoped_refptr<base::SingleThreadTaskRunner> runner,
-                          VideoEncoderSupport* support,
-                          media::EncoderStatus status) {
-    support->setSupported(status.is_ok());
-    resolver->Resolve(support);
-    runner->DeleteSoon(FROM_HERE, std::move(encoder));
-  };
+  auto done_callback =
+      [](std::unique_ptr<media::VideoEncoder> encoder,
+         WTF::CrossThreadOnceFunction<void(blink::VideoEncoderSupport*)>
+             callback,
+         scoped_refptr<base::SingleThreadTaskRunner> runner,
+         VideoEncoderSupport* support, media::EncoderStatus status) {
+        support->setSupported(status.is_ok());
+        std::move(callback).Run(support);
+        runner->DeleteSoon(FROM_HERE, std::move(encoder));
+      };
 
   auto* context = ExecutionContext::From(script_state);
   auto runner = context->GetTaskRunner(TaskType::kInternalDefault);
@@ -1465,12 +1479,12 @@
       /*output_cb=*/base::DoNothing(),
       ConvertToBaseOnceCallback(CrossThreadBindOnce(
           done_callback, std::move(software_encoder),
-          MakeUnwrappingCrossThreadHandle(resolver), std::move(runner),
+          CrossThreadBindOnce(std::move(callback)), std::move(runner),
           MakeUnwrappingCrossThreadHandle(support))));
 }
 
 static void isConfigSupportedWithHardwareOnly(
-    ScriptPromiseResolver* resolver,
+    WTF::CrossThreadOnceFunction<void(blink::VideoEncoderSupport*)> callback,
     VideoEncoderSupport* support,
     VideoEncoderTraits::ParsedConfig* config,
     media::GpuVideoAcceleratorFactories* gpu_factories) {
@@ -1479,42 +1493,18 @@
   bool supported = IsAcceleratedConfigurationSupported(
       config->profile, config->options, gpu_factories, required_encoder_type);
   support->setSupported(supported);
-  resolver->Resolve(support);
+  std::move(callback).Run(support);
 }
 
-class FindAnySupported final : public ScriptFunction::Callable {
- public:
-  ScriptValue Call(ScriptState* state, ScriptValue value) override {
-    ExceptionContext context(ExceptionContextType::kConstructorOperationInvoke,
-                             "VideoEncoderSupport");
-    ExceptionState exception_state(state->GetIsolate(), context);
-    HeapVector<Member<VideoEncoderSupport>> supports =
-        NativeValueTraits<IDLSequence<VideoEncoderSupport>>::NativeValue(
-            state->GetIsolate(), value.V8Value(), exception_state);
-
-    VideoEncoderSupport* result = nullptr;
-    // We don't really expect exceptions here, but if isConfigSupported() is
-    // given a VideoEncoderConfig with uint64 values above max JS int (2^53 - 1)
-    // creation of |supports| vector will fail. This can happen during fuzzing.
-    if (!exception_state.HadException()) {
-      for (auto& support : supports) {
-        result = support;
-        if (result->supported())
-          break;
-      }
-    }
-    return ScriptValue::From(state, result);
-  }
-};
-
 // static
-ScriptPromise VideoEncoder::isConfigSupported(ScriptState* script_state,
-                                              const VideoEncoderConfig* config,
-                                              ExceptionState& exception_state) {
+ScriptPromiseTyped<VideoEncoderSupport> VideoEncoder::isConfigSupported(
+    ScriptState* script_state,
+    const VideoEncoderConfig* config,
+    ExceptionState& exception_state) {
   auto* parsed_config = ParseConfigStatic(config, exception_state);
   if (!parsed_config) {
     DCHECK(exception_state.HadException());
-    return ScriptPromise();
+    return ScriptPromiseTyped<VideoEncoderSupport>();
   }
   auto* config_copy = CopyConfig(*config, *parsed_config);
 
@@ -1524,27 +1514,35 @@
     auto* support = VideoEncoderSupport::Create();
     support->setConfig(config_copy);
     support->setSupported(false);
-
-    return ScriptPromise::Cast(
-        script_state,
-        ToV8Traits<VideoEncoderSupport>::ToV8(script_state, support));
+    return ToResolvedPromise<VideoEncoderSupport>(script_state, support);
   }
 
-  // Create promises for resolving hardware and software encoding support and
-  // put them into |promises|. Simultaneously run both versions of
-  // isConfigSupported(), each version fulfills its own promise.
-  HeapVector<ScriptPromise> promises;
+  // Schedule tasks for determining hardware and software encoding support and
+  // register them with HeapBarrierCallback.
+  wtf_size_t num_callbacks = 0;
+  if (parsed_config->hw_pref != HardwarePreference::kPreferSoftware ||
+      MayHaveOSSoftwareEncoder(parsed_config->profile)) {
+    ++num_callbacks;
+  }
+  if (parsed_config->hw_pref != HardwarePreference::kPreferHardware) {
+    ++num_callbacks;
+  }
+  auto* resolver =
+      MakeGarbageCollected<ScriptPromiseResolverTyped<VideoEncoderSupport>>(
+          script_state);
+  auto promise = resolver->Promise();
+  auto find_any_callback = HeapBarrierCallback<VideoEncoderSupport>(
+      num_callbacks,
+      WTF::BindOnce(&FindAnySupported, WrapPersistent(resolver)));
+
   if (parsed_config->hw_pref != HardwarePreference::kPreferSoftware ||
       MayHaveOSSoftwareEncoder(parsed_config->profile)) {
     // Hardware support not denied, detect support by hardware encoders.
-    auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(
-        script_state, exception_state.GetContext());
-    promises.push_back(resolver->Promise());
     auto* support = VideoEncoderSupport::Create();
     support->setConfig(config_copy);
     auto gpu_retrieved_callback =
         CrossThreadBindOnce(isConfigSupportedWithHardwareOnly,
-                            MakeUnwrappingCrossThreadHandle(resolver),
+                            CrossThreadBindOnce(find_any_callback),
                             MakeUnwrappingCrossThreadHandle(support),
                             MakeUnwrappingCrossThreadHandle(parsed_config));
     RetrieveGpuFactoriesWithKnownEncoderSupport(
@@ -1553,21 +1551,13 @@
 
   if (parsed_config->hw_pref != HardwarePreference::kPreferHardware) {
     // Hardware support not required, detect support by software encoders.
-    auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(
-        script_state, exception_state.GetContext());
-    promises.push_back(resolver->Promise());
     auto* support = VideoEncoderSupport::Create();
     support->setConfig(config_copy);
-    isConfigSupportedWithSoftwareOnly(script_state, resolver, support,
+    isConfigSupportedWithSoftwareOnly(script_state, find_any_callback, support,
                                       parsed_config);
   }
 
-  // Wait for all |promises| to resolve and check if any of them have
-  // support=true.
-  auto* find_any_supported = MakeGarbageCollected<ScriptFunction>(
-      script_state, MakeGarbageCollected<FindAnySupported>());
-
-  return ScriptPromise::All(script_state, promises).Then(find_any_supported);
+  return promise;
 }
 
 }  // namespace blink
diff --git a/third_party/blink/renderer/modules/webcodecs/video_encoder.h b/third_party/blink/renderer/modules/webcodecs/video_encoder.h
index 774f56e..f624a43a 100644
--- a/third_party/blink/renderer/modules/webcodecs/video_encoder.h
+++ b/third_party/blink/renderer/modules/webcodecs/video_encoder.h
@@ -14,6 +14,7 @@
 #include "media/base/video_color_space.h"
 #include "media/base/video_encoder.h"
 #include "media/base/video_frame_pool.h"
+#include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk_output_callback.h"
 #include "third_party/blink/renderer/modules/webcodecs/encoder_base.h"
 #include "third_party/blink/renderer/modules/webcodecs/hardware_preference.h"
@@ -32,6 +33,7 @@
 class VideoEncoderConfig;
 class VideoEncoderInit;
 class VideoEncoderEncodeOptions;
+class VideoEncoderSupport;
 class WebGraphicsContext3DVideoFramePool;
 class BackgroundReadback;
 
@@ -76,9 +78,8 @@
   VideoEncoder(ScriptState*, const VideoEncoderInit*, ExceptionState&);
   ~VideoEncoder() override;
 
-  static ScriptPromise isConfigSupported(ScriptState*,
-                                         const VideoEncoderConfig*,
-                                         ExceptionState&);
+  static ScriptPromiseTyped<VideoEncoderSupport>
+  isConfigSupported(ScriptState*, const VideoEncoderConfig*, ExceptionState&);
 
   // EventTarget interface
   const AtomicString& InterfaceName() const override;
diff --git a/third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.cc b/third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.cc
index a1560d2..0e5262a 100644
--- a/third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.cc
+++ b/third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.cc
@@ -4,7 +4,7 @@
 
 #include "third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.h"
 
-#include "third_party/blink/renderer/platform/geometry/layout_rect.h"
+#include "third_party/blink/renderer/platform/geometry/infinite_int_rect.h"
 #include "third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h"
 #include "third_party/blink/renderer/platform/graphics/paint/property_tree_state.h"
 
@@ -82,7 +82,7 @@
 }
 
 std::unique_ptr<JSONObject> ClipPaintPropertyNode::ToJSON() const {
-  auto json = ToJSONBase();
+  auto json = ClipPaintPropertyNodeOrAlias::ToJSON();
   if (NodeChanged() != PaintPropertyChangeType::kUnchanged)
     json->SetString("changed", PaintPropertyChangeTypeToString(NodeChanged()));
   json->SetString("localTransformSpace",
diff --git a/third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.h
index 9defe95..6f287c6 100644
--- a/third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.h
+++ b/third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.h
@@ -35,8 +35,8 @@
 class ClipPaintPropertyNode;
 
 class PLATFORM_EXPORT ClipPaintPropertyNodeOrAlias
-    : public PaintPropertyNode<ClipPaintPropertyNodeOrAlias,
-                               ClipPaintPropertyNode> {
+    : public PaintPropertyNodeBase<ClipPaintPropertyNodeOrAlias,
+                                   ClipPaintPropertyNode> {
  public:
   // Checks if the accumulated clip from |this| to |relative_to_state.Clip()|
   // has changed, at least significance of |change|, in the space of
@@ -52,14 +52,14 @@
 
   void ClearChangedToRoot(int sequence_number) const;
 
-  void AddChanged(PaintPropertyChangeType changed) {
+  void AddChanged(PaintPropertyChangeType changed) final {
     DCHECK_NE(PaintPropertyChangeType::kUnchanged, changed);
     GeometryMapperClipCache::ClearCache();
-    PaintPropertyNode::AddChanged(changed);
+    PaintPropertyNodeBase::AddChanged(changed);
   }
 
  protected:
-  using PaintPropertyNode::PaintPropertyNode;
+  using PaintPropertyNodeBase::PaintPropertyNodeBase;
 
  private:
   template <bool (TransformPaintPropertyNodeOrAlias::*ChangedMethod)(
@@ -71,7 +71,7 @@
       const TransformPaintPropertyNodeOrAlias* transform_not_to_check) const;
 };
 
-class ClipPaintPropertyNodeAlias : public ClipPaintPropertyNodeOrAlias {
+class ClipPaintPropertyNodeAlias final : public ClipPaintPropertyNodeOrAlias {
  public:
   static scoped_refptr<ClipPaintPropertyNodeAlias> Create(
       const ClipPaintPropertyNodeOrAlias& parent) {
@@ -84,7 +84,7 @@
       : ClipPaintPropertyNodeOrAlias(parent, kParentAlias) {}
 };
 
-class PLATFORM_EXPORT ClipPaintPropertyNode
+class PLATFORM_EXPORT ClipPaintPropertyNode final
     : public ClipPaintPropertyNodeOrAlias {
  public:
   // To make it less verbose and more readable to construct and update a node,
@@ -197,12 +197,9 @@
     return GetClipCache().NearestPixelMovingFilterClip();
   }
 
-  std::unique_ptr<JSONObject> ToJSON() const;
+  std::unique_ptr<JSONObject> ToJSON() const final;
 
  private:
-  friend class PaintPropertyNode<ClipPaintPropertyNodeOrAlias,
-                                 ClipPaintPropertyNode>;
-
   ClipPaintPropertyNode(const ClipPaintPropertyNodeOrAlias* parent,
                         State&& state)
       : ClipPaintPropertyNodeOrAlias(parent), state_(std::move(state)) {}
diff --git a/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.cc b/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.cc
index ed52464b..e406def 100644
--- a/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.cc
+++ b/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.cc
@@ -195,7 +195,7 @@
 }
 
 std::unique_ptr<JSONObject> EffectPaintPropertyNode::ToJSON() const {
-  auto json = ToJSONBase();
+  auto json = EffectPaintPropertyNodeOrAlias::ToJSON();
   json->SetString("localTransformSpace",
                   String::Format("%p", state_.local_transform_space.get()));
   json->SetString("outputClip", String::Format("%p", state_.output_clip.get()));
diff --git a/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
index 98475742..534c1db 100644
--- a/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
+++ b/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
@@ -31,8 +31,8 @@
 class EffectPaintPropertyNode;
 
 class PLATFORM_EXPORT EffectPaintPropertyNodeOrAlias
-    : public PaintPropertyNode<EffectPaintPropertyNodeOrAlias,
-                               EffectPaintPropertyNode> {
+    : public PaintPropertyNodeBase<EffectPaintPropertyNodeOrAlias,
+                                   EffectPaintPropertyNode> {
  public:
   // Checks if the accumulated effect from |this| to |relative_to_state
   // .Effect()| has changed, at least significance of |change|, in the space of
@@ -51,10 +51,11 @@
   void ClearChangedToRoot(int sequence_number) const;
 
  protected:
-  using PaintPropertyNode::PaintPropertyNode;
+  using PaintPropertyNodeBase::PaintPropertyNodeBase;
 };
 
-class EffectPaintPropertyNodeAlias : public EffectPaintPropertyNodeOrAlias {
+class EffectPaintPropertyNodeAlias final
+    : public EffectPaintPropertyNodeOrAlias {
  public:
   static scoped_refptr<EffectPaintPropertyNodeAlias> Create(
       const EffectPaintPropertyNodeOrAlias& parent) {
@@ -67,7 +68,7 @@
       : EffectPaintPropertyNodeOrAlias(parent, kParentAlias) {}
 };
 
-class PLATFORM_EXPORT EffectPaintPropertyNode
+class PLATFORM_EXPORT EffectPaintPropertyNode final
     : public EffectPaintPropertyNodeOrAlias {
  public:
   struct AnimationState {
@@ -330,7 +331,7 @@
     return state_.self_or_ancestor_participates_in_view_transition;
   }
 
-  std::unique_ptr<JSONObject> ToJSON() const;
+  std::unique_ptr<JSONObject> ToJSON() const final;
 
  private:
   EffectPaintPropertyNode(const EffectPaintPropertyNodeOrAlias* parent,
diff --git a/third_party/blink/renderer/platform/graphics/paint/paint_property_node.cc b/third_party/blink/renderer/platform/graphics/paint/paint_property_node.cc
index 83e230e..47c69c20 100644
--- a/third_party/blink/renderer/platform/graphics/paint/paint_property_node.cc
+++ b/third_party/blink/renderer/platform/graphics/paint/paint_property_node.cc
@@ -11,43 +11,40 @@
 
 namespace blink {
 
-namespace {
-
-// Returns -1 if |maybe_ancestor| is found in the ancestor chain, or returns
-// the depth of the node from the root.
-template <typename NodeType>
-int NodeDepthOrFoundAncestor(const NodeType& node,
-                             const NodeType& maybe_ancestor) {
+int PaintPropertyNode::NodeDepthOrFoundAncestor(
+    const PaintPropertyNode& maybe_ancestor) const {
   int depth = 0;
-  for (const NodeType* n = &node; n; n = n->Parent()) {
-    if (n == &maybe_ancestor)
+  for (const auto* n = this; n; n = n->Parent()) {
+    if (n == &maybe_ancestor) {
       return -1;
+    }
     depth++;
   }
   return depth;
 }
 
-template <typename NodeType>
-const NodeType& LowestCommonAncestorTemplate(const NodeType& a,
-                                             const NodeType& b) {
+const PaintPropertyNode& PaintPropertyNode::LowestCommonAncestorInternal(
+    const PaintPropertyNode& other) const {
   // Measure both depths.
-  auto depth_a = NodeDepthOrFoundAncestor(a, b);
-  if (depth_a == -1)
-    return b;
-  auto depth_b = NodeDepthOrFoundAncestor(b, a);
-  if (depth_b == -1)
-    return a;
+  auto depth_a = NodeDepthOrFoundAncestor(other);
+  if (depth_a == -1) {
+    return other;
+  }
+  auto depth_b = other.NodeDepthOrFoundAncestor(*this);
+  if (depth_b == -1) {
+    return *this;
+  }
 
-  const auto* a_ptr = &a;
-  const auto* b_ptr = &b;
+  const auto* a_ptr = this;
+  const auto* b_ptr = &other;
 
-  // Make it so depthA >= depthB.
+  // Make it so depth_a >= depth_b.
   if (depth_a < depth_b) {
     std::swap(a_ptr, b_ptr);
     std::swap(depth_a, depth_b);
   }
 
-  // Make it so depthA == depthB.
+  // Make it so depth_a == depth_b.
   while (depth_a > depth_b) {
     a_ptr = a_ptr->Parent();
     depth_a--;
@@ -64,30 +61,19 @@
   return *a_ptr;
 }
 
-}  // namespace
-
-const TransformPaintPropertyNodeOrAlias& LowestCommonAncestorInternal(
-    const TransformPaintPropertyNodeOrAlias& a,
-    const TransformPaintPropertyNodeOrAlias& b) {
-  return LowestCommonAncestorTemplate(a, b);
-}
-
-const ClipPaintPropertyNodeOrAlias& LowestCommonAncestorInternal(
-    const ClipPaintPropertyNodeOrAlias& a,
-    const ClipPaintPropertyNodeOrAlias& b) {
-  return LowestCommonAncestorTemplate(a, b);
-}
-
-const EffectPaintPropertyNodeOrAlias& LowestCommonAncestorInternal(
-    const EffectPaintPropertyNodeOrAlias& a,
-    const EffectPaintPropertyNodeOrAlias& b) {
-  return LowestCommonAncestorTemplate(a, b);
-}
-
-const ScrollPaintPropertyNode& LowestCommonAncestorInternal(
-    const ScrollPaintPropertyNode& a,
-    const ScrollPaintPropertyNode& b) {
-  return LowestCommonAncestorTemplate(a, b);
+std::unique_ptr<JSONObject> PaintPropertyNode::ToJSON() const {
+  auto json = std::make_unique<JSONObject>();
+  json->SetString("this", String::Format("%p", this));
+  if (Parent()) {
+    json->SetString("parent", String::Format("%p", Parent()));
+  }
+  if (IsParentAlias()) {
+    json->SetBoolean("is_alias", true);
+  }
+  if (NodeChanged() != PaintPropertyChangeType::kUnchanged) {
+    json->SetString("changed", PaintPropertyChangeTypeToString(NodeChanged()));
+  }
+  return json;
 }
 
 const char* PaintPropertyChangeTypeToString(PaintPropertyChangeType change) {
@@ -107,4 +93,62 @@
   }
 }
 
+#if DCHECK_IS_ON()
+
+String PaintPropertyNode::ToTreeString() const {
+  return PropertyTreePrinter().PathAsString(*this);
+}
+
+void PropertyTreePrinter::AddNode(const PaintPropertyNode* node) {
+  if (node) {
+    nodes_.insert(node);
+  }
+}
+
+String PropertyTreePrinter::NodesAsTreeString() {
+  if (nodes_.empty()) {
+    return "";
+  }
+  StringBuilder string_builder;
+  BuildTreeString(string_builder, RootNode(), 0);
+  return string_builder.ToString();
+}
+
+String PropertyTreePrinter::PathAsString(const PaintPropertyNode& last_node) {
+  for (const auto* n = &last_node; n; n = n->Parent()) {
+    AddNode(n);
+  }
+  return NodesAsTreeString();
+}
+
+void PropertyTreePrinter::BuildTreeString(StringBuilder& string_builder,
+                                          const PaintPropertyNode& node,
+                                          unsigned indent) {
+  for (unsigned i = 0; i < indent; i++) {
+    string_builder.Append(' ');
+  }
+  string_builder.Append(node.ToString());
+  string_builder.Append("\n");
+
+  for (const auto& child_node : nodes_) {
+    if (child_node->Parent() == &node) {
+      BuildTreeString(string_builder, *child_node, indent + 2);
+    }
+  }
+}
+
+const PaintPropertyNode& PropertyTreePrinter::RootNode() {
+  const auto* node = nodes_.back();
+  while (!node->IsRoot()) {
+    node = node->Parent();
+  }
+  if (node->DebugName().empty()) {
+    const_cast<PaintPropertyNode*>(node)->SetDebugName("root");
+  }
+  nodes_.insert(node);
+  return *node;
+}
+
+#endif  // DCHECK_IS_ON()
+
 }  // namespace blink
diff --git a/third_party/blink/renderer/platform/graphics/paint/paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/paint_property_node.h
index e01dff9..af960c0 100644
--- a/third_party/blink/renderer/platform/graphics/paint/paint_property_node.h
+++ b/third_party/blink/renderer/platform/graphics/paint/paint_property_node.h
@@ -65,48 +65,16 @@
 PLATFORM_EXPORT const char* PaintPropertyChangeTypeToString(
     PaintPropertyChangeType);
 
-PLATFORM_EXPORT const ClipPaintPropertyNodeOrAlias&
-LowestCommonAncestorInternal(const ClipPaintPropertyNodeOrAlias&,
-                             const ClipPaintPropertyNodeOrAlias&);
-PLATFORM_EXPORT const EffectPaintPropertyNodeOrAlias&
-LowestCommonAncestorInternal(const EffectPaintPropertyNodeOrAlias&,
-                             const EffectPaintPropertyNodeOrAlias&);
-PLATFORM_EXPORT const ScrollPaintPropertyNode& LowestCommonAncestorInternal(
-    const ScrollPaintPropertyNode&,
-    const ScrollPaintPropertyNode&);
-PLATFORM_EXPORT const TransformPaintPropertyNodeOrAlias&
-LowestCommonAncestorInternal(const TransformPaintPropertyNodeOrAlias&,
-                             const TransformPaintPropertyNodeOrAlias&);
-
-template <typename NodeTypeOrAlias, typename NodeType>
-struct PaintPropertyNodeRefCountedTraits {
-  static void Destruct(const NodeTypeOrAlias* node) {
-    if (node->IsParentAlias())
-      delete node;
-    else
-      delete static_cast<const NodeType*>(node);
-  }
-};
-
-template <typename NodeTypeOrAlias, typename NodeType>
-class PaintPropertyNode
-    : public RefCounted<
-          NodeTypeOrAlias,
-          PaintPropertyNodeRefCountedTraits<NodeTypeOrAlias, NodeType>> {
+class PLATFORM_EXPORT PaintPropertyNode : public RefCounted<PaintPropertyNode> {
   USING_FAST_MALLOC(PaintPropertyNode);
 
  public:
-  // Parent property node, or nullptr if this is the root node.
-  const NodeTypeOrAlias* Parent() const { return parent_.get(); }
-  bool IsRoot() const { return !parent_; }
+  PaintPropertyNode(const PaintPropertyNode&) = delete;
+  PaintPropertyNode& operator=(const PaintPropertyNode&) = delete;
 
-  bool IsAncestorOf(const NodeTypeOrAlias& other) const {
-    for (const auto* node = &other; node != this; node = node->Parent()) {
-      if (!node)
-        return false;
-    }
-    return true;
-  }
+  virtual ~PaintPropertyNode() = default;
+
+  bool IsRoot() const { return !parent_; }
 
   // Clear changed flags along the path to the root, and set sequence number.
   // If a subclass needs to clear changed flags along additional paths, the
@@ -118,18 +86,6 @@
       n->ClearChanged(sequence_number);
   }
 
-  PaintPropertyChangeType SetParent(const NodeTypeOrAlias& parent) {
-    DCHECK(!IsRoot());
-    DCHECK_NE(&parent, this);
-    if (&parent == parent_) {
-      return PaintPropertyChangeType::kUnchanged;
-    }
-    parent_ = &parent;
-    static_cast<NodeTypeOrAlias*>(this)->AddChanged(
-        PaintPropertyChangeType::kChangedOnlyValues);
-    return PaintPropertyChangeType::kChangedOnlyValues;
-  }
-
   // Returns true if this node is an alias for its parent. A parent alias is a
   // node which on its own does not contribute to the rendering output, and only
   // exists to enforce a particular structure of the paint property tree. Its
@@ -137,19 +93,6 @@
   // value is used. See Unalias().
   bool IsParentAlias() const { return is_parent_alias_; }
 
-  // Returns the first node up the parent chain that is not an alias; return the
-  // root node if every node is an alias.
-  const NodeType& Unalias() const {
-    const auto* node = static_cast<const NodeTypeOrAlias*>(this);
-    while (node->Parent() && node->IsParentAlias())
-      node = node->Parent();
-    return *static_cast<const NodeType*>(node);
-  }
-
-  const NodeType* UnaliasedParent() const {
-    return Parent() ? &Parent()->Unalias() : nullptr;
-  }
-
   void CompositorSimpleValuesUpdated() const {
     if (changed_ == PaintPropertyChangeType::kChangedOnlySimpleValues)
       changed_ = PaintPropertyChangeType::kChangedOnlyCompositedValues;
@@ -164,11 +107,7 @@
 #endif
   }
 
-  std::unique_ptr<JSONObject> ToJSON() const {
-    if (IsParentAlias())
-      return ToJSONBase();
-    return static_cast<const NodeType*>(this)->ToJSON();
-  }
+  virtual std::unique_ptr<JSONObject> ToJSON() const;
 
   int CcNodeId(int sequence_number) const {
     return cc_sequence_number_ == sequence_number ? cc_node_id_
@@ -185,21 +124,6 @@
            changed_ != PaintPropertyChangeType::kChangedOnlyNonRerasterValues;
   }
 
-  // Returns the lowest common ancestor in the paint property tree.
-  const NodeTypeOrAlias& LowestCommonAncestor(const NodeTypeOrAlias& b) const {
-    // Fast path of common cases.
-    const auto& a = *static_cast<const NodeTypeOrAlias*>(this);
-    if (&a == &b || !a.Parent() || b.Parent() == &a) {
-      DCHECK(IsAncestorOf(b));
-      return a;
-    }
-    if (!b.Parent() || a.Parent() == &b) {
-      DCHECK(b.IsAncestorOf(a));
-      return b;
-    }
-    return LowestCommonAncestorInternal(a, b);
-  }
-
 #if DCHECK_IS_ON()
   String ToTreeString() const;
 
@@ -207,21 +131,76 @@
   void SetDebugName(const String& name) { debug_name_ = name; }
 #endif
 
+  // In this class the tag is to distinguish the constructor for parent alias.
+  // In subclasses for parent alias types, the tag is to distinguish the
+  // constructors from the copy constructors (deleted in this class).
+  enum ParentAliasTag { kParentAlias };
+
  protected:
-  explicit PaintPropertyNode(const NodeTypeOrAlias* parent)
+  explicit PaintPropertyNode(const PaintPropertyNode* parent)
       : changed_(parent ? PaintPropertyChangeType::kNodeAddedOrRemoved
                         : PaintPropertyChangeType::kUnchanged),
         parent_(parent) {}
 
   // A parent alias node must have a parent, so ensure that we can always find
   // a unaliased ancestor for any node.
-  enum ParentAliasTag { kParentAlias };
-  PaintPropertyNode(const NodeTypeOrAlias& parent, ParentAliasTag)
+  PaintPropertyNode(const PaintPropertyNode& parent, ParentAliasTag)
       : is_parent_alias_(true),
         changed_(PaintPropertyChangeType::kNodeAddedOrRemoved),
         parent_(&parent) {}
 
-  void AddChanged(PaintPropertyChangeType changed) {
+  PaintPropertyChangeType SetParent(const PaintPropertyNode& parent) {
+    DCHECK(!IsRoot());
+    DCHECK_NE(&parent, this);
+    if (&parent == parent_) {
+      return PaintPropertyChangeType::kUnchanged;
+    }
+    parent_ = &parent;
+    AddChanged(PaintPropertyChangeType::kChangedOnlyValues);
+    return PaintPropertyChangeType::kChangedOnlyValues;
+  }
+
+  // Parent property node, or nullptr if this is the root node.
+  const PaintPropertyNode* Parent() const { return parent_.get(); }
+
+  // Returns the first node up the parent chain that is not an alias; return the
+  // root node if every node is an alias.
+  const PaintPropertyNode& Unalias() const {
+    const auto* node = this;
+    while (node->Parent() && node->IsParentAlias()) {
+      node = node->Parent();
+    }
+    return *node;
+  }
+
+  const PaintPropertyNode* UnaliasedParent() const {
+    return Parent() ? &Parent()->Unalias() : nullptr;
+  }
+
+  bool IsAncestorOf(const PaintPropertyNode& other) const {
+    for (const auto* node = &other; node != this; node = node->Parent()) {
+      if (!node) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  const PaintPropertyNode& LowestCommonAncestor(
+      const PaintPropertyNode& other) const {
+    // Fast path of common cases.
+    if (this == &other || !Parent() || other.Parent() == this) {
+      DCHECK(IsAncestorOf(other));
+      return *this;
+    }
+    if (!other.Parent() || Parent() == &other) {
+      DCHECK(other.IsAncestorOf(*this));
+      return other;
+    }
+    return LowestCommonAncestorInternal(other);
+  }
+
+  virtual void AddChanged(PaintPropertyChangeType changed) {
     DCHECK(!IsRoot());
     changed_ = std::max(changed_, changed);
   }
@@ -235,24 +214,15 @@
 
   int ChangedSequenceNumber() const { return changed_sequence_number_; }
 
-  std::unique_ptr<JSONObject> ToJSONBase() const {
-    auto json = std::make_unique<JSONObject>();
-    json->SetString("this", String::Format("%p", this));
-    if (Parent()) {
-      json->SetString("parent", String::Format("%p", Parent()));
-    }
-    if (IsParentAlias()) {
-      json->SetBoolean("is_alias", true);
-    }
-    if (NodeChanged() != PaintPropertyChangeType::kUnchanged) {
-      json->SetString("changed",
-                      PaintPropertyChangeTypeToString(NodeChanged()));
-    }
-    return json;
-  }
-
  private:
   friend class PaintPropertyNodeTest;
+  friend class PropertyTreePrinter;
+
+  // Returns -1 if `maybe_ancestor` is found in the ancestor chain, or returns
+  // the depth of the node from the root.
+  int NodeDepthOrFoundAncestor(const PaintPropertyNode& maybe_ancestor) const;
+  const PaintPropertyNode& LowestCommonAncestorInternal(
+      const PaintPropertyNode& other) const;
 
   // Indicates whether this node is an alias for its parent. Parent aliases are
   // nodes that do not affect rendering and are ignored for the purposes of
@@ -275,79 +245,72 @@
   mutable int cc_node_id_ = cc::kInvalidPropertyNodeId;
   mutable int cc_sequence_number_ = 0;
 
-  scoped_refptr<const NodeTypeOrAlias> parent_;
+  scoped_refptr<const PaintPropertyNode> parent_;
 
 #if DCHECK_IS_ON()
   String debug_name_;
 #endif
 };
 
+template <typename NodeTypeOrAlias, typename NodeType>
+class PaintPropertyNodeBase : public PaintPropertyNode {
+ public:
+  PaintPropertyChangeType SetParent(const NodeTypeOrAlias& parent) {
+    return PaintPropertyNode::SetParent(parent);
+  }
+
+  const NodeTypeOrAlias* Parent() const {
+    return static_cast<const NodeTypeOrAlias*>(PaintPropertyNode::Parent());
+  }
+
+  const NodeType& Unalias() const {
+    return static_cast<const NodeType&>(PaintPropertyNode::Unalias());
+  }
+
+  const NodeType* UnaliasedParent() const {
+    return static_cast<const NodeType*>(PaintPropertyNode::UnaliasedParent());
+  }
+
+  bool IsAncestorOf(const NodeTypeOrAlias& other) const {
+    return PaintPropertyNode::IsAncestorOf(other);
+  }
+
+  const NodeTypeOrAlias& LowestCommonAncestor(
+      const NodeTypeOrAlias& other) const {
+    return static_cast<const NodeTypeOrAlias&>(
+        PaintPropertyNode::LowestCommonAncestor(other));
+  }
+
+ protected:
+  explicit PaintPropertyNodeBase(const NodeTypeOrAlias* parent)
+      : PaintPropertyNode(parent) {}
+  PaintPropertyNodeBase(const NodeTypeOrAlias& parent, ParentAliasTag tag)
+      : PaintPropertyNode(parent, tag) {}
+};
+
 #if DCHECK_IS_ON()
 
-template <typename NodeType>
-class PropertyTreePrinter {
+class PLATFORM_EXPORT PropertyTreePrinter {
   STACK_ALLOCATED();
 
  public:
-  void AddNode(const NodeType* node) {
-    if (node)
-      nodes_.insert(node);
-  }
-
-  String NodesAsTreeString() {
-    if (nodes_.empty())
-      return "";
-    StringBuilder string_builder;
-    BuildTreeString(string_builder, RootNode(), 0);
-    return string_builder.ToString();
-  }
-
-  String PathAsString(const NodeType& last_node) {
-    for (const auto* n = &last_node; n; n = n->Parent())
-      AddNode(n);
-    return NodesAsTreeString();
-  }
+  void AddNode(const PaintPropertyNode* node);
+  String NodesAsTreeString();
+  String PathAsString(const PaintPropertyNode& last_node);
 
  private:
   void BuildTreeString(StringBuilder& string_builder,
-                       const NodeType& node,
-                       unsigned indent) {
-    for (unsigned i = 0; i < indent; i++)
-      string_builder.Append(' ');
-    string_builder.Append(node.ToString());
-    string_builder.Append("\n");
+                       const PaintPropertyNode& node,
+                       unsigned indent);
+  const PaintPropertyNode& RootNode();
 
-    for (const auto* child_node : nodes_) {
-      if (child_node->Parent() == &node)
-        BuildTreeString(string_builder, *child_node, indent + 2);
-    }
-  }
-
-  const NodeType& RootNode() {
-    const auto* node = nodes_.back();
-    while (!node->IsRoot())
-      node = node->Parent();
-    if (node->DebugName().empty())
-      const_cast<NodeType*>(node)->SetDebugName("root");
-    nodes_.insert(node);
-    return *node;
-  }
-
-  LinkedHashSet<const NodeType*> nodes_;
+  LinkedHashSet<const PaintPropertyNode*> nodes_;
 };
 
-template <typename NodeTypeOrAlias, typename NodeType>
-String PaintPropertyNode<NodeTypeOrAlias, NodeType>::ToTreeString() const {
-  return PropertyTreePrinter<NodeTypeOrAlias>().PathAsString(
-      *static_cast<const NodeTypeOrAlias*>(this));
-}
-
 #endif  // DCHECK_IS_ON()
 
-template <typename NodeTypeOrAlias, typename NodeType>
-std::ostream& operator<<(
-    std::ostream& os,
-    const PaintPropertyNode<NodeTypeOrAlias, NodeType>& node) {
+inline std::ostream& operator<<(std::ostream& os,
+                                const PaintPropertyNode& node) {
   return os << node.ToString().Utf8();
 }
 
diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.cc b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.cc
index 2be4e51..fb7b65e 100644
--- a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.cc
+++ b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.cc
@@ -4,7 +4,8 @@
 
 #include "third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h"
 
-#include "third_party/blink/renderer/platform/geometry/layout_rect.h"
+#include "third_party/blink/renderer/platform/geometry/infinite_int_rect.h"
+#include "third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.h"
 
 namespace blink {
 
@@ -56,7 +57,7 @@
 }
 
 std::unique_ptr<JSONObject> ScrollPaintPropertyNode::ToJSON() const {
-  auto json = ToJSONBase();
+  auto json = PaintPropertyNode::ToJSON();
   if (!state_.container_rect.IsEmpty())
     json->SetString("containerRect", String(state_.container_rect.ToString()));
   if (!state_.contents_size.IsEmpty())
diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
index 7d1d310e..a160169 100644
--- a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
+++ b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
@@ -45,9 +45,9 @@
 //
 // The scroll tree differs from the other trees because it does not affect
 // geometry directly.
-class PLATFORM_EXPORT ScrollPaintPropertyNode
-    : public PaintPropertyNode<ScrollPaintPropertyNode,
-                               ScrollPaintPropertyNode> {
+class PLATFORM_EXPORT ScrollPaintPropertyNode final
+    : public PaintPropertyNodeBase<ScrollPaintPropertyNode,
+                                   ScrollPaintPropertyNode> {
  public:
   // To make it less verbose and more readable to construct and update a node,
   // a struct with default values is used to represent the state.
@@ -93,12 +93,6 @@
     return base::AdoptRef(
         new ScrollPaintPropertyNode(&parent, std::move(state)));
   }
-  static scoped_refptr<ScrollPaintPropertyNode> CreateAlias(
-      const ScrollPaintPropertyNode&) {
-    // ScrollPaintPropertyNodes cannot be aliases.
-    NOTREACHED();
-    return nullptr;
-  }
 
   // The empty AnimationState struct is to meet the requirement of
   // ObjectPaintProperties.
@@ -181,11 +175,11 @@
     return state_.compositor_element_id;
   }
 
-  std::unique_ptr<JSONObject> ToJSON() const;
+  std::unique_ptr<JSONObject> ToJSON() const final;
 
  private:
   ScrollPaintPropertyNode(const ScrollPaintPropertyNode* parent, State&& state)
-      : PaintPropertyNode(parent), state_(std::move(state)) {
+      : PaintPropertyNodeBase(parent), state_(std::move(state)) {
     Validate();
   }
 
diff --git a/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.cc b/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.cc
index 10ada4c..4cc7076 100644
--- a/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.cc
+++ b/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.cc
@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h"
 
 #include "base/memory/values_equivalent.h"
+#include "third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/transforms/affine_transform.h"
 
@@ -153,7 +154,7 @@
 }
 
 std::unique_ptr<JSONObject> TransformPaintPropertyNode::ToJSON() const {
-  auto json = ToJSONBase();
+  auto json = TransformPaintPropertyNodeOrAlias::ToJSON();
   if (IsIdentityOr2dTranslation()) {
     if (!Get2dTranslation().IsZero())
       json->SetString("translation2d", String(Get2dTranslation().ToString()));
diff --git a/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h
index dbad167..7cb56c9 100644
--- a/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h
+++ b/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h
@@ -37,8 +37,8 @@
 class TransformPaintPropertyNode;
 
 class PLATFORM_EXPORT TransformPaintPropertyNodeOrAlias
-    : public PaintPropertyNode<TransformPaintPropertyNodeOrAlias,
-                               TransformPaintPropertyNode> {
+    : public PaintPropertyNodeBase<TransformPaintPropertyNodeOrAlias,
+                                   TransformPaintPropertyNode> {
  public:
   // If |relative_to_node| is an ancestor of |this|, returns true if any node is
   // marked changed, at least significance of |change|, along the path from
@@ -47,7 +47,7 @@
   bool Changed(PaintPropertyChangeType change,
                const TransformPaintPropertyNodeOrAlias& relative_to_node) const;
 
-  void AddChanged(PaintPropertyChangeType changed) {
+  void AddChanged(PaintPropertyChangeType changed) final {
     DCHECK_NE(PaintPropertyChangeType::kUnchanged, changed);
     GeometryMapperTransformCache::ClearCache();
     GeometryMapperClipCache::ClearCache();
@@ -55,10 +55,10 @@
   }
 
  protected:
-  using PaintPropertyNode::PaintPropertyNode;
+  using PaintPropertyNodeBase::PaintPropertyNodeBase;
 };
 
-class TransformPaintPropertyNodeAlias
+class TransformPaintPropertyNodeAlias final
     : public TransformPaintPropertyNodeOrAlias {
  public:
   static scoped_refptr<TransformPaintPropertyNodeAlias> Create(
@@ -72,7 +72,7 @@
       : TransformPaintPropertyNodeOrAlias(parent, kParentAlias) {}
 };
 
-class PLATFORM_EXPORT TransformPaintPropertyNode
+class PLATFORM_EXPORT TransformPaintPropertyNode final
     : public TransformPaintPropertyNodeOrAlias {
  public:
   enum class BackfaceVisibility : unsigned char {
@@ -373,12 +373,9 @@
 
   bool IsForSVGChild() const { return state_.is_for_svg_child; }
 
-  std::unique_ptr<JSONObject> ToJSON() const;
+  std::unique_ptr<JSONObject> ToJSON() const final;
 
  private:
-  friend class PaintPropertyNode<TransformPaintPropertyNodeOrAlias,
-                                 TransformPaintPropertyNode>;
-
   TransformPaintPropertyNode(const TransformPaintPropertyNodeOrAlias* parent,
                              State&& state)
       : TransformPaintPropertyNodeOrAlias(parent), state_(std::move(state)) {
diff --git a/third_party/blink/renderer/platform/heap/BUILD.gn b/third_party/blink/renderer/platform/heap/BUILD.gn
index 17af8d5ae..9f7789d 100644
--- a/third_party/blink/renderer/platform/heap/BUILD.gn
+++ b/third_party/blink/renderer/platform/heap/BUILD.gn
@@ -53,6 +53,7 @@
     "forward.h",
     "garbage_collected.h",
     "heap_allocator_impl.h",
+    "heap_barrier_callback.h",
     "heap_traits.h",
     "member.h",
     "persistent.h",
diff --git a/third_party/blink/renderer/platform/heap/heap_barrier_callback.h b/third_party/blink/renderer/platform/heap/heap_barrier_callback.h
new file mode 100644
index 0000000..fa629c6
--- /dev/null
+++ b/third_party/blink/renderer/platform/heap/heap_barrier_callback.h
@@ -0,0 +1,86 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_BARRIER_CALLBACK_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_BARRIER_CALLBACK_H_
+
+#include <concepts>
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+#include "base/check.h"
+#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
+#include "base/template_util.h"
+#include "base/thread_annotations.h"
+#include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h"
+
+namespace blink {
+
+namespace internal {
+
+template <typename T, typename DoneArg>
+class BarrierCallbackInfo {
+ public:
+  BarrierCallbackInfo(wtf_size_t num_callbacks,
+                      base::OnceCallback<void(DoneArg)> done_callback)
+      : num_callbacks_left_(num_callbacks),
+        results_(MakeGarbageCollected<HeapVector<Member<T>>>()),
+        done_callback_(std::move(done_callback)) {
+    results_->reserve(num_callbacks);
+  }
+
+  void Run(T* t) {
+    DCHECK_NE(num_callbacks_left_, 0U);
+    results_->push_back(std::move(t));
+    --num_callbacks_left_;
+
+    if (num_callbacks_left_ == 0) {
+      std::move(done_callback_).Run(*results_.Get());
+    }
+  }
+
+ private:
+  wtf_size_t num_callbacks_left_;
+  Persistent<HeapVector<Member<T>>> results_;
+  base::OnceCallback<void(DoneArg)> done_callback_;
+};
+
+template <typename T>
+void ShouldNeverRun(T t) {
+  CHECK(false);
+}
+
+}  // namespace internal
+
+// This is a near-copy of base/barrier_callback.h, except that it is stores
+// the result in a HeapVector so that the results can be GarbageCollected
+// objects.
+template <typename T,
+          typename RawArg = std::remove_cvref_t<T>,
+          typename DoneArg = HeapVector<Member<RawArg>>,
+          template <typename>
+          class CallbackType>
+  requires(
+      std::same_as<HeapVector<Member<RawArg>>, std::remove_cvref_t<DoneArg>>)
+base::RepeatingCallback<void(T*)> HeapBarrierCallback(
+    wtf_size_t num_callbacks,
+    CallbackType<void(DoneArg)> done_callback) {
+  if (num_callbacks == 0) {
+    std::move(done_callback).Run(HeapVector<Member<RawArg>>());
+    return base::BindRepeating(&internal::ShouldNeverRun<T*>);
+  }
+
+  return base::BindRepeating(
+      &internal::BarrierCallbackInfo<T, DoneArg>::Run,
+      std::make_unique<internal::BarrierCallbackInfo<T, DoneArg>>(
+          num_callbacks, std::move(done_callback)));
+}
+
+}  // namespace blink
+
+#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_BARRIER_CALLBACK_H_
diff --git a/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer.cc b/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer.cc
index 93f6256f5..77a2df7 100644
--- a/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer.cc
@@ -20,15 +20,6 @@
 
 // static
 BufferingBytesConsumer* BufferingBytesConsumer::CreateWithDelay(
-    BytesConsumer* bytes_consumer) {
-  return MakeGarbageCollected<BufferingBytesConsumer>(
-      base::PassKey<BufferingBytesConsumer>(), bytes_consumer,
-      base::SingleThreadTaskRunner::GetCurrentDefault(),
-      base::Milliseconds(kDelayMilliseconds));
-}
-
-// static
-BufferingBytesConsumer* BufferingBytesConsumer::CreateWithDelayForTest(
     BytesConsumer* bytes_consumer,
     scoped_refptr<base::SingleThreadTaskRunner> timer_task_runner) {
   return MakeGarbageCollected<BufferingBytesConsumer>(
@@ -53,7 +44,6 @@
       timer_(std::move(timer_task_runner),
              this,
              &BufferingBytesConsumer::OnTimerFired) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   bytes_consumer_->SetClient(this);
   if (buffering_start_delay.is_zero()) {
     MaybeStartBuffering();
@@ -65,7 +55,6 @@
 BufferingBytesConsumer::~BufferingBytesConsumer() = default;
 
 void BufferingBytesConsumer::MaybeStartBuffering() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (buffering_state_ != BufferingState::kDelayed)
     return;
   timer_.Stop();
@@ -74,14 +63,12 @@
 }
 
 void BufferingBytesConsumer::StopBuffering() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   timer_.Stop();
   buffering_state_ = BufferingState::kStopped;
 }
 
 BytesConsumer::Result BufferingBytesConsumer::BeginRead(const char** buffer,
                                                         size_t* available) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   // Stop delaying buffering on the first read as it will no longer be safe to
   // drain the underlying |bytes_consumer_| anyway.
   MaybeStartBuffering();
@@ -114,7 +101,6 @@
 }
 
 BytesConsumer::Result BufferingBytesConsumer::EndRead(size_t read_size) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (buffer_.empty()) {
     if (buffering_state_ != BufferingState::kStarted)
       return bytes_consumer_->EndRead(read_size);
@@ -144,17 +130,14 @@
 
 scoped_refptr<BlobDataHandle> BufferingBytesConsumer::DrainAsBlobDataHandle(
     BlobSizePolicy policy) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return bytes_consumer_->DrainAsBlobDataHandle(policy);
 }
 
 scoped_refptr<EncodedFormData> BufferingBytesConsumer::DrainAsFormData() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return bytes_consumer_->DrainAsFormData();
 }
 
 mojo::ScopedDataPipeConsumerHandle BufferingBytesConsumer::DrainAsDataPipe() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (buffering_state_ != BufferingState::kStarted)
     return bytes_consumer_->DrainAsDataPipe();
 
@@ -174,25 +157,21 @@
 }
 
 void BufferingBytesConsumer::Cancel() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   ClearClient();
   bytes_consumer_->Cancel();
 }
 
 BytesConsumer::PublicState BufferingBytesConsumer::GetPublicState() const {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (buffer_.empty())
     return bytes_consumer_->GetPublicState();
   return PublicState::kReadableOrWaiting;
 }
 
 BytesConsumer::Error BufferingBytesConsumer::GetError() const {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return bytes_consumer_->GetError();
 }
 
 String BufferingBytesConsumer::DebugName() const {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   StringBuilder builder;
   builder.Append("BufferingBytesConsumer(");
   builder.Append(bytes_consumer_->DebugName());
@@ -210,7 +189,6 @@
 }
 
 void BufferingBytesConsumer::OnTimerFired(TimerBase*) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   MaybeStartBuffering();
 }
 
diff --git a/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer.h b/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer.h
index db43a83a..612433ee 100644
--- a/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer.h
+++ b/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer.h
@@ -34,10 +34,7 @@
   // opportunity for the data to be drained before buffering begins. The
   // |bytes_consumer| is the original BytesConsumer. |bytes_consumer| must
   // not have a client.
-  static BufferingBytesConsumer* CreateWithDelay(BytesConsumer* bytes_consumer);
-
-  // CreateWithDelay() that allows setting |timer_task_runner| for test.
-  static BufferingBytesConsumer* CreateWithDelayForTest(
+  static BufferingBytesConsumer* CreateWithDelay(
       BytesConsumer* bytes_consumer,
       scoped_refptr<base::SingleThreadTaskRunner> timer_task_runner);
 
diff --git a/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer_test.cc b/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer_test.cc
index 86f273a7e..75dafc3 100644
--- a/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer_test.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer_test.cc
@@ -82,7 +82,7 @@
   replaying_bytes_consumer->Add(Command(Command::kData, "8"));
   replaying_bytes_consumer->Add(Command(Command::kDone));
 
-  auto* bytes_consumer = BufferingBytesConsumer::CreateWithDelayForTest(
+  auto* bytes_consumer = BufferingBytesConsumer::CreateWithDelay(
       replaying_bytes_consumer,
       scheduler::GetSingleThreadTaskRunnerForTesting());
 
@@ -150,7 +150,7 @@
   replaying_bytes_consumer->Add(Command(Command::kData, "8"));
   replaying_bytes_consumer->Add(Command(Command::kDone));
 
-  auto* bytes_consumer = BufferingBytesConsumer::CreateWithDelayForTest(
+  auto* bytes_consumer = BufferingBytesConsumer::CreateWithDelay(
       replaying_bytes_consumer,
       scheduler::GetSingleThreadTaskRunnerForTesting());
 
@@ -239,7 +239,7 @@
       MakeGarbageCollected<DataPipeBytesConsumer>(task_runner, MakeDataPipe(),
                                                   &notifier);
 
-  auto* bytes_consumer = BufferingBytesConsumer::CreateWithDelayForTest(
+  auto* bytes_consumer = BufferingBytesConsumer::CreateWithDelay(
       data_pipe_consumer, scheduler::GetSingleThreadTaskRunnerForTesting());
 
   EXPECT_EQ(PublicState::kReadableOrWaiting, bytes_consumer->GetPublicState());
@@ -255,7 +255,7 @@
       MakeGarbageCollected<DataPipeBytesConsumer>(task_runner, MakeDataPipe(),
                                                   &notifier);
 
-  auto* bytes_consumer = BufferingBytesConsumer::CreateWithDelayForTest(
+  auto* bytes_consumer = BufferingBytesConsumer::CreateWithDelay(
       data_pipe_consumer, scheduler::GetSingleThreadTaskRunnerForTesting());
 
   task_environment_.FastForwardBy(base::Milliseconds(51));
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 01fe459d..3a068e0c 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -589,7 +589,7 @@
     },
     {
       name: "ClipboardSvg",
-      status: "experimental",
+      status: "stable",
     },
     {
       name: "ClipboardUnsanitizedContent",
@@ -2487,12 +2487,6 @@
       name: "NoIdleEncodingForWebTests",
       status: "test",
     },
-    // Doesn't increase the end offset on getting the range for a new line
-    // character. See https://crbug.com/326888905
-    {
-      name: "NoIncreasingEndOffsetOnSplittingTextNodes",
-      status: "stable",
-    },
     // Makes enter/leave Mouse and Pointer Events non-composed as per
     // corresponding specifications.
     {
@@ -3889,7 +3883,7 @@
       // Makes the global root scrollbars follow the preferred color scheme
       // by default. Please see more details: crbug.com/1423087.
       name: "UsedColorSchemeRootScrollbars",
-      status: "test",
+      status: "experimental",
     },
     {
       name: "UserActivationSameOriginVisibility",
diff --git a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
index d41d7ba..adeecda 100755
--- a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
+++ b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
@@ -1477,6 +1477,7 @@
             'viz::RasterContextProvider',
             'viz::ReleaseCallback',
             'media::.+',
+            'libgav1::.+',
             'libyuv::.+',
         ]
     },
diff --git a/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials b/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials
index d4d2442..6f6fd9d 100644
--- a/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials
+++ b/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials
@@ -82,6 +82,7 @@
 crbug.com/1209223 [ Linux ] external/wpt/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-same-origin-domain.sub.html [ Failure ]
 
 # ====== New tests from wpt-importer added here ======
+crbug.com/626703 external/wpt/webnn/conformance_tests/gpu/prelu.https.any.html [ Crash ]
 crbug.com/626703 virtual/fedcm-login-status/external/wpt/credential-management/fedcm-login-status/confirm-idp-login.https.html [ Timeout ]
 crbug.com/626703 virtual/fedcm-multi-idp/external/wpt/credential-management/fedcm-multi-idp/single-get-before-onload.https.html [ Timeout ]
 crbug.com/626703 external/wpt/clipboard-apis/async-navigator-clipboard-write-multiple.tentative.https.sub.html [ Timeout ]
diff --git a/third_party/blink/web_tests/FlagExpectations/enable-skia-graphite b/third_party/blink/web_tests/FlagExpectations/enable-skia-graphite
index fd4af71..7cb4338 100644
--- a/third_party/blink/web_tests/FlagExpectations/enable-skia-graphite
+++ b/third_party/blink/web_tests/FlagExpectations/enable-skia-graphite
@@ -31,6 +31,21 @@
 crbug.com/1518086 external/wpt/html/semantics/embedded-content/media-elements/ready-states/autoplay-hidden.optional.html [ Failure ]
 
 # ====== New tests from wpt-importer added here ======
+crbug.com/626703 virtual/view-transition-mpa-serialization/external/wpt/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-new.html [ Failure ]
+crbug.com/626703 virtual/view-transition-mpa-serialization/external/wpt/css/css-view-transitions/new-content-container-writing-modes.html [ Failure ]
+crbug.com/626703 virtual/view-transition-mpa-serialization/external/wpt/css/css-view-transitions/new-content-element-writing-modes.html [ Failure ]
+crbug.com/626703 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/new-content-captures-clip-path.html [ Failure ]
+crbug.com/626703 virtual/view-transition/external/wpt/css/css-view-transitions/new-and-old-sizes-match.html [ Failure ]
+crbug.com/626703 external/wpt/webnn/conformance_tests/gpu/constant.https.any.worker.html [ Crash Failure ]
+crbug.com/626703 external/wpt/webnn/conformance_tests/gpu/expand.https.any.html [ Crash ]
+crbug.com/626703 external/wpt/webnn/conformance_tests/gpu/pad.https.any.worker.html [ Crash ]
+crbug.com/626703 external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker.html [ Crash Failure ]
+crbug.com/626703 external/wpt/webnn/conformance_tests/gpu/prelu.https.any.worker.html [ Crash Failure ]
+crbug.com/626703 virtual/view-transition-mpa-serialization/external/wpt/css/css-view-transitions/clip-path-larger-than-border-box-on-child-of-named-element.html [ Failure ]
+crbug.com/626703 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/clip-path-larger-than-border-box-on-child-of-named-element.html [ Failure ]
+crbug.com/626703 virtual/view-transition/external/wpt/css/css-view-transitions/clip-path-larger-than-border-box-on-child-of-named-element.html [ Failure ]
+crbug.com/626703 virtual/view-transition/external/wpt/css/css-view-transitions/pseudo-with-classes-match-ident.html [ Failure ]
+crbug.com/626703 virtual/view-transition/external/wpt/css/css-view-transitions/span-with-overflowing-text-hidden.html [ Failure ]
 crbug.com/626703 virtual/composite-clip-path-animation/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-fixed-position.html [ Failure ]
 crbug.com/626703 virtual/view-transition-mpa-serialization/external/wpt/css/css-view-transitions/set-current-time.html [ Failure ]
 crbug.com/626703 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/new-content-element-writing-modes.html [ Failure ]
diff --git a/third_party/blink/web_tests/MSANExpectations b/third_party/blink/web_tests/MSANExpectations
index 8a4b7371..2f7b31c 100644
--- a/third_party/blink/web_tests/MSANExpectations
+++ b/third_party/blink/web_tests/MSANExpectations
@@ -113,3 +113,6 @@
 
 
 crbug.com/1457275 [ Linux ] external/wpt/dom/ranges/Range-surroundContents.html [ Skip ]
+
+# Sheriff 2024-02-28
+crbug.com/326356909 [ Linux ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/* [ Crash ]
diff --git a/third_party/blink/web_tests/NeverFixTests b/third_party/blink/web_tests/NeverFixTests
index 9f1c887..5cc81f2 100644
--- a/third_party/blink/web_tests/NeverFixTests
+++ b/third_party/blink/web_tests/NeverFixTests
@@ -2117,7 +2117,7 @@
 crbug.com/1517744 external/wpt/wai-aria/role/tree-roles.html [ Skip ]
 
 # WebNN GPU backend is supported on Win11 by default.
-crbug.com/1500120 [ Win10.20h2 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/* [ Skip ]
+crbug.com/1500120 [ Win10.20h2 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/* [ Skip ]
 
 ######## Unload Deprecation
 # This is for tests in the "unload-allowed" virtual suite that
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index 9a057fd..a03072bc 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -459,8 +459,10 @@
 crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=normal&right-white-space=pre-wrap [ Failure ]
 crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=nowrap&right-white-space=normal [ Failure ]
 crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=nowrap&right-white-space=pre [ Failure ]
+crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=nowrap&right-white-space=pre-wrap [ Failure ]
 crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre&right-white-space=normal [ Failure ]
 crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre&right-white-space=nowrap [ Failure ]
+crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre&right-white-space=pre-line [ Failure ]
 crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre&right-white-space=pre-wrap [ Failure ]
 crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-line&right-white-space=normal [ Failure ]
 crbug.com/1370704 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-line&right-white-space=pre-wrap [ Failure ]
@@ -2619,19 +2621,7 @@
 crbug.com/626703 external/wpt/css/css-page/page-name-unnamed-trailing-001-print.html [ Crash Failure ]
 
 # These tests generate baselines whose names are too long.
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=span* [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=normal&display=block&command=insertParagraph [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=normal&display=block&command=insertText [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=normal&display=inline&command=insertParagraph [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=normal&display=inline&command=insertText [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=normal&display=inline-block&command=insertParagraph [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=normal&display=inline-block&command=insertText [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=pre&display=block&command=insertParagraph [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=pre&display=block&command=insertText [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=pre-line&display=block&command=insertParagraph [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=pre-line&display=block&command=insertText [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=pre-wrap&display=block&command=insertParagraph [ Failure ]
-crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html?host=p&white-space=pre-wrap&display=block&command=insertText [ Failure ]
+crbug.com/626703 external/wpt/editing/other/insertparagraph-in-editing-host-cannot-have-div.tentative.html* [ Failure ]
 
 # Flaky output (https://crrev.com/c/5228398)
 crbug.com/626703 [ Mac ] external/wpt/mediacapture-insertable-streams/tentative/MediaStreamTrackProcessor-backpressure.https.html [ Failure ]
@@ -2642,6 +2632,27 @@
 crbug.com/626703 external/wpt/uievents/mouse/mouse_boundary_events_after_removing_last_over_element.html [ Failure ]
 
 # ====== New tests from wpt-importer added here ======
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/batch_normalization.https.any.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/batch_normalization.https.any.worker.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.worker.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.html [ Crash ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.worker.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gemm.https.any.html [ Crash ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gemm.https.any.worker.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/instance_normalization.https.any.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/instance_normalization.https.any.worker.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/layer_normalization.https.any.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/layer_normalization.https.any.worker.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any.worker.html [ Crash ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker.html [ Crash Timeout ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reduction.https.any.html [ Crash ]
+crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reduction.https.any.worker.html [ Crash Timeout ]
+crbug.com/626703 [ Mac12-arm64 ] external/wpt/css/css-pseudo/text-selection.html [ Timeout ]
+crbug.com/626703 external/wpt/quirks/line-height-preserved-segment-break.html [ Failure ]
+crbug.com/626703 [ Win11-arm64 ] virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/smooth-scroll-in-load-event.html [ Failure Timeout ]
 crbug.com/626703 external/wpt/css/CSS2/cascade-import/cascade-import-001.xht [ Failure ]
 crbug.com/626703 external/wpt/svg/render/order/z-index.svg [ Failure ]
 crbug.com/626703 external/wpt/svg/styling/color-inherit-link-visited.svg [ Failure ]
@@ -2654,6 +2665,7 @@
 crbug.com/626703 [ Win11-arm64 ] virtual/fenced-frame-mparch/external/wpt/fenced-frame/resolve-to-config-promise.https.html [ Timeout ]
 crbug.com/626703 [ Win11-arm64 ] virtual/shared-storage-fenced-frame-mparch-selecturl-limit/external/wpt/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-sites.tentative.https.sub.html [ Timeout ]
 crbug.com/626703 [ Win11-arm64 ] external/wpt/html/cross-origin-embedder-policy/credentialless/fetch.https.window.html [ Timeout ]
+crbug.com/626703 [ Mac12 ] external/wpt/webtransport/echo-large-bidirectional-streams.https.any.worker.html [ Timeout ]
 crbug.com/626703 [ Win11-arm64 ] external/wpt/webtransport/echo-large-bidirectional-streams.https.any.worker.html [ Timeout ]
 crbug.com/626703 [ Win11-arm64 ] virtual/shared-storage-fenced-frame-mparch/external/wpt/shared-storage/shared-storage-writable-service-worker-fetch.tentative.https.sub.html [ Failure Timeout ]
 crbug.com/626703 external/wpt/css/css-backgrounds/background-position-negative-percentage-comparison-002.html [ Failure ]
@@ -2662,24 +2674,6 @@
 crbug.com/626703 [ Win11-arm64 ] external/wpt/webtransport/echo-large-bidirectional-streams.https.any.sharedworker.html [ Timeout ]
 crbug.com/626703 [ Win11-arm64 ] virtual/fenced-frame-mparch/external/wpt/fenced-frame/frame-navigation.https.html [ Timeout ]
 crbug.com/626703 [ Win11-arm64 ] virtual/pna-workers-disabled/external/wpt/fetch/private-network-access/redirect.tentative.https.window.html [ Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/batch_normalization.https.any.html [ Crash ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/batch_normalization.https.any.worker.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any.worker.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any.html [ Crash ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any.worker.html [ Crash ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/gemm.https.any.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/gemm.https.any.worker.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/instance_normalization.https.any.html [ Crash ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/instance_normalization.https.any.worker.html [ Crash ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/layer_normalization.https.any.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/layer_normalization.https.any.worker.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any.worker.html [ Crash ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any.worker.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/reduction.https.any.html [ Crash Timeout ]
-crbug.com/626703 [ Win11-arm64 ] virtual/webnn-service-enabled/external/wpt/webnn/gpu/reduction.https.any.worker.html [ Crash Timeout ]
 crbug.com/626703 external/wpt/mathml/relations/html5-tree/href-click-001.tentative.html [ Failure ]
 crbug.com/626703 external/wpt/mathml/relations/html5-tree/href-click-002.tentative.html [ Failure ]
 crbug.com/626703 external/wpt/mathml/relations/html5-tree/link-color-001.tentative.html [ Failure ]
@@ -2702,8 +2696,8 @@
 crbug.com/626703 external/wpt/html/rendering/widgets/button-layout/input-type-button-clip.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-text/text-justify/text-justify-word-separators.html [ Failure ]
 crbug.com/626703 external/wpt/svg/pservers/reftests/gradient-color-interpolation.svg [ Failure ]
-crbug.com/626703 virtual/webnn-service-enabled/external/wpt/webnn/gpu/arg_min_max.https.any.html [ Skip Timeout ]
-crbug.com/626703 virtual/webnn-service-enabled/external/wpt/webnn/gpu/arg_min_max.https.any.worker.html [ Crash ]
+crbug.com/626703 virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/arg_min_max.https.any.html [ Skip Timeout ]
+crbug.com/626703 virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/arg_min_max.https.any.worker.html [ Crash ]
 crbug.com/626703 external/wpt/css/css-page/page-orientation-on-landscape-001-print.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-page/page-orientation-on-portrait-001-print.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-page/page-orientation-on-square-001-print.html [ Failure ]
@@ -2711,8 +2705,8 @@
 crbug.com/626703 external/wpt/css/css-transforms/transform-box/svgbox-stroke-box-004.html [ Failure ]
 crbug.com/626703 virtual/backface-visibility-interop/external/wpt/css/css-transforms/transform-box/svgbox-stroke-box-003.html [ Failure ]
 crbug.com/626703 virtual/backface-visibility-interop/external/wpt/css/css-transforms/transform-box/svgbox-stroke-box-004.html [ Failure ]
-crbug.com/626703 external/wpt/webnn/elementwise_logical.https.any.worker.html [ Skip Timeout ]
-crbug.com/626703 virtual/webnn-service-enabled/external/wpt/webnn/gpu/elementwise_logical.https.any.worker.html [ Skip Timeout ]
+crbug.com/626703 external/wpt/webnn/conformance_tests/elementwise_logical.https.any.worker.html [ Skip Timeout ]
+crbug.com/626703 virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elementwise_logical.https.any.worker.html [ Skip Timeout ]
 crbug.com/626703 [ Mac ] external/wpt/pointerevents/pointerevent_after_target_appended.html?mouse [ Timeout ]
 crbug.com/626703 external/wpt/css/css-nesting/has-nesting.html [ Failure ]
 crbug.com/626703 [ Release Win11-arm64 ] external/wpt/png/apng/fcTL-blend-source-nearly-transparent.html [ Timeout ]
@@ -6786,10 +6780,10 @@
 # Fix importer 2024-01-12
 crbug.com/626703 external/wpt/webauthn/public-key-credential-to-json.https.window.html [ Failure ]
 crbug.com/626703 external/wpt/clipboard-apis/async-promise-write-blobs-read-blobs.https.html [ Failure Pass ]
-crbug.com/1519053 external/wpt/webnn/pad.https.any.html [ Crash Pass ]
-crbug.com/1519053 [ Release Win11-arm64 ] external/wpt/webnn/pad.https.any.worker.html [ Crash Pass ]
-crbug.com/1519053 [ Release Win11-arm64 ] external/wpt/webnn/softmax.https.any.html [ Crash Pass ]
-crbug.com/1519053 [ Release Win11-arm64 ] external/wpt/webnn/softmax.https.any.worker.html [ Crash Pass ]
+crbug.com/1519053 external/wpt/webnn/conformance_tests/pad.https.any.html [ Crash Pass ]
+crbug.com/1519053 [ Release Win11-arm64 ] external/wpt/webnn/conformance_tests/pad.https.any.worker.html [ Crash Pass ]
+crbug.com/1519053 [ Release Win11-arm64 ] external/wpt/webnn/conformance_tests/softmax.https.any.html [ Crash Pass ]
+crbug.com/1519053 [ Release Win11-arm64 ] external/wpt/webnn/conformance_tests/softmax.https.any.worker.html [ Crash Pass ]
 
 # Gardener: 2024-01-19
 crbug.com/1511285 virtual/force-eager/external/wpt/measure-memory/redirect.client.https.window.html [ Skip Timeout ]
@@ -6911,3 +6905,7 @@
 
 # Flaky test on all platforms
 crbug.com/41484244 virtual/shared-storage-fenced-frame-mparch/external/wpt/shared-storage/shared-storage-writable-service-worker-img.tentative.https.sub.html [ Failure Pass Timeout ]
+
+# Gardener 2024-02-29
+crbug.com/327468395 [ Mac12 ] virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/smooth-scroll-in-load-event.html [ Failure ]
+crbug.com/327468397 wpt_internal/dom/abort/abort-signal-memory-tests.https.any.html [ Failure Pass ]
diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites
index b896ee77..30cf3f9 100644
--- a/third_party/blink/web_tests/VirtualTestSuites
+++ b/third_party/blink/web_tests/VirtualTestSuites
@@ -2090,10 +2090,10 @@
     ],
     "exclusive_tests": "ALL",
     "args": [
-      "--enable-features=Prerender2InNewTab,Prerender2AllowActivationInBackground",
+      "--enable-features=Prerender2InNewTab,Prerender2AllowActivationInBackground,LCPTimingPredictorPrerender2",
       "--disable-features=KeepAliveInBrowserMigration"
     ],
-    "owners": ["nhiroki@chromium.org"],
+    "owners": ["nhiroki@chromium.org", "yoichio@chromium.org"],
     "expires": "Jul 1, 2024"
   },
   {
@@ -2570,7 +2570,7 @@
     "prefix": "webnn-service-enabled",
     "platforms": ["Linux", "Win"],
     "bases": [
-      "external/wpt/webnn/gpu"
+      "external/wpt/webnn/conformance_tests/gpu"
     ],
     "exclusive_tests": "ALL",
     "args": ["--use-gpu-in-tests", "--enable-features=WebMachineLearningNeuralNetwork"],
diff --git a/third_party/blink/web_tests/editing/execCommand/indent/indent_pre_with_new_lines.html b/third_party/blink/web_tests/editing/execCommand/indent/indent_pre_with_new_lines.html
deleted file mode 100644
index 77a9300..0000000
--- a/third_party/blink/web_tests/editing/execCommand/indent/indent_pre_with_new_lines.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../assert_selection.js"></script>
-<div id="log"></div>
-<script>
-test(() => {
-  assert_selection(
-    '<div contenteditable style="white-space: pre">^\nHello|</div>',
-    'indent',
-    '<div contenteditable style="white-space: pre"><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">^\nHello|</blockquote></div>');
-}, 'Indent a block that preserves white spaces. The block has texts started with a new line.');
-test(() => {
-  assert_selection(
-    '<div contenteditable style="white-space: pre">^\n<div>Hello|</div></div>',
-    'indent',
-    '<div contenteditable style="white-space: pre"><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">^\n<div>Hello|</div></blockquote></div>');
-}, 'Indent a block that preserves white spaces. The block has a new line text and a div.');
-</script>
diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
index 22accfd..6b3b71cf 100644
--- a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
+++ b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
@@ -7705,6 +7705,13 @@
        {}
       ]
      ],
+     "selection-modify-line-boundary-around-empty-details.html": [
+      "815a819c3367b7441be40b2294c9a2998bfcb632",
+      [
+       null,
+       {}
+      ]
+     ],
      "selection-modify-line-next-to-textarea.html": [
       "b685add01c004885a32e22211acad17843f1d132",
       [
@@ -26015,1702 +26022,6 @@
         {}
        ]
       ],
-      "background-color-001.xht": [
-       "bd952404d74cdd96025fe1fd3403b491b516de7a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-002.xht": [
-       "f9e7e77eac47a308941407034121932a047a3abb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-003.xht": [
-       "d804cddc690acf152bb5a37c9f73f3df0fad850e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-004.xht": [
-       "f08f1a48df9a6857b0348c08b44723703a6c1566",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-004-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-005.xht": [
-       "616339f3f8074e5ebd3f49bf2c948c023eb93d3c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-006.xht": [
-       "137c5917e914a51be5b2e831714da6b32de0bf09",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-007.xht": [
-       "9b0b3e776fa1a5c56a05df675d1a9459576e9b43",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-008.xht": [
-       "ca10f24176bb4c51147df5d31e29acaca4a7eef7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-009.xht": [
-       "3e61aa61ff2dcffe08059807ecd6cc59fd474078",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-010.xht": [
-       "3939ed5260153e7262ead92378946b0907e215c7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-010-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-011.xht": [
-       "a93623083440b38fb4ce141d53cc5fa577acf471",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-012.xht": [
-       "22979cf43f0932c92c279e63a74b849cd2e774c4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-013.xht": [
-       "454cf14c3443d5fc3ef65628f76bc026c80be1db",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-013-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-014.xht": [
-       "8fb0710baea1ecbe7eccdb26dd24c96b80e7e99c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-014-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-015.xht": [
-       "db83e5bccf6bafb098da2addcd458b3658c20785",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-015-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-016.xht": [
-       "362219e26daf9553530a81b2f9d37e7ae90e3275",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-017.xht": [
-       "ea1bace5ab82fd9f3d80e7401f0e7c7f5ad957f8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-018.xht": [
-       "150ed16267e484f1d1bcce703bf2ef18b1f29c24",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-013-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-019.xht": [
-       "5a9863aafaf758134b41110542f7c519ec765469",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-020.xht": [
-       "863be8b6cabfbea8f715414c87adb0c544f27d97",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-020-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-021.xht": [
-       "0a7d39c4a89147d1211e219d1e6ae319c2c5322b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-022.xht": [
-       "3fb3f8a297a67f2f2d3fdc942a69bf569e4b370b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-023.xht": [
-       "703421aa51ff4313e9d15514e00231e0e2bde829",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-013-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-024.xht": [
-       "8bac3c5147bfcc1edeb04ff726a1b59502ccfcba",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-025.xht": [
-       "8a4cb82271b06d57c41faf4af7df6dae66e960e7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-025-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-026.xht": [
-       "7d4ea13bcd76662a5227b5a72bab2358ae3474bc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-026-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-027.xht": [
-       "3aa1c983020b3873fa42eeecfb5cac81a9dd0ce6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-027-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-028.xht": [
-       "1601d98e4091be789270c1fad6fef4377a2524fe",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-028-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-029.xht": [
-       "122fa11fcce7e1a74956fbed1f5e477b1e7bb32e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-029-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-030.xht": [
-       "050ad81401d6037963b8157193b89a7c34de9e51",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-031.xht": [
-       "2f70a07272ed04b5769501f728229bbf5e08a5d0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-032.xht": [
-       "5743e2b8e749541214f71b1982e3e732f286a04e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-032-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-033.xht": [
-       "e6a12193d75fedf25c7c060b56690e7ab394a0ae",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-033-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-034.xht": [
-       "278fcfce84365f8f68da3a609ee03bf3bb7cf9be",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-034-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-035.xht": [
-       "0c8afb3de1f6ee5454496f65e81d273afffcb721",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-035-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-036.xht": [
-       "f9cf11a73b1e39808a4d26c437fd81654273cf0f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-013-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-037.xht": [
-       "32daca17b8270a429fce930834464e9f90024e22",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-037-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-038.xht": [
-       "76d4c9cb1fb4ea275572dca1eb64db21f5c04858",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-038-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-039.xht": [
-       "944c66c62296b466e6eac0245bc03fca8c305b53",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-039-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-040.xht": [
-       "998e8a8902e698818fb206dab15de06c22e3dadd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-040-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-041.xht": [
-       "0ce51cca13bf22f0aa6f9a92891730a73a026894",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-041-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-042.xht": [
-       "e8b3157665d2a04f17d793da13d24d89f892698a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-042-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-043.xht": [
-       "cbc4b0033ae15451576eb3bcea1ffa4dd380ac99",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-043-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-044.xht": [
-       "a115c6d86d46ef64a7adb008fa90a154680a2c84",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-044-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-045.xht": [
-       "4b98028bbaf456564f1d608b04229e44ddb45db2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-045-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-046.xht": [
-       "c32901c8cdaa7ed7d6ed45e102553c0dd007e2d5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-047.xht": [
-       "d02be6a049aa2eac78460c718b4ace828da663dc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-048.xht": [
-       "8b2b528230210417a8d9ad3ba2da87623a8f6f32",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-049.xht": [
-       "df0b832c22b58c536f936c1eb8fbde634d7597f5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-049-020202-ref.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/backgrounds/background-color-049-030303-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-050.xht": [
-       "b202b35f80a1be186fd3650bf394fb29bc004d76",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-051.xht": [
-       "558ec9acc9e19464c021f89410357775d341c5e1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-052.xht": [
-       "f8bc813559dc366a3ac87354dcdff35239b165c0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-053.xht": [
-       "1ea427b28cc9db176364ae97733c9c44a8263d6e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-054.xht": [
-       "27b1ea4d075c915f906f07102a5cdb2d135dbd06",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-054-fcfcfc-ref.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/backgrounds/background-color-054-fdfdfd-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-055.xht": [
-       "d8a148340fbff576ae333f43e03a0c8e57f271b1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-056.xht": [
-       "21eccce3d5d4e1a3b41a52b1e3ee936f64ec3880",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-057.xht": [
-       "5645c50bf549ce45f7d03f18d343be173d87d646",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-058.xht": [
-       "020f3fd2d70813c26035411d60e76e0bf6e87a49",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-059.xht": [
-       "d40c24df756317b2ef2133eccc4270ba91d328ad",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-060.xht": [
-       "99d8156ef3d67667308a62a567402b4013c6f678",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-061.xht": [
-       "b0a262ea5a415c10611684fa1c7bd5936e7859a7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-062.xht": [
-       "17e0cfe63342e692d7fb9522f946787a5a4cec2f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-063.xht": [
-       "ac2a142808c703ed991f54e9f4e12fcc48b045fc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-064.xht": [
-       "e5bff1b70dae46eee542e105dd90e74a3297b33d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-065.xht": [
-       "12118419b89c71721855dfc650b93730947293c3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-066.xht": [
-       "a35205fb832fe85250a1b1002c09d06a4d0c18ff",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-067.xht": [
-       "4f3f9cbc2335f2befaa91c56c053e514f2a72b30",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-068.xht": [
-       "44087395082528bb5ea9e93545d1ae4e4001babe",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-069.xht": [
-       "d8c1a5991c4a48050c45bd232640707b608d86f9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-070.xht": [
-       "5982e24d4b6853de0e721f8ed208c62cd4805e63",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-070-020000-ref.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/backgrounds/background-color-070-030000-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-071.xht": [
-       "2b04f969d7954cb7fcccd11e5debacfcbcb51de9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-072.xht": [
-       "b8d56425199c8818a66dba2bf29abf6838d7c17a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-073.xht": [
-       "3ccae5540b180bda7072b9f755c67812f8a8acd3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-074.xht": [
-       "c37912b9ddfef61c04f8956a2aa65ebf6636c779",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-075.xht": [
-       "0a1bc875f9fe6a8f90165a0753c5debf14a85601",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-075-fc0000-ref.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/backgrounds/background-color-075-fd0000-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-076.xht": [
-       "0dc3c451b11d8a638030b69e244668454432d760",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-077.xht": [
-       "f5a8449a583cea52e0dd393091794549c7cd3c1e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-078.xht": [
-       "4fd825bd7548f061d2e1b991fbba391f79406988",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-079.xht": [
-       "62a6ad79b43bd4d9e8b41a25adf7669a1ecd5dae",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-080.xht": [
-       "e0a77a7e64ddbc938c89eea35ea1278b9337cf0a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-081.xht": [
-       "a558636a550f7233a18292228df80b54962f6222",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-082.xht": [
-       "65dccc485f915239fcf5edc2871f0570088eef7f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-083.xht": [
-       "46a0a56508011ded0fa0df9b088016728bbbd8c8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-084.xht": [
-       "a25685035c6cf6b7c0823bf3776a88dedb089545",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-085.xht": [
-       "e20926d643b2e8d2f27c137f82d2bea923c71062",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-086.xht": [
-       "95ed2890329ec30bb90daa0a2ddafefec54e3c6a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-087.xht": [
-       "3b732620618623299283f47f4e3951f1f9498d56",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-088.xht": [
-       "7a4cadfa70e2369bb0a640de4f6aae0ba64ef614",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-089.xht": [
-       "d21b7fe0c1331f5f830e323381147eed0a047031",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-090.xht": [
-       "59f63dde33b405d2e6dc4ec5e26aff09408368f9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-090-000200-ref.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/backgrounds/background-color-090-000300-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-091.xht": [
-       "2d6ce461887b89258497c7b56bcd5fc90b279071",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-092.xht": [
-       "5c9a4e08a077dd70c496ee2ddc2b4f8e2ceb41cd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-093.xht": [
-       "dae3822cae775b40058544e0dea557a000a603fb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-094.xht": [
-       "a5b31906b88ba67bf5de735b4607e6c24235580a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-095.xht": [
-       "ad19592bb80c2139098d720407a01a6df2075179",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-095-00fc00-ref.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/backgrounds/background-color-095-00fd00-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-096.xht": [
-       "baa9de190cdc59f0ffaba4e3dc2c5b79e873f6eb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-097.xht": [
-       "37d949ac4e9f95511bfacbacafba59f74fdc4d6a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-098.xht": [
-       "7a258faa4c559eb1b14d17b1e09e0ad129f9b89f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-099.xht": [
-       "c13af740a7568e20087dbcec0762d3c3f1c64428",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-100.xht": [
-       "86544845c941afd9b0f834003a8ca2f64fe1055a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-014-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-101.xht": [
-       "7bb78cedf5c4f33665e45d91ca48ad8a2f34bb58",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-102.xht": [
-       "3ae143328deae7d98b85542476a099303bcd6374",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-103.xht": [
-       "93306085ce2b23022caa6043df778fa5237ff67e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-104.xht": [
-       "049f2bbf0858c76601a17be466e21089b22b500c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-105.xht": [
-       "f6847924d037d69739dc3829dbcc3deb15b439ad",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-106.xht": [
-       "9bcabb32d80efcb603dd714b770bfe60b063c86c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-107.xht": [
-       "b690bfd48693f85f6f477de288de997380af7582",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-108.xht": [
-       "14f2e5664ecf9b4ce24564123d569320c4a3d406",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-109.xht": [
-       "224c8285f93d2b69bc624950b04236a15dc29099",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-110.xht": [
-       "1c298ccc97a57b7a2db1740b16b0f7421315c214",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-110-000002-ref.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/backgrounds/background-color-110-000003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-111.xht": [
-       "b1c1d4a347588e5dc515a35a6cb6ee1dcb0945ad",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-112.xht": [
-       "094c0dbcac92d7dc0d58f77a8ddd348f0ec5fa92",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-113.xht": [
-       "b8245d5476f2c9afa9413ffc393b065c540606c7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-114.xht": [
-       "cd27c6e5216d586d74ebc084436a6be72c392487",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-115.xht": [
-       "25903e56b768469c70a3ce7030be533f6d4423da",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-115-0000fc-ref.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/backgrounds/background-color-115-0000fd-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-116.xht": [
-       "db6901457f7e0ab8c9e670290e0aeec7cc912958",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-117.xht": [
-       "75b7f5b93a88216b11291d2ffd1b3f38ad82d024",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-118.xht": [
-       "f97e581e7adb0dcad9387046f326a1303e6c40ea",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-119.xht": [
-       "f70540f3b5ab43d3517925563ffbbba1fc2acbb5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-120.xht": [
-       "f220efe5712ef5a9cda1df6e53d2e08dfd548787",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-121.xht": [
-       "0ef996e7672840df14babe863cc277c367344dce",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-122.xht": [
-       "a244421750ec82a294c416cfc18706ee1085b931",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-123.xht": [
-       "c8a7dd9ccf48219e1cf211abb0b3cbf1b2354832",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-124.xht": [
-       "896f2eb2e00c002683435e59a1a82820ad6f2530",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-125.xht": [
-       "8630cfee44d69433c237124e5a8bc8820f2d31e1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-126.xht": [
-       "4a86576053743c44e13cea952d614eb4cf0fa747",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-127.xht": [
-       "98bc089214e8afe2a5bdc52edc39db4d81361646",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-128.xht": [
-       "b673363127bd6f9c2f4d6901d5e3cb3a708ba3b0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "background-color-129.xht": [
        "a1d79af99a46587d193f7469089e5d5b9dd9b3ff",
        [
@@ -27724,214 +26035,6 @@
         {}
        ]
       ],
-      "background-color-130.xht": [
-       "7373a3f8fb6b0c091758569d231f98db26707305",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-002-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-131.xht": [
-       "942862b0e9972e16f1d20594589a99dee072ed4a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-132.xht": [
-       "898cc691af73d0183573f30cf30fd54b9a8a88e9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-132-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-133.xht": [
-       "06552a649c0b40bb4f3e1bd7823e16178aa45274",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-134.xht": [
-       "08511a73bc5f211a3e012eec16d5dfc3782a9653",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-135.xht": [
-       "64a92f9003fcc32ec4b613d29d31a38e3d961624",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-135-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-136.xht": [
-       "a9aed049195d0765658d81744544a9db42da67cb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-136-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-137.xht": [
-       "a965f8cbd2513284846fcf9139e86e1604b1ca9c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-138.xht": [
-       "e438b2eea3fd0c05160ff18b5ce4cf4cab916382",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-138-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-139.xht": [
-       "28f21aeb18f00ad178127e094b089999976e7538",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-139-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-140.xht": [
-       "40dd3502142480ef09b60600f0edcb5af848878d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-140-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-141.xht": [
-       "b393f22b43feed6c87c4e3f5c9a2640d4b5d216f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-142.xht": [
-       "db2aaa463082912d3b44325c15a117cedb8df3a2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-142-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-143.xht": [
-       "b0c0e2e1bc427baa004a688ce93d45a451a5335a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-143-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-144.xht": [
-       "f1668fd6d33ec93b5b51c5817821d3b77bcb14ef",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "background-color-145.xht": [
-       "3afa2192b835c50e4394c78fe1912ddfdbb3c929",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/backgrounds/background-color-145-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "background-color-174.xht": [
        "35aa83c6cbe7edfed86f9b08452f02f92726d9b1",
        [
@@ -31005,1674 +29108,6 @@
         {}
        ]
       ],
-      "border-bottom-color-001.xht": [
-       "5214c335c852a5f6833684ecd00247b9ef3b52cb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-002.xht": [
-       "c52d2aebaea8d0eb766cc00d91e16598ea348c63",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-003.xht": [
-       "48b032439c3b9d7eb009684d6c538615c5fa7a58",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-004.xht": [
-       "60d1e4cbf734a789fd028c0537f6a270d03023b3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-004-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-005.xht": [
-       "c7310c062352ffaeac7e93bbf4113ec1c0d68fd0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-006.xht": [
-       "fbd7527b5ccf5180a268a1a7349d2249dfde5211",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-007.xht": [
-       "d9ae994c826ed7d8354e072156c9bd05fee9816d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-008.xht": [
-       "0f5105d209ebfec36036c461dbce84879ca74438",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-009.xht": [
-       "461e6e273a73be89bf2750a367a7307167211d7f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-010.xht": [
-       "990f57bc7478421c9013d2e7cce4e9306cf9abcb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-010-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-011.xht": [
-       "94ee90e473134f410c6724cb7d57f0d243078e0a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-012.xht": [
-       "fddac3965f4f4db3fcee1de162f6436c51ac9fa2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-013.xht": [
-       "455b89d596bb2c8d2a24fdabb387b06d00533889",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-014.xht": [
-       "fc00268dabd4d4250591715d40ba561dccdea406",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-014-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-015.xht": [
-       "8bc3c80da5e066217226241690dfc2e90d7a7298",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-015-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-016.xht": [
-       "40d3b77435f6275673087eb907fb5dbda7f5ae04",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-017.xht": [
-       "cbfaee79a60e6a090c04b4e045d1d634ce8329be",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-018.xht": [
-       "ecaea1c746a257f1acf1948d12d514af0e75c8b3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-019.xht": [
-       "267ed5396d5f2680cdbf6b493c7994d656e983ae",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-020.xht": [
-       "fb8cfb20aa6629cf6e52a939f13d678d5428ea46",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-020-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-021.xht": [
-       "c84d76f87229633b2ea35a6b0a786ad5e8ed4fce",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-022.xht": [
-       "0090ddeac17de71b9d4fbfabe58f1b4147b10bb5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-023.xht": [
-       "d10a27757354760fe229af47125c5496e700c627",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-024.xht": [
-       "6cd95188f40a8116f3c57fdf31a69023ee0ab2eb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-025.xht": [
-       "4c5b3d1ce0735a88f02fb0ad55ccdba88144208e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-026.xht": [
-       "0e539bb602ac3dcbe0aacef0eb87b39bfca2b157",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-026-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-027.xht": [
-       "f1a65812e541a1c5a77847179b7e6ef1145fdb01",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-027-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-028.xht": [
-       "c25c89a184e37ecc2cbe2cc3fb8d262b7fecb296",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-028-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-029.xht": [
-       "623072dcd9fd0049fcd49aeae89c25e14b5bb881",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-030.xht": [
-       "abf930e3261020290b178607a6de46c8889fa197",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-transparent-or-black-square-black.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/reference/ref-transparent-or-black-square-transparent.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-031.xht": [
-       "60f312342834ea8325b7d88fa3de7ce648daf407",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-032.xht": [
-       "a14a91b225ae004d2ef69eb0ffffbde8f6b670ac",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-032-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-033.xht": [
-       "0eeaae8387a520c42f6867dec6d592ab39c73668",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-010-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-034.xht": [
-       "41ed5b423b1f9ebae78759718d81a5b8866d56de",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-034-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-035.xht": [
-       "43c7d2f0304fcba507392cce34cd0fe4ff225c45",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-036.xht": [
-       "5bb1979c268ba34ef16f95fc6a8de10d85b3275b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-037.xht": [
-       "aaa0547d71527d21642943dccaea6f1014e5cf57",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-037-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-038.xht": [
-       "df795d75eea21e5f75c157b28db1544e36e78bcc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-038-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-039.xht": [
-       "e454a366ee7cb9624402376c004784bb4155e4f0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-039-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-040.xht": [
-       "9343aaabfd2abc7c340fb2a1acbc9c9b9dd3c462",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-041.xht": [
-       "2c0b7daa5c565ed750e1cd5ad325a01973010014",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-042.xht": [
-       "0ac99a15b74375f85558b383ad29e53525e9ab3e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-042-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-043.xht": [
-       "09205f4373352a1c012d58e02dd7b0ba50338d76",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-020-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-044.xht": [
-       "4e847ed453e6dd0ecb5b1c198d3d9b0cdd2f6635",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-044-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-045.xht": [
-       "b6f39cc51e479858f8802c8655ab8dc52fa1b3d2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-046.xht": [
-       "81ff35d9de35c587bc40ddd4e942185f0f691abd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-047.xht": [
-       "080709fc2519451d1ff84f8bcd66b27d251c0612",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-048.xht": [
-       "800d3761af821befc122e02370cd7d09376d0aaa",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-049.xht": [
-       "0b2e262b7d74c4e6a3a024ba0b4f67df7841f143",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-049-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-050.xht": [
-       "d70f8b5f29e347d2bddb0276b1abe6156252bb83",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-051.xht": [
-       "70a6c63782ca683902c20304e85c5a4ccec21867",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-052.xht": [
-       "a90c57a47dde5a935c8aad17dd39e0217c375986",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-053.xht": [
-       "cfc23e2c1d376b39e6ae95f388bb049a3d9950c9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-054.xht": [
-       "7366be47d2d704cde9bbc80e1bc2fe58d13bde49",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-054-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-055.xht": [
-       "8be065dfd7c9908f5a7063503b37e4c76ac4333c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-056.xht": [
-       "df3d7b47ffb3cd83a1f7b64b417b31d1adf3de6c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-057.xht": [
-       "5e362672fb838b2f540c90e04bad98f8b28322c2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-058.xht": [
-       "79ee6561375a8cf3c7ba6c56a58599b397432e69",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-059.xht": [
-       "d860b0bd2675065e160a50a9a342888a35819be4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-060.xht": [
-       "2a7f41483e90bf9f56292dbeb88cd624499a0541",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-061.xht": [
-       "97a0001a8be5781f6a51157f59b00fc18204b4e3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-062.xht": [
-       "9b9eca3d2c5905ac3426c6401e8705a83314b648",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-063.xht": [
-       "a6295e1ad2877fd2bb626ed133775aa50bb05846",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-064.xht": [
-       "89148be4ae969cd1ab082e2b714b45a0a39c5373",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-065.xht": [
-       "d11d1ba641a8520881a020216af0dfd1a1dc7a85",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-066.xht": [
-       "7bad2cf389db219a905205f55d26b3ede93d9815",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-067.xht": [
-       "f53683a2be998f1bc9b4c0544ed8a0bd1f91b978",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-068.xht": [
-       "491d57534ee5aecb1db742adf6a6fa48de1affa6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-069.xht": [
-       "3717d36ea8327349bd3d0e6d4353ff6fb53d8bce",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-070.xht": [
-       "bdedc861907e11049dea02658324ff0778ee5e9d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-070-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-071.xht": [
-       "e17c1dff338a757fafccff2919467d76fd22c14d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-072.xht": [
-       "b6113b805f57a8d228118dd4e7c322854f4218e4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-073.xht": [
-       "b60a4d847043096135b4becf84269b4550661ea6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-074.xht": [
-       "851efab04878debe92e3694036788ab664de9be0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-075.xht": [
-       "c8b5873b21176d894c09fd251dd91ae5bf53860d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-075-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-076.xht": [
-       "766e371b1f2a770604dc99725bba7657d8e67f2f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-077.xht": [
-       "4ce0ec8ee7b4fb1268f8186d22ca36197109a06d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-078.xht": [
-       "7435831018afd3a98cc6d71883c2cc7a7f519886",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-079.xht": [
-       "7256c711d6e481b9961c5803fbf2d54e02372665",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-080.xht": [
-       "46c60e78be665ff4969638733c70aa07edd5dc9c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-081.xht": [
-       "843848cb37a469b7d8bc337a526ee216c6baf1ef",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-082.xht": [
-       "66e533b34b2ff290147031b724054a1f49975f0e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-083.xht": [
-       "7b6241ac990ca9485651eab55e74bb6ef928422f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-084.xht": [
-       "2ac69013ba4e4dab17ad3a91afaf5989abf809d7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-085.xht": [
-       "bf2b53bd7166d2f5313164728b25b9a4051c2fff",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-086.xht": [
-       "f052625a4a33792e8e557f9b78b99b48eecd6b2f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-087.xht": [
-       "111155f7065966b79db4ff73411b90b222edc575",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-088.xht": [
-       "ca55585278f9e3eae4fd3559984cf03845899b09",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-089.xht": [
-       "0d715dda9bd30a4b798596994263de57abf45942",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-090.xht": [
-       "4cdd83f3bf82008091f1fbf35cd955904f068c53",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-090-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-091.xht": [
-       "60c8815119b27169f3be11d5b518c666b8f22a63",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-092.xht": [
-       "7027950d7189f4d8c780cbeaeb41cf5eb64e00d2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-093.xht": [
-       "e4f629ea464aee5e642d20a4e3ba7798b8991de3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-094.xht": [
-       "e9d58db30212ba8b7815575842b4aa070fe130aa",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-095.xht": [
-       "4ddfedfeecb98dd3cad5ab627121f6b760fc293f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-095-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-096.xht": [
-       "245605da62c60bd450582ba0772ed2c34a645de0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-097.xht": [
-       "cd33161b37da2b68179882db9791561004c24c29",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-098.xht": [
-       "6d039dd127a24a537cf55b4101c9775247c18a08",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-099.xht": [
-       "5f6ae6bc8917240082935d52bfe85f5e74bae360",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-100.xht": [
-       "44075c7547e35ade9b01953ea457404ccfbe7e73",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-100-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-101.xht": [
-       "8947bc54deb348148394165f1b5fa59752cf7a6a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-102.xht": [
-       "3f4516e94221fc23e99ddbd4ead63daccddda940",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-103.xht": [
-       "8127a908fc4c14564c5ec100f8282d1c500babc9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-104.xht": [
-       "0b4f3b105edb31860dd2abf32b03e5ec4d0a5ba1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-105.xht": [
-       "8e0ec2858968260594fddd51b9e1266a4c2025c7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-106.xht": [
-       "bd9fc7497f8a444092e781d2ddcdfd7a4ffb9c9f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-107.xht": [
-       "72a38a3682678b5391f9fbf2125159ebee8c6241",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-108.xht": [
-       "d69d720085e08903b1dc84b3d278c753830959d3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-109.xht": [
-       "053febc6f12ab57940d607eb28c8a19d6cb5f1f4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-110.xht": [
-       "736365f6d0acd17dddc6c17704385799b0977b48",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-110-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-111.xht": [
-       "7d8523838b1b5df9e5c47b9859c6b3c27deef6f8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-112.xht": [
-       "5c70578bb2f65280c6b064b28913c4610aaa101d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-113.xht": [
-       "347344ebdc6cf6982c80db06cae3e9af0385e062",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-114.xht": [
-       "c28375c7de6a272327051aca477dadc909ae4167",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-115.xht": [
-       "41f46477f1c770c99f0a4f8f0d88b1d7065871d9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-115-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-116.xht": [
-       "b8f182522b8d6b1cac51c19ed38f66c564c73371",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-117.xht": [
-       "034f0f5b8276c544b1427377b3efd3be4a7c8444",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-118.xht": [
-       "25990d11c51ff9532e1b94f1561bcd7472c333bc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-119.xht": [
-       "25ccc228bcded0ce364891288841e316841768c4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-120.xht": [
-       "6cf2c68e430c3058e596ff35f138340c702c5d9f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-121.xht": [
-       "4f6ae4f5be701b4ebde1ccaa4052ec97f254ab64",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-122.xht": [
-       "b742b0634cf2e0f0e58400bf2480aae05e28d75f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-123.xht": [
-       "a95ef02b51c5fa5b4050cd400a859b4d8db31ca2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-124.xht": [
-       "957b9e7cd9442c9ab9803243e8bc7e079f50d244",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-125.xht": [
-       "370eb8ac6593d4c52ece4929f03c1fefaad6fc4d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-126.xht": [
-       "ab183be63b8396134718d0a60b8c97472c36fa88",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-127.xht": [
-       "b03e50992008bdcc031c8228c71555ebeb11730a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-128.xht": [
-       "94462cacdd93cddf3436762459c040c222e0131b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "border-bottom-color-129.xht": [
        "f7c6f4e59dbe96b264474c0fb5011d41241bb011",
        [
@@ -32686,214 +29121,6 @@
         {}
        ]
       ],
-      "border-bottom-color-130.xht": [
-       "a8c1583484f48fda173a405a241140e610da2d91",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-131.xht": [
-       "aa987cb49fa839b041350c238432e937910e6cd8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-131-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-132.xht": [
-       "ac7a228d7bf461391dad40302b080582343d725d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-132-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-133.xht": [
-       "06c1c9ebbabad60bfe65f0e5ec34fb6fde77a04c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-133-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-134.xht": [
-       "97d168bc59d6a6701a35033a305853f024c128c1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-134-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-135.xht": [
-       "85ce19a0b1f77421b0e64728bbf7300d4c6a69cb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-135-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-136.xht": [
-       "3444b985167c38f39e8376860a01fb671e4b2adf",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-136-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-137.xht": [
-       "b3fd414209d89e357b17fd87316c57eada6027af",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-137-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-138.xht": [
-       "6ffa065e6956123b1cf889a76e0d6e72d6d571a5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-138-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-139.xht": [
-       "1754a3349f776505f8ab9380c44b0f29f004ae10",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-139-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-140.xht": [
-       "baf090540044a34ce10c72f73144a3f2801211b2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-140-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-141.xht": [
-       "c6655232140fd4bb6e80da33a9b006fe2421d95f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-141-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-142.xht": [
-       "e53654dfc519d64808849a6f6fbd0dc8970e18b2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-142-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-143.xht": [
-       "2a7188025ca1bba1a1f12f36a1281374af46bd65",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-143-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-144.xht": [
-       "d1061878de90a634e554ccd6a5ee905637c6fd37",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-144-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-bottom-color-145.xht": [
-       "4ac7c5917c97b8ccff10f0cb4e2af1895829bab3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-145-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "border-bottom-color-174.xht": [
        "23d915c1f8ca2a96511c8929c09564f061ae0ee9",
        [
@@ -34597,1674 +30824,6 @@
         {}
        ]
       ],
-      "border-left-color-001.xht": [
-       "26f026c1cb0446917408e756ad3b0ded8eed1dc4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-002.xht": [
-       "0a7aeffc3c6ae6c16879973bd3302ebfb69c5234",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-003.xht": [
-       "7c7485bdba1fb718ef1eec41ca794f49ca871056",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-004.xht": [
-       "fe6e8e63a64298e34899fedf812fffce48c81eb3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-004-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-005.xht": [
-       "d458a713567bb0fadc0a2a16fe61da00401c5ceb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-006.xht": [
-       "2aeb4e00fb4bdb0e980068c66863487fb768626e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-007.xht": [
-       "96793387bf1a5745ee520c99657ed7dc7c0bc2b5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-008.xht": [
-       "b95241d8008a31c65f4f7a13c7c84323fe9c4c09",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-009.xht": [
-       "7d167052c13642032ae2bb018284721cf4e71348",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-010.xht": [
-       "1f41c35badb5df314df0f536547c10ef57eceabc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-010-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-011.xht": [
-       "19acbe2f35af58bc4d54d84b6782d6590887a355",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-012.xht": [
-       "784a876d4eae2f524ebf644664bc41ad921ba23e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-013.xht": [
-       "cb89214e1e4fff0960dce35103b33895e5f54cac",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-014.xht": [
-       "c407698f8137ff182cbac753c664d66367dde8fd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-014-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-015.xht": [
-       "0d502b9f9e1214b1c77e9390997a196d03a7a95c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-015-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-016.xht": [
-       "41c308d15b8bf6f5318dc19da665ae81d5769554",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-017.xht": [
-       "d8cbe8b1e1f6442de0314c1e8c61c93eaa5b8e1b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-018.xht": [
-       "49fea3c70d5b6c585f6553a516715a77cbba6314",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-019.xht": [
-       "583852437d916891a16ef8381e917b18e5c24eef",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-020.xht": [
-       "ddfb8b49cd5be36df7128fafa124a37837526c1d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-020-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-021.xht": [
-       "f0c16a7b5b92a708d6a2cc460dcb1dafea06df9e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-022.xht": [
-       "129f5f1a8cf7b32740ab0982689016631eb98995",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-023.xht": [
-       "ed969cff29e1c139c226f36db17ff3ac0ba13ef0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-024.xht": [
-       "fb1bf0d78c6c401c65ca2b78921a03f921f365b6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-025.xht": [
-       "2d1e9950b9ce5b878aa6d3e19b286b3e42605775",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-026.xht": [
-       "4abf4266979371b8c46f7ab5926074d9342d4298",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-026-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-027.xht": [
-       "c28aa21bf52fa46ec25fe5cf5ae16b2b10e6c269",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-027-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-028.xht": [
-       "386c42a244e5168a303bdcc6df41d3859b4b6eed",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-028-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-029.xht": [
-       "f2624c1dff0f1fc6031c16a35d7a9599eb45f80e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-030.xht": [
-       "fc62a4b144273f2265e5379e57e1a8b6ddf73d96",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-transparent-or-black-square-black.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/reference/ref-transparent-or-black-square-transparent.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-031.xht": [
-       "c31e9d9eaa310d862e8b6204617bc7c7f9b777aa",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-032.xht": [
-       "2478e7880a1fe2c8931e260d790f45095aad302b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-032-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-033.xht": [
-       "79ec0085baff5767ee905244b8905e925ee455f7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-010-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-034.xht": [
-       "2282d05879465d6ee1ab90459a4611594521db39",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-034-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-035.xht": [
-       "25acf6d8ad2cf3dbe9dde7bc198fa418802ee4cb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-036.xht": [
-       "b268910e59e4069faf50734a1cb57a2a96d0259e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-037.xht": [
-       "73cf82df6bf81148521a33ce20cad610b8291eea",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-037-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-038.xht": [
-       "cffdd3fa1061bef6e9f85a6cc85bee68e9dbf34b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-038-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-039.xht": [
-       "ffada9e7a159c31a287cebe0b6f527228cedd375",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-039-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-040.xht": [
-       "edd44d2af91da6d2be7970121fc2723b857a4035",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-041.xht": [
-       "8a19c644befaeb76919c083b23ac29bf661c96b3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-042.xht": [
-       "eeaa75b5aced09bd601da6c7059a38ddc97fb035",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-042-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-043.xht": [
-       "12cddbd1cb0a3e5fcb91bdc383d48fdc5fe43090",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-020-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-044.xht": [
-       "9232b04ff64f58fc0fa984a5af6f77ed14c95a23",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-044-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-045.xht": [
-       "d8afc8a85c023def13d8de4b448abe112e22819f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-046.xht": [
-       "0e585c32770a2ad1d74f4957640d1e11f6c25653",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-047.xht": [
-       "bb0b50b9cbc0b47408dad1008a73954d52bc2d27",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-048.xht": [
-       "2526461f94f5b47bc4d3ebebbd111402e07be496",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-049.xht": [
-       "be71e45ac7347b70c2cba790effff81e8dfdf846",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-049-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-050.xht": [
-       "62696bbc2f02e4b96b4040cd9d09de747e646098",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-051.xht": [
-       "e4a74328aae250894ff8ffec1a84e0d0bf7f405e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-052.xht": [
-       "a2469a75741ce32e2c493df6284acdcd2aacf163",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-053.xht": [
-       "e0826207e6b46d9001610b57c71a8f804ce5079d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-054.xht": [
-       "056a3f792d818f43e076d86e691768e2e1053b92",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-054-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-055.xht": [
-       "51428320a3805e8ce4b5caf46c34ec12c553c87b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-056.xht": [
-       "97567200bd7dbfee3ebcb9eea6b40d18432f5df7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-057.xht": [
-       "fde87d18988bcabf17a10fa2d282c0001c3be746",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-058.xht": [
-       "f11c3efe0945de769dfc9f1d77bbe2262601fc45",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-059.xht": [
-       "a47824414b2b791e8a58bb3decc45b308519fa04",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-060.xht": [
-       "5819fd3506a172cad0900de8bbcba1770c46c074",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-061.xht": [
-       "99debe1088c6330b93847d3febcee8f78aba9015",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-062.xht": [
-       "99cb289e5c48bb4fb0f161b6d19c027ea3dedbf1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-063.xht": [
-       "653414a387dd60471be5c8e02eb69e17e814d53b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-064.xht": [
-       "b894e3c3c7f26b5535c174ad959b130032ca1767",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-065.xht": [
-       "11b46615e89cda801455bff565fcd73b9f770439",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-066.xht": [
-       "89b0058e0caaec44492d2c084943bb91b0b5c87b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-067.xht": [
-       "b595cea5f538bc3e9390ff42e2dcced3f5bfbaa6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-068.xht": [
-       "b582d0df9e595f03661fcacb1303d7eb71c2c6f8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-069.xht": [
-       "9662a942ca4970ccee8d75889d3f368cc625734a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-070.xht": [
-       "abfd0c62f08bd312564d4fdc647e9d648a5a6624",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-070-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-071.xht": [
-       "f1b227975951c0bd77607706b27fffe8c6c4bea3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-072.xht": [
-       "ba018039852b9ea7e99032db35d674d37145dd4f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-073.xht": [
-       "612d7002d4ee1836a34a02ac0df91d5e46bef72a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-074.xht": [
-       "4f49db32766228931a4f41407ff0395c469799e4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-075.xht": [
-       "242b6ac67814166913361ccc135883beec71c9c5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-075-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-076.xht": [
-       "02980b5942bd662fd6074a1b2b2b792d842cea8e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-077.xht": [
-       "da72352d1c968b453c71803c61e78fd046615546",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-078.xht": [
-       "6d1cd48952c64066aa3681dbcd90fda8d7cd4d5b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-079.xht": [
-       "b7f8caf46d52b3e052e9380e74028c72a40e6f78",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-080.xht": [
-       "a9878d0981912c62521dec81a5b837d172dc9336",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-081.xht": [
-       "95de7e74d9df07fc89a8cd0a0e5aef8cf2892ec3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-082.xht": [
-       "a0373884ef9807f007cdc15220f58a579a1e3f63",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-083.xht": [
-       "c2123960b09467c1ff07b229c07c83398068b46b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-084.xht": [
-       "f1ba9781eb10f39d8bfcbb6ba150b229368495d9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-085.xht": [
-       "d3482935a0e083c750bf5a77b3e106a666557012",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-086.xht": [
-       "85a79765cc8ccb2283bacfad9217fb18116fd14b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-087.xht": [
-       "9d2489a719f98cae989f8d3f0df34ea1f644b8a2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-088.xht": [
-       "ff2bfa664e28d0215f3733f045bac33b986a567b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-089.xht": [
-       "a0dc7872e366508099d64e2798b6a5146483791f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-090.xht": [
-       "5c1908aeac479c263cc254c550712a242745f5fa",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-090-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-091.xht": [
-       "e639eb7a98c0542fd6c575ed2abff4f5bb77f62f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-092.xht": [
-       "0a78434d04abf0e8b029cad360cfd62ed9d3d82d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-093.xht": [
-       "18d995441d48e4bb886dbf613c010feecd80b807",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-094.xht": [
-       "2940b09fee9a9fc5fcb786f623eb82ae3caae67f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-095.xht": [
-       "3bef2686acde811579495e0adb455ccd83459b8a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-095-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-096.xht": [
-       "fc75c29a7d3b65a4b46793e10a43d5ae459a8657",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-097.xht": [
-       "5b90142132bc94e35a9b948af7dbfb0a026bee91",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-098.xht": [
-       "e38bccc776e22423a1eaae146891593ae89d94d5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-099.xht": [
-       "ff193dccfe48440dc1e4aebbf0b77d0d1926ca3e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-100.xht": [
-       "b2acc607165a5470d32ad577f89615cddf561110",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-100-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-101.xht": [
-       "cd7503fa5aa811bb5397326579864151a2d82d02",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-102.xht": [
-       "3174a878f541292a277b498cd54c97c296aad889",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-103.xht": [
-       "e2378fc5a19eb8b33ae00dc4bcbce7fccd322a3b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-104.xht": [
-       "5adabc8d38c51dfc34e1f87f8cc1d6e387446952",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-105.xht": [
-       "65c36432bf1a7ffe5faf8b322c96948500e6d37c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-106.xht": [
-       "f992b2bcfafba239b2437de9d05a52f831014fab",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-107.xht": [
-       "7c3e41eefbe2bdc89e2a1b26ea8457c98c73ef84",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-108.xht": [
-       "4c3abbb5fe18e5e95fc3e8e706caf7d2d57383d9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-109.xht": [
-       "0023bef43b414dd80244fb47bcc7a8caff075ca6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-110.xht": [
-       "c947fe8abeb135ac97c0460e0a61c7f9e6803816",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-110-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-111.xht": [
-       "4c4bf57ea2d7e3edcb439b0b61707c85f7cf4c25",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-112.xht": [
-       "1d944cf3828d5705be7789fb8ba0096bc792a9bf",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-113.xht": [
-       "67b32763daa8523d9d4718c8d3601b6e79abde6a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-114.xht": [
-       "e10886c88845a003a4b89c19b6b4b9eb8e980f58",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-115.xht": [
-       "72f95ecb55ca778bc60646f940b3bebc88c48480",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-115-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-116.xht": [
-       "bb0714dedfc31935999ce038f09e3490c698dd39",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-117.xht": [
-       "d35664a9324f27c5f97f5b8991287f64b6ea0424",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-118.xht": [
-       "64043cdc3de3a37dd7f746b5b9fbf6b5b2493285",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-119.xht": [
-       "5fe0875aa49d4f71a8f26254b749a263815cfeb9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-120.xht": [
-       "7d7a31cef2ceeb386b11f527443784e64f4bc431",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-121.xht": [
-       "0f2141de644dfd089c60bb8b8f40d48987db725b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-122.xht": [
-       "690c32632b49764f6528c7725a5af2820ff3f4a8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-123.xht": [
-       "5ca990e89d4e1aadaeefe6f10540e600cf0516da",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-124.xht": [
-       "8977d437a9e883154615d6e78fca0b096caf53ff",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-125.xht": [
-       "e20a77fd4a756b5b0043711d2644ea8560650f41",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-126.xht": [
-       "ed1ae10382a02f8633ac2833f385c1615caa576b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-127.xht": [
-       "3f3d1f4c3be4c7a98d9a2fa9bdf6e2f27885b5dd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-128.xht": [
-       "2dcfe622b4d9fe4e8dea4129cbc12ef25aca508d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "border-left-color-129.xht": [
        "dfd7518334e60a300daf749375b4449e55d03121",
        [
@@ -36278,214 +30837,6 @@
         {}
        ]
       ],
-      "border-left-color-130.xht": [
-       "8afb06935b4b653cb5ca0eea10cfdacb0b80db16",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-131.xht": [
-       "6302912a84d4ade39969b83dd1bd0ce3545c250b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-131-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-132.xht": [
-       "c554a0640a1c58fbc2269c8dc2584a4111b5788a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-132-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-133.xht": [
-       "58657b2f73239b990ea307bb7cdaa73e2c04f878",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-133-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-134.xht": [
-       "3b104fea833d198aa7aa92ff4082c13dcc4b7539",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-134-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-135.xht": [
-       "9c7926722424ae59ca138ed70239c67f3fe6f5dd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-135-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-136.xht": [
-       "a73581363beef378b6f0f166a8edde8ddd990895",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-136-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-137.xht": [
-       "72741c9907295dd59309c0fd8c1dfd64bc4313eb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-137-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-138.xht": [
-       "274cbeb0351d2b165211de975c552caea089e69e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-138-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-139.xht": [
-       "f852c736fbe4c0221277c2bcb20e0a7166eebe29",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-139-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-140.xht": [
-       "a0f472fe44240a6eb16e01257745841cd393c8fb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-140-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-141.xht": [
-       "d894273cd9fd098e2345d3cfa759ac82d1db19b6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-141-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-142.xht": [
-       "5d42b9610fe3dc43c5785528a69604b935c79146",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-142-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-143.xht": [
-       "fe9098124a694be4ff40396c527214001bdac6e4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-143-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-144.xht": [
-       "93acb3b39eaf1113463de5ff7d3026e8f3ff8f82",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-144-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-left-color-145.xht": [
-       "866e6988e62f2a2c1192a874cef697f47c6d77e3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-145-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "border-left-color-174.xht": [
        "92212021e46015ba8d76885194e974eb39c7bd3b",
        [
@@ -37838,1674 +32189,6 @@
         {}
        ]
       ],
-      "border-right-color-001.xht": [
-       "4087d1bc125d5b44b15068bda4af3baa5fe997a9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-002.xht": [
-       "38f25ddccdcd7255f317f39e7ac427671c42f3a4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-003.xht": [
-       "581a4850cb42d0a334c3c6dbc4c24b330c075f41",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-004.xht": [
-       "3fcc99af60737312fba7241e8c64904188644c67",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-004-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-005.xht": [
-       "c499b0c25bd4b01c7d56d5c3b44801ad5908deda",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-006.xht": [
-       "f201e2c0ef34d62407e51741e4a029c833e39dfe",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-007.xht": [
-       "559bf165d3bf53a1646363fa84c5ee46bcbf285b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-008.xht": [
-       "46dcfc9b2ce8b3a436077781a9b6b3d9afd814aa",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-009.xht": [
-       "ce933a7422e90d1ed8583e7a4d8823ff43737b18",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-010.xht": [
-       "157bb855ac79071491c7e3282f5d5b60aec25a5a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-010-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-011.xht": [
-       "41cdaef5d999ba9c91b7aa5a547a67aeeb518979",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-012.xht": [
-       "d7ee72e9693a13165f7bd16a48451b32f87ed1e3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-013.xht": [
-       "3f1404de97979417ae26c610a317bd1b687b4052",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-014.xht": [
-       "b301ae08dd84a92b9fcc9a24fb339952f40d991d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-014-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-015.xht": [
-       "266bcf8a2c77bdb6c3b4f09ba60658ef6c203070",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-015-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-016.xht": [
-       "6285de0db2bbb6f640fd87342f15616def90c6f7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-017.xht": [
-       "55685f8c4fa241806412c5d5d7f3641bf097cbb6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-018.xht": [
-       "24e9e462afba7f0833684bb12526f41701ec19ac",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-019.xht": [
-       "b775fd216c22400706b7222c130852c8c1b35b04",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-020.xht": [
-       "b7cbe633ce682dd578a27d11689ee99f5cb2491e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-020-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-021.xht": [
-       "5b61cc5b1ef7962e519564258d733a8ad4d599bb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-022.xht": [
-       "d6e81b59f3deb5f4d84d8ced8c2530a2c6dd53b2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-023.xht": [
-       "f79b7c77b43f115b408bb57da83006baa2a58358",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-024.xht": [
-       "00537c0214719730bc92e72ed2c8dd14167aba46",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-025.xht": [
-       "ff127fbf0c17ce4fff8cf96279e1da923106ff1b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-026.xht": [
-       "6b03c4fd4acbfabac250f20ace144c3181c2916e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-026-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-027.xht": [
-       "d50ad625c7a118281c7d6b3ff588d9e5aaf14e7b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-027-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-028.xht": [
-       "31fb4c0089427ba7761a0884a452bd4047b4fb53",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-028-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-029.xht": [
-       "758e1c74516a1ba935d09e51aadb63a155cdd61d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-030.xht": [
-       "bbfdc56965e48f8bba1a19fbb846dd450f07c72c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-transparent-or-black-square-black.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/reference/ref-transparent-or-black-square-transparent.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-031.xht": [
-       "340c68d9eb7053f75ad758e464304977a2a351eb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-032.xht": [
-       "4c36647aa8ad1566697a697ad7ca950fa3f3c048",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-032-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-033.xht": [
-       "2ac7e710c9b9a6364eca304fa42a82b393dcdf14",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-010-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-034.xht": [
-       "dd7f9121ee354736c052f4a37f9dc37c0dfd09e3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-034-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-035.xht": [
-       "686141399e2e7a012d5aea20fd178ed0721216a3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-036.xht": [
-       "bfb55ce7a8c68c39212f11d94f543b6d5594ad8c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-037.xht": [
-       "2213a09f7034f1a72c6f0ec608e1b7d453ca355f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-037-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-038.xht": [
-       "55648d7029d91b69275a88369d4c69cc72fbc5c2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-038-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-039.xht": [
-       "45ca2a27e02bfc0013f1c97fb52199264a0f57ed",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-039-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-040.xht": [
-       "21c5dd266cc907a8d98d47010641319b486cc029",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-041.xht": [
-       "ecbb6000978e4d856a31a48f9e2ef23dbc4bcfc9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-042.xht": [
-       "aa3e8852013236c1da5029b4940c560938458833",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-042-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-043.xht": [
-       "00bd2611d11cd7c87cbcfdfb478bd966eb49dacc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-020-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-044.xht": [
-       "514c2733394d90109645bc610838a74bd40cab86",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-044-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-045.xht": [
-       "05379e3420a777fbf547ebd134dc2702d86bfb61",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-046.xht": [
-       "3ec588fcb2c8681001303b343732029b0acf5575",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-007-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-047.xht": [
-       "7f68609fd0f6dca1cb6fbe42a9010416f9891d4d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-048.xht": [
-       "dd67378791f0bbdea8bee11263cd96a5e8aa7556",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-049.xht": [
-       "eb1b16792b44af0e73d80311fb72dda7df263963",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-049-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-050.xht": [
-       "2eee1e154c89edbd9e5d214bbbd79d091a5ebf6f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-051.xht": [
-       "cafa86efa1a3e59b6e612e87af03941e0261c684",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-052.xht": [
-       "15aef97fe0cc32353b7ca0fbbd3ebd1e3430b0d0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-053.xht": [
-       "63c0eabaf93b19ec322a788173a76407b09b2b82",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-054.xht": [
-       "5c36d8594733c95cfcd113fbe8ec0a2e18325948",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-054-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-055.xht": [
-       "43c9d48d468c22950b519aeaf974e6f48cf00694",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-056.xht": [
-       "58fa4339fab0998d152aec2405769e70d2e75543",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-057.xht": [
-       "beee6bf75457c0a9e90725d28dc2158fc5c86a2f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-058.xht": [
-       "173c5b89131e00e6a6ba8f20f57565ac308855b4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-059.xht": [
-       "f1f7e081a4297242e9f57be014a549f8127afa4c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-060.xht": [
-       "fddadc9220fe88314ea249da8f9f65afe35da940",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-061.xht": [
-       "8ebc0e8e441a4db0e59a640db82991400062e092",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-062.xht": [
-       "619398223f60a50ca3635070c5ac0971575c0c56",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-063.xht": [
-       "c7579fe12369291e8ff146f8b597b993c3f1cd8e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-064.xht": [
-       "aa60d72c5bd1a94d14dbdef5ea5b41c6cdf2c56b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-065.xht": [
-       "b2d44c145ee0acaa0db9c0eb3e1eb655c6a95187",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-066.xht": [
-       "06b6154ddc183a0217ddfa4dbaef791429db8c65",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-067.xht": [
-       "969de38edeb55fb06cdd5af8091cc1bbfc41dac8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-068.xht": [
-       "f5ba13465f3162d16fa2976a986db70b38109fe5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-069.xht": [
-       "89755e42d71eb3786df4cedc1e803173760801ab",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-070.xht": [
-       "39fe330e99d901b512d21b7bf4f4822ddf17e6dd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-070-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-071.xht": [
-       "de7c70a97a87d506ee96dd1d14c110374af9b708",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-072.xht": [
-       "2bad196d90c2330248571e49ba696ea823e4e24a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-073.xht": [
-       "b8a8f62e0648ea390700d73ddd692e5399c9c7a0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-074.xht": [
-       "d541d7b1d763e8917f89e7770a9564349d006f75",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-075.xht": [
-       "c6b160f51248676a41615740f771bdc0f4cf2a55",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-075-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-076.xht": [
-       "5691834f8909e5f175c091a7b7420797fa718930",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-077.xht": [
-       "935012999b09470e02857791f7970bbcd41d840f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-078.xht": [
-       "a5abe31cb9326cf1a412f936cc2cbea69f126ef7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-079.xht": [
-       "c9056e5444d106af89fdf2fd207da936534b54cc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-080.xht": [
-       "2ea1e3f45d1e127110c7d9162f1a39e71502eed1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-081.xht": [
-       "6ba4a3a56e4dc69ddf129772c8e59115f0d86fff",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-082.xht": [
-       "07a590b77369e59d4dd6765f640b1d74c654d0b7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-083.xht": [
-       "0dcaad552bf1c5d7768b67ff8ec0994a212a9e62",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-084.xht": [
-       "cb7939c96fdb02496c522a450d2417b5df61d1d0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-085.xht": [
-       "2bda8e50a36a20c3e9810a601e3e0f3a64ce530f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-086.xht": [
-       "fc63b3682580bfc7968614594fcea087ffc69a8e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-087.xht": [
-       "0ae0d20abbaefeafbe10db081a7e06e30fb0f72f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-088.xht": [
-       "a8f994420a80ca616b2e027fa3fa71e08087abab",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-089.xht": [
-       "80fa71740d551174fcf0ee7f5beb3af5ffb702a7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-090.xht": [
-       "7becc80679dea2ce1d9e02e2dbca03fa0f51a5bc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-090-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-091.xht": [
-       "5a9cf2db4c150e49e9b8a6a26e63498ae1e8dc20",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-092.xht": [
-       "f58c03894f8fdee09bf73857dd0fac61c43ee270",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-093.xht": [
-       "f1e213819d1aff7870b6a20c63f2ff85b4c50a25",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-094.xht": [
-       "ecdc6185e8214119b4f4723676ebab7f4227791b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-095.xht": [
-       "9ea964ea20554024a3a92a7fefaf15cf5fcac2cf",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-095-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-096.xht": [
-       "f4eddd2d7d073fb394490466025a554fbbf01dc5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-097.xht": [
-       "6a2cc7ceb93018ba3b842e85e7b2549093bc123e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-098.xht": [
-       "d1337caf27c13d7104e1ff921725aeb2d2cd3f69",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-099.xht": [
-       "dc4f07102c048c38c47e3381f6a747cc773f9a72",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-100.xht": [
-       "21df7be61bca37605df1efc4f7300c1382a3ffe5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-100-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-101.xht": [
-       "c16287a2e98eb3d33a7ca81696050e64bbca5149",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-102.xht": [
-       "431ce5f3d2a86b608520be896315fc0f35b9945c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-103.xht": [
-       "ef6d2e70d5c16f693a63a4bb74dd4bdb4dd5cc26",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-104.xht": [
-       "84c1157c68b68008801a743c06c4f4a4cb5b0c14",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-105.xht": [
-       "d8bf01aab21b136161c2e4aa8730f66b1f9c0500",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-106.xht": [
-       "b521a12c53ee8e5bf8a3b5463d534e3571618b9d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-107.xht": [
-       "c57d3e9a4a70aa27488f59bf264bd4e7fd006b74",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-108.xht": [
-       "1deacdee72fb600e26e8b78c51a6bf32532c44f7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-109.xht": [
-       "9cb68f11186daf3166822be9fb736287109525d8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-110.xht": [
-       "0c967489b30b9dcb5e1be0405f9975bd3d8435e3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-110-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-111.xht": [
-       "b92381fa3c531b4501974406fb24f03934a7104e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-112.xht": [
-       "cc2c354ac449fbd55bf1cbc1b54bf52055005398",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-113.xht": [
-       "2162aae1ae8e288f78c9a1db12266e99c262e508",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-114.xht": [
-       "bbccbfc41aefd612dba1419d15f2851b91eddb6c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-115.xht": [
-       "7eae3cef73b5312af61d26e8613c7b0b756e4ec3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-115-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-116.xht": [
-       "377ba1a2751174ca398f0b21174a9e7c58e8654e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-117.xht": [
-       "72936fc9970189c28b9c5de1569d77a27aeb7d00",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-118.xht": [
-       "5f478019bb9f01dfe832b3bd42d7b916cf12fc18",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-119.xht": [
-       "15a6c383562b78aa871a8f4cec17d4a68920d40d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-120.xht": [
-       "b931421c41506c849005e1b0e2af208da072a756",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-121.xht": [
-       "9d6a0490937e0554c52db1159d6a8005923e21ad",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-122.xht": [
-       "d7ed39a397dad36f46a8469756bb2ef5a5e5a791",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-123.xht": [
-       "01d93e04defb26c98affce10a09ddc7ae736b00c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-124.xht": [
-       "52641446cd3108baf22460defff2e6c39865bd33",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-125.xht": [
-       "79f3d8db25e232f21c1205eda0ea7bbff106e988",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-126.xht": [
-       "e5ad494f9eeb0ece539fa74be85242cee7ae37db",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-127.xht": [
-       "c8a281242cadd83d68abff2c476d76dd8454ae56",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-128.xht": [
-       "88f4a4eaa2f48885991ce9e04cfc2a0aa504ca9c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "border-right-color-129.xht": [
        "814bf8a4328575892aa0872329537fe599de0bbf",
        [
@@ -39519,214 +32202,6 @@
         {}
        ]
       ],
-      "border-right-color-130.xht": [
-       "b36a02df10b18cbd159da0adad8b6cb7bb058fff",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-131.xht": [
-       "6a78aa45abb82bc2499f44f60b916bcb0aa67b64",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-131-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-132.xht": [
-       "0338b8fdbedfc9f6a13a707d6794ff3f2b74e3d3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-132-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-133.xht": [
-       "c9fa8d20c78a40d722eaded4ad208be0f0d7edfd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-133-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-134.xht": [
-       "06cf78a6c7b8dbc8c71a04f4e64ea739b7ad5624",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-134-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-135.xht": [
-       "3384ba8216038ad1c3a479e9f2a551ae53ecd904",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-135-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-136.xht": [
-       "181d76b3ee2f638b3b8149a29cc4ff92ac8e7cd6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-136-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-137.xht": [
-       "c5b67ca8914b78e3e34669f494c4dbcde263f8f2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-137-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-138.xht": [
-       "9805de2b191fb5f1ed921f7c181fb84e346e91bf",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-138-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-139.xht": [
-       "5c41321307f95e3d52e2bc179abaf7277ceffd51",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-139-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-140.xht": [
-       "9b3af4f86c8c17ee11e4f1fd8adbd2ae7a6358f7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-140-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-141.xht": [
-       "3d04bb8263fea95278c33e190d95707550182212",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-141-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-142.xht": [
-       "013d4c42fcdd1c1bafbf2e885b3539d39d003e55",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-142-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-143.xht": [
-       "1f5f9caf7803c34a06a320052fd5040f20def481",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-143-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-144.xht": [
-       "0ed286552e0eced2915005f5ecafbcf90f72e3c8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-144-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-right-color-145.xht": [
-       "436fa7dde0856431076a880b5b9c70c6cbef2e31",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-right-color-145-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "border-right-color-174.xht": [
        "0e3bdb2e93a0469190147cdf047e5e2f7c669470",
        [
@@ -41274,1674 +33749,6 @@
         {}
        ]
       ],
-      "border-top-color-001.xht": [
-       "e6c57d190f321d117510a71b38ecd5097999719f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-002.xht": [
-       "a0586e2303b6d97edd8cf0e34d0ffe77626d7233",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-003.xht": [
-       "ed88dab192efc85d2dcdf9212e685532f138efe1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-004.xht": [
-       "1820e18d510dfae31cc780cb44c963b864f59506",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-004-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-005.xht": [
-       "a4b1cc954a1fca8d36f44f745714569b78a080cb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-006.xht": [
-       "20211f87c1b282f3d4998548cd1edbfc0efffe16",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-007.xht": [
-       "09144da5d55704a96136378cb7025cddd9e2ed4c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-008.xht": [
-       "5276a60a68b92e695652d13e1e9cb9fb08e59caa",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-009.xht": [
-       "648ca024425f233935834b60f070d0f1b2ca5eff",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-010.xht": [
-       "06fbe25343b5a08541a2d792cf8e2f74acbef452",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-010-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-011.xht": [
-       "837515754c769580070c5ca2c9eacd5a2f5d248b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-012.xht": [
-       "32c361745e562970ba28bde8199dabc109962b3e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-013.xht": [
-       "c7cd936db3cb0dbeb20a65822b807e9e13531078",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-014.xht": [
-       "a0564b695abf19cc1b42584758ac560e4149b651",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-014-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-015.xht": [
-       "f58d07b3af7bd44c5218394fbea0829426d6dfc0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-015-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-016.xht": [
-       "44faf8054aec8790b2a419c7f480103cd463b83e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-017.xht": [
-       "d3432b22dde4b6314963df45a9c7d8c4d54d759f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-018.xht": [
-       "74b580fc8016f5cdc9ab775511ad9845cb228d3b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-019.xht": [
-       "32f13db98d8a52cc94dc8e1ea0ba227b84475984",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-020.xht": [
-       "a94c07437b13ae8cf3d4bc808a268144a6fa68cc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-020-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-021.xht": [
-       "cd69045349066062cc5ed3211e1944cd78a7cdbc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-022.xht": [
-       "ad05d5ed864dacad88ccbf96b05e0269b6d8ce47",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-023.xht": [
-       "3d4f1f38dd16d00a7177480b7042ae83a4cc34b3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-024.xht": [
-       "1785a0e0980ce620ee1c13093acc4c3c883fe203",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-025.xht": [
-       "bf57265d28152ee1a9d96f179e7a26227d4056d9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-026.xht": [
-       "3328cdfcbb5f8753770bf8a647da5554c9633ea7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-026-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-027.xht": [
-       "3c1e3ef1c57af0f6182ae5712c447e0528fb535c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-027-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-028.xht": [
-       "f5a401490d013b0d357fda1ea7d98c2620a6c83e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-028-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-029.xht": [
-       "82c77779d37043dfa94e421c501dd4fbe31411b9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-030.xht": [
-       "260ba20f0c2809867bde980870cf68cffab87c79",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-transparent-or-black-square-black.xht",
-          "=="
-         ],
-         [
-          "/css/CSS2/reference/ref-transparent-or-black-square-transparent.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-031.xht": [
-       "7473b23a618e7779dae372cfa0323bba70978b8e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-032.xht": [
-       "be58b93222f9ea66e0d461897964ed2085ad1f10",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-032-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-033.xht": [
-       "4769d075b531f6984df955cf2561ccbe52c54c24",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-010-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-034.xht": [
-       "f7a6214c4e86a841c4e5581a3c60f1b4796f799d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-034-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-035.xht": [
-       "906a8fecc461c75e57b54e840e8fb89bdfcfd9cd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-036.xht": [
-       "d5e1636a48f4d8fff82483990644c1876e784973",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-037.xht": [
-       "72e4cf8e81c597f7cee08a9460ced8e820b27622",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-037-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-038.xht": [
-       "be42ca45f69366bc28ef8e9e45354c23e67173af",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-038-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-039.xht": [
-       "85ffdd2ad641c343fb230a4a5daad1be58b6d8a8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-039-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-040.xht": [
-       "75c8eedbef875ebc36ab4deecefe41954037a4c4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-041.xht": [
-       "7747250d40b587bb35409837c8b88b436b57ef41",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-042.xht": [
-       "d8427077ff5fba5e74a4326e83c918f73e252893",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-042-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-043.xht": [
-       "e880ebe9236a29aaf8a290b12a7682f0046bbcaa",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-020-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-044.xht": [
-       "e4777694d87cd6c70c63c21f6e47ce94243b42c3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-044-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-045.xht": [
-       "22781787d07ea660e45681af4086f3a0fc521dca",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-046.xht": [
-       "6cbb483aab0e2a977e44fbcbddd1bb2a565a0fd9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/reference/ref-filled-black-96px-square.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-047.xht": [
-       "b8c46a7c3984a21c9ec65a36ec2b659eb4e0ff3e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-048.xht": [
-       "97fac87bcfca460dea5ef380151f2f383cbd9969",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-049.xht": [
-       "b2504d2f14f35d49eaacffdad1799ae20b87ee4b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-049-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-050.xht": [
-       "864b6131f6d1486794a4a502376a43a2d74a1a6b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-051.xht": [
-       "ed5b7e59cfdc9fcadf2c76222d58c830f3fed75a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-052.xht": [
-       "c762d23b099775b153c4393dbcd917278143a114",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-053.xht": [
-       "df03a90f13df96b760268efb600c25b17897d151",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-052-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-054.xht": [
-       "26fabdbf1c2792b032b46108b770119105ca23a6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-054-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-055.xht": [
-       "2e7d05c681f58e11396dad1a625b85e57332fb9d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-056.xht": [
-       "346f51e84a51fbd892970d89d197863f87ed1b66",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-057.xht": [
-       "b4ddb791b84fec3cfb59a651c0e8f46f57571e88",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-058.xht": [
-       "2a7a298844ab6b78c999d6d4ca232efa9874e5b5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-059.xht": [
-       "76244e57cb35d81e5618986d6e1bef8a4feddefd",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-060.xht": [
-       "bfb3102972c1c411013131cb7cd0baa1147a7fa9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-003-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-061.xht": [
-       "40dd7763849c794966ce6ac973de35f4088bc98b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-062.xht": [
-       "95994d2a706c02ff2733e871cdd82fe8d3e5cab1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-063.xht": [
-       "c64dcdd633b1410e62c83fb3fa4a779b37a6e8cb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-064.xht": [
-       "815ea1b1666cebad96f6fa8c0602381f19188873",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-063-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-065.xht": [
-       "1678fe4bc1829f91f6a7525a3383e529bdbca357",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-005-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-066.xht": [
-       "dbd5d2078007a988541876f7e3c7c84c08d60e8f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-067.xht": [
-       "c1d71320656b2c77ecb35667f036ca7149fb2a3c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-068.xht": [
-       "e156363fce7ee1a1098cc24042027ed459f86848",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-006-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-069.xht": [
-       "16b97eb603f3050232c147b0d92c0693761b1eeb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-070.xht": [
-       "89af64ed46fbcb17c275fa4c54b3cdc5c1fe5ce6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-070-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-071.xht": [
-       "7702654314befcf10108f7e72fd716baf5e11cdb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-072.xht": [
-       "5980426786946969cb9236072f64b40155c7fe08",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-073.xht": [
-       "2cad35940d645553ac2a033c76498ee3a2433035",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-074.xht": [
-       "1930873282592386a734ede9c7e7b8968421f1a0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-073-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-075.xht": [
-       "fe12a2630f0112af36995678d3e83f71cc4de50d",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-075-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-076.xht": [
-       "7bcb5816304a152890386987b10db80ff7155980",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-077.xht": [
-       "c0efd26700df75f345bd2464937b528054707444",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-078.xht": [
-       "9e6751218efbbddb323a49a01174267040732269",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-079.xht": [
-       "13e29bb0f3ca3d50549f005fd6cf4ee86a5b2d99",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-080.xht": [
-       "d623aa5cbb6151c81fdb941a094ed81ae9c3b9b5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-009-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-081.xht": [
-       "4fa97584f8cb46633b223d4e3adc48d8f287e4e6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-082.xht": [
-       "9e31b55dda5d2dde267dd5ac0b112b88a5da9dd6",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-083.xht": [
-       "ef436507126aaf1b63d5c92d100dcf10284fbefb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-084.xht": [
-       "0a0ebf0605a1d073240433e1a73766ee17b3cdc1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-083-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-085.xht": [
-       "a9946411c0a11ea61669a7497fee4951f5551ee1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-011-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-086.xht": [
-       "8ccb35d35e47b30093311704ed8b7547b85f373f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-087.xht": [
-       "64212bda34cec9980da7f6dc192f5f48e4fd49d1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-088.xht": [
-       "d8d06a41cab8ef8f6459fde8cfacf06e05179025",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-012-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-089.xht": [
-       "78e7a186ae26f3851f164c6b648dcc0450ce1845",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-090.xht": [
-       "fe013a42cb311230a52b38701592005c7c674394",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-090-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-091.xht": [
-       "b590c99bfe4105d565ae59fe261d87cb76adb7b5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-092.xht": [
-       "2b065a14211da81914167bf1c2ea4586c7c95d48",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-093.xht": [
-       "62793e3588011d5c2b011c81774c866fadaf6e38",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-094.xht": [
-       "abdaab867a3e1f5f9db29991bcc792d458b03333",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-093-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-095.xht": [
-       "3e506b7f4f24608408fb0416290f247f4ea9b743",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-095-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-096.xht": [
-       "d404742575cba7b5db8f8ac084ca3de55219bd45",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-097.xht": [
-       "c9522e10c3f23e5f21b7e59db55e347f25986aab",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-098.xht": [
-       "6e338aa63b1f13e517733957aae77e78f11095cc",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-099.xht": [
-       "0b293b1786ab3fab25ed10aacc4980ea2bbd6a17",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-100.xht": [
-       "15a5c0db3b1cd4f0755a2a9318e4fd265741d1c7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-100-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-101.xht": [
-       "3c177a1eff7d80b956a4785163d660952524f3b1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-102.xht": [
-       "d47febcc06fca7c2b26d5448c802113ff3937b1c",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-103.xht": [
-       "0c5ca240b51c33a1377f89378b2f1105c6f608ea",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-104.xht": [
-       "eece7594177827433584131a0359fed555cd2ea8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-103-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-105.xht": [
-       "15d8940946843b84a54fc94ce63c970f76d46550",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-016-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-106.xht": [
-       "a5ecaab7d6d7d0a71aee70aa4d590a3016a904c2",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-107.xht": [
-       "06997f0fc516fa49da5c54fe72d17485e28cdc3f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-108.xht": [
-       "cc32b636cffb3a624d97fe15a6f1c909f27924d1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-017-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-109.xht": [
-       "1652b30d6c765357e7f30ea9125445df05777f73",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-110.xht": [
-       "e9b0dc220a1c135e7920327be16af4b9b7f3a8a3",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-110-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-111.xht": [
-       "a0dcfe07b7e765988c3da0b78fc3a102baa54f4e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-112.xht": [
-       "5270285044de142ff310a2863a728855dcb96fee",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-113.xht": [
-       "fe70f535d5ba80269be52d94f22a76458173e1c4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-114.xht": [
-       "4983c20b9e32be7f0ad5958cceff469eadd20007",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-113-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-115.xht": [
-       "a81edd4a1950115243525609990dff27fec151b9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-115-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-116.xht": [
-       "056b3d948fdf87fea16a3a9248763b314f6d57cb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-117.xht": [
-       "64a0a73a8141ae55104ae1240999d38da85e8333",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-118.xht": [
-       "ac5a7c6d68186eb374ba7d550aea5e4ae3d867c5",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-119.xht": [
-       "301c61535d6cfb879e225cf3f8a4bb0f42025e5f",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-120.xht": [
-       "a39c1f0563f43e0d9ae5d17eec58f70d7c110bcb",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-019-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-121.xht": [
-       "6777c26c02b665496f96cc3c3001cfd302c00993",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-122.xht": [
-       "fb58975cac1817dcef5f81a82eaad44ceb5afe3e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-123.xht": [
-       "0bc975a10c0e214035d9ee7cf7df7a08cb720298",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-124.xht": [
-       "904193d04413d9dbf2ff9d77fdc11377878e8e05",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-123-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-125.xht": [
-       "a3d4dcd1441d2830e086f7854f1da82b63a8cbc8",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-021-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-126.xht": [
-       "a4ce60bac7a58fe6a1a24a2473692dc35cb78a48",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-127.xht": [
-       "e2962c0b04d0fd1525e6af65f224eec83eaee6e4",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-128.xht": [
-       "5c6506c989e8cacda1ae541c9429cf1333465843",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-022-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "border-top-color-129.xht": [
        "d83c31d03c67652517eb893239be5a1dafefa484",
        [
@@ -42955,214 +33762,6 @@
         {}
        ]
       ],
-      "border-top-color-130.xht": [
-       "467b4117ba573c5ddfb9d3d81df1c7af8e95888b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-131.xht": [
-       "fd43bab6271097cf980a033c1b7cedd9a255b026",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-131-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-132.xht": [
-       "dabc5cc564f5a872bd05a4509ce4174b4f2b0d03",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-132-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-133.xht": [
-       "3ede926a92444d50e8438cbd70163f8b550fd7b0",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-133-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-134.xht": [
-       "32586f2eff3a6964316e675182d530f2de21a265",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-134-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-135.xht": [
-       "44b64f6346d82c52c25708a1a96815f0e7727a1a",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-135-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-136.xht": [
-       "5e03740f464bf46d2a34f1cf73282047b5f6ece1",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-136-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-137.xht": [
-       "175ca69e95ebabaf84958e233ed2c80080f7c2cf",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-137-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-138.xht": [
-       "853b02e354e2dd4085149d5c05d56335749d975b",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-138-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-139.xht": [
-       "b78baedf5a76a4c046d6b1293b40f2fb4275bac7",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-139-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-140.xht": [
-       "d738cfc4463044d3dd69c847448861eb3fffa118",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-140-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-141.xht": [
-       "6b9d0339de57e1629dcc64ae2e0da8dc8a0ca553",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-141-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-142.xht": [
-       "ba90093fd975bb5397da3121cdd1f10e83a6465e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-142-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-143.xht": [
-       "a6b9a3901fafc90f62905ee853830932eb52bcf9",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-143-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-144.xht": [
-       "589c6c46676320e6bad600a7ffed60623e226b13",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-144-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "border-top-color-145.xht": [
-       "04f2aea55cc899f61ac1ba97653b43875a213d9e",
-       [
-        null,
-        [
-         [
-          "/css/CSS2/borders/border-bottom-color-145-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "border-top-color-174.xht": [
        "fa51cad8412f3b50c03225333be7dd8c2880e31a",
        [
@@ -118780,8 +109379,8 @@
      ]
     },
     "css-fill-stroke": {
-     "paint-order-001.tentative.html": [
-      "9d1604116ba4a432740f09285e7bb9e348585796",
+     "paint-order-001.html": [
+      "8fd100c431e088f49d232d728e9790807f21be52",
       [
        null,
        [
@@ -155496,6 +146095,32 @@
          }
         ]
        ],
+       "clip-path-animation-inherit.html": [
+        "50f314da348c4c4bf2a4314b80c2e7e5b82a8564",
+        [
+         null,
+         [
+          [
+           "/css/css-masking/clip-path/animations/clip-path-animation-inherit-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "clip-path-animation-initial.html": [
+        "45e7714328a316eb4592abcab2f1d71058e129f4",
+        [
+         null,
+         [
+          [
+           "/css/css-masking/clip-path/animations/clip-path-animation-none-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "clip-path-animation-missing-0-percent.html": [
         "4d4fee1b5b6b11ea0e3efd91dc0028dd3df78d7d",
         [
@@ -155648,6 +146273,32 @@
          {}
         ]
        ],
+       "clip-path-animation-revert-layer.html": [
+        "cc23c96e2ee76f75cb30280320da3ee9e4cbdb1b",
+        [
+         null,
+         [
+          [
+           "/css/css-masking/clip-path/animations/clip-path-animation-none-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "clip-path-animation-revert.html": [
+        "8599755d3384e87a52ae6f0b06c4d0aa9a1f4158",
+        [
+         null,
+         [
+          [
+           "/css/css-masking/clip-path/animations/clip-path-animation-none-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "clip-path-animation-svg-zoom.html": [
         "f7be6d25324ce92e6bf56921fffb3eeec27cfd98",
         [
@@ -155716,6 +146367,19 @@
          }
         ]
        ],
+       "clip-path-animation-unset.html": [
+        "655215dc7f6b5a5e9d26fc279d04864bbbd61573",
+        [
+         null,
+         [
+          [
+           "/css/css-masking/clip-path/animations/clip-path-animation-none-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "clip-path-animation-zoom.html": [
         "89641240f67bfd468a260bda514ec9b91914ff0d",
         [
@@ -188405,6 +179069,32 @@
        {}
       ]
      ],
+     "collapsed-border-partial-invalidation-001.html": [
+      "67330e4d2c4e976fd4837334417151dab50e4cb6",
+      [
+       null,
+       [
+        [
+         "/css/css-tables/collapsed-border-partial-invalidation-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "collapsed-border-partial-invalidation-002.html": [
+      "e48271995cf0ebd41b2afdbe8d0a110dac280082",
+      [
+       null,
+       [
+        [
+         "/css/css-tables/collapsed-border-partial-invalidation-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "collapsed-border-positioned-tr-td.html": [
       "d5c6094497268941071e516073a54f38e5900d45",
       [
@@ -189209,6 +179899,19 @@
       ]
      ],
      "tentative": {
+      "padding-percentage.html": [
+       "67f8009de365a32275232b5c5b008072a0c8fc17",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "paint": {
        "background-image-column-collapsed.html": [
         "6e6ae7a82cfd04c09989dcea682744eb79e982a7",
@@ -235887,6 +226590,32 @@
        {}
       ]
      ],
+     "calc-rounding-001.html": [
+      "46ea2ebc04560a11f5047838a8f0b7db908e7d76",
+      [
+       null,
+       [
+        [
+         "/css/css-values/calc-rounding-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "calc-rounding-002.html": [
+      "32c4a75dd8f2185866b2f1eba5e19ff884e38373",
+      [
+       null,
+       [
+        [
+         "/css/css-values/calc-rounding-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "calc-text-indent-1.html": [
       "f1480f46e773e8767367306dd16a64950f176880",
       [
@@ -239445,6 +230174,39 @@
        {}
       ]
      ],
+     "clip-path-larger-than-border-box-on-child-of-named-element.html": [
+      "4cde9cb586bb8b9a575a110758bb420e59842069",
+      [
+       null,
+       [
+        [
+         "/css/css-view-transitions/clip-path-larger-than-border-box-on-child-of-named-element-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          [
+           "/css/css-view-transitions/clip-path-larger-than-border-box-on-child-of-named-element.html",
+           "/css/css-view-transitions/clip-path-larger-than-border-box-on-child-of-named-element-ref.html",
+           "=="
+          ],
+          [
+           [
+            0,
+            255
+           ],
+           [
+            0,
+            400
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "content-smaller-than-box-size.html": [
       "d2b8f63ca068ffc744b7b1a7b0ca8d1c25a32854",
       [
@@ -267950,65 +258712,130 @@
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.isotropic.html": [
-        "6376d07b0e640b617ef100b7c04e8fe93e352ee8",
+       "2d.filter.canvasFilterObject.gaussianBlur.isotropic.tentative.html": [
+        "f4c8c1033abc400b1876ee63d3cbfd01ac18d784",
         [
          null,
          [
           [
-           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.isotropic-expected.html",
+           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.isotropic.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-x.html": [
-        "145cb32757adbec61bb541a0cf6737b3ac9146f4",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-x.tentative.html": [
+        "b3efcb8c3e64070f40e572d0f63a0b18746209c7",
         [
          null,
          [
           [
-           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-x-expected.html",
+           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.mostly-x.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-y.html": [
-        "e921e0eaa65a6410a66aadce57fd8b1fe6096998",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-y.tentative.html": [
+        "d5cc6e0058ca23328f5d7a4d08ddcfffef2dc112",
         [
          null,
          [
           [
-           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-y-expected.html",
+           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.mostly-y.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.x-only.html": [
-        "fd6ac687f9cf72a2efbf0975e5d645c88d5d4ed8",
+       "2d.filter.canvasFilterObject.gaussianBlur.x-only.tentative.html": [
+        "4e8576fe746d6ed92a59f6973cc1550760ca39d1",
         [
          null,
          [
           [
-           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.x-only-expected.html",
+           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.x-only.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.y-only.html": [
-        "6442433e7c5a37e5447a9871e7528f16cd37b9c9",
+       "2d.filter.canvasFilterObject.gaussianBlur.y-only.tentative.html": [
+        "ec0a2353cfd18c682f3d76b060021c93972fa4f2",
         [
          null,
          [
           [
-           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.y-only-expected.html",
+           "/html/canvas/element/filters/2d.filter.canvasFilterObject.gaussianBlur.y-only.tentative-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.isotropic.html": [
+        "a2cc098896823a201c7e6f108e6b2e81b432c13d",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/filters/2d.filter.layers.gaussianBlur.isotropic-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-x.html": [
+        "0090e0e71e0a30deaef2fa725d285a47dfe94350",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/filters/2d.filter.layers.gaussianBlur.mostly-x-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-y.html": [
+        "5c481cbe255dc5155d885d543dfc0504c2c3edea",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/filters/2d.filter.layers.gaussianBlur.mostly-y-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.x-only.html": [
+        "f7940eb92154d5862635477c3665de0901c409bc",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/filters/2d.filter.layers.gaussianBlur.x-only-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.y-only.html": [
+        "59421a1ff34a659b68c500830a52f333d9fe6f0c",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/filters/2d.filter.layers.gaussianBlur.y-only-expected.html",
            "=="
           ]
          ],
@@ -268225,6 +259052,58 @@
          {}
         ]
        ],
+       "2d.layer.ctm.filter.html": [
+        "3d56ac36011cdac9aff399c0159806162edf9b58",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.ctm.filter-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.resetTransform.html": [
+        "9291f8f3f2ff4167d16925d77e33a3428b2c416f",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.ctm.resetTransform-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.setTransform.html": [
+        "b5d98ba45fbd7959cb95d35eee9d49dc16d8224a",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.ctm.setTransform-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.shadow-in-transformed-layer.html": [
+        "f047bd30b285ad7cadd66060450843fca0acd14b",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.ctm.shadow-in-transformed-layer-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.layer.drawImage.html": [
         "58206c3eb87408b2993740cf9912bf271d84d3f1",
         [
@@ -268395,7 +259274,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.blending.html": [
-        "17e0f0c8c5bae2d641ae79c798d14efa47694d1c",
+        "27989c79e93db9fe4bb26782efacce20dd3570ff",
         [
          null,
          [
@@ -268404,7 +259283,23 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              1
+             ],
+             [
+              0,
+              2440
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.blending.shadow.html": [
@@ -268421,7 +259316,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.composite.html": [
-        "71a27cf710b2586931378f266cf745995af4019b",
+        "29041d493382f1106b454034550dbca2a7838b80",
         [
          null,
          [
@@ -268430,7 +259325,23 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              1
+             ],
+             [
+              0,
+              5204
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.composite.shadow.html": [
@@ -268447,7 +259358,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.html": [
-        "5133aa170e7e843816a6badfb753ac8d514be238",
+        "85718cffba1f9875bfb5fe9f5bc5631194914d5e",
         [
          null,
          [
@@ -268456,11 +259367,27 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              2
+             ],
+             [
+              0,
+              6766
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.shadow.html": [
-        "6aa8e75a9507e60d4bf922cd300aafc472996037",
+        "aaeb167ccf8235f56c139f002906f38ee1ff9a64",
         [
          null,
          [
@@ -268469,7 +259396,23 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              2
+             ],
+             [
+              0,
+              6311
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.blending.html": [
@@ -269989,130 +260932,260 @@
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.isotropic.html": [
-        "4417a1917c9abe01ad1fd7ed90051c72be1080e7",
+       "2d.filter.canvasFilterObject.gaussianBlur.isotropic.tentative.html": [
+        "801e6fdb8c5b867fd5cf84c2baa0d7ebfb872a63",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.isotropic-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.isotropic.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.isotropic.w.html": [
-        "d2024ad205e415ef069faef0a47d4008c531dbe9",
+       "2d.filter.canvasFilterObject.gaussianBlur.isotropic.tentative.w.html": [
+        "6c7c7f7649d8e17a962c22fe4352bb26226bb152",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.isotropic-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.isotropic.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-x.html": [
-        "2ea26359fe9b5f05a874a79566a4964351aaff70",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-x.tentative.html": [
+        "ba986d8e7b42aea8e42e8bc014f094dfee0fcdea",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-x-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.mostly-x.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-x.w.html": [
-        "fa49ea4682823b3b48b6fa77f3dbb4fae2e61812",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-x.tentative.w.html": [
+        "86fe086327df6b70463224f558f54835d0bbd7d2",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-x-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.mostly-x.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-y.html": [
-        "a9783ccb6a006a34d8cba0d533e23099c6ee7024",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-y.tentative.html": [
+        "0265cfa6c4fd643cda2eedb5792c6dfdf479c88f",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-y-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.mostly-y.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-y.w.html": [
-        "ab83f50ea0e36b36caeb3411f698b19cf1fec636",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-y.tentative.w.html": [
+        "c22b3208571babcf281d394c6e970adf9c9f95a0",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-y-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.mostly-y.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.x-only.html": [
-        "3028c2a700e1c4d2736de39565abfbbd00f1ac6f",
+       "2d.filter.canvasFilterObject.gaussianBlur.x-only.tentative.html": [
+        "3ed8e9ddf9f794f5a6bd6bc087bb00cf21cd205f",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.x-only-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.x-only.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.x-only.w.html": [
-        "e8482cf3ed8df4d0c66dc2fd99a9f3011f6edc19",
+       "2d.filter.canvasFilterObject.gaussianBlur.x-only.tentative.w.html": [
+        "35cbc1b36580c3bdb7f23092a1a5781214386d2d",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.x-only-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.x-only.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.y-only.html": [
-        "fca324716b4807d54c74a0045704de3ced4040aa",
+       "2d.filter.canvasFilterObject.gaussianBlur.y-only.tentative.html": [
+        "f563ad9d770b2222bb98d1a2bb0b3bda5d9548a1",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.y-only-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.y-only.tentative-expected.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.y-only.w.html": [
-        "50cfb3083a2507040dabb7fc577d5edbbba15534",
+       "2d.filter.canvasFilterObject.gaussianBlur.y-only.tentative.w.html": [
+        "171a41caa8ce51d8adb001368a0455e927c8fab7",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.tentative.y-only-expected.html",
+           "/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.gaussianBlur.y-only.tentative-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.isotropic.html": [
+        "50a98df1bed0b50618c9ffd2e9ccae1b37fccfdd",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.isotropic-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.isotropic.w.html": [
+        "a68b8e78a2c0f276c9c3c467794d7f663359e214",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.isotropic-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-x.html": [
+        "efc634796c2d95fcf60497bcb80cb48fc62786aa",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.mostly-x-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-x.w.html": [
+        "7d20d7850307f635827a679153015175a63acaef",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.mostly-x-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-y.html": [
+        "bdc6e66fe58f4ec50206af8a8a3841feb9eda077",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.mostly-y-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-y.w.html": [
+        "dfd6438b1977df60655a9d2b8a2dc8c8a1cc5197",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.mostly-y-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.x-only.html": [
+        "0d42acb8b5f9ddab79df2b31d9507dde84766318",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.x-only-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.x-only.w.html": [
+        "b235c7ad38c3037116d60983f05b9d9efdfdddc8",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.x-only-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.y-only.html": [
+        "c9bc85d6997e37331f5f885a9178e717cb8e7d63",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.y-only-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.filter.layers.gaussianBlur.y-only.w.html": [
+        "5deb96c2552925e4ab3460e6383a9d55bff56410",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/filters/2d.filter.layers.gaussianBlur.y-only-expected.html",
            "=="
           ]
          ],
@@ -270537,6 +261610,110 @@
          {}
         ]
        ],
+       "2d.layer.ctm.filter.html": [
+        "e5efc24bcc4f1e19ba49e5e5bee67cc21cce1eb6",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.ctm.filter-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.filter.w.html": [
+        "760a65e2c82bac684351844e8fdc24cfe2dea33f",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.ctm.filter-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.resetTransform.html": [
+        "9508b34044c784d80b6e1852502e2204c57e9107",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.ctm.resetTransform-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.resetTransform.w.html": [
+        "7bf63e1473e25080b3d8b1915409954225d452ab",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.ctm.resetTransform-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.setTransform.html": [
+        "91034943b6da1d10077c360c9cd2f8bf373ff745",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.ctm.setTransform-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.setTransform.w.html": [
+        "8b1ea1ce5129efe01d2cba1592ea9adbc1ccd39f",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.ctm.setTransform-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.shadow-in-transformed-layer.html": [
+        "59305076f0ba942135102139eb49d624469dcc4a",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.ctm.shadow-in-transformed-layer-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.ctm.shadow-in-transformed-layer.w.html": [
+        "486a028335f2995ae299597b40f01c63a6f73758",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.ctm.shadow-in-transformed-layer-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.layer.drawImage.html": [
         "37718f6f2c5290c91879564dee61039bd3c93142",
         [
@@ -270850,7 +262027,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.blending.html": [
-        "be6f962b3371e743a5ca784bc798327e54a8fec5",
+        "1e5c6ad8b7597e9dc17b5bc06b1fa3216f512442",
         [
          null,
          [
@@ -270859,7 +262036,23 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              1
+             ],
+             [
+              0,
+              2440
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.blending.shadow.html": [
@@ -270889,7 +262082,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.blending.w.html": [
-        "2b53ad7c1ee4a0498399a8a11a04f2bb238d0548",
+        "142e900fd1b611492c10bc904d317e8ae9370033",
         [
          null,
          [
@@ -270898,11 +262091,27 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              1
+             ],
+             [
+              0,
+              2440
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.composite.html": [
-        "087fea88af8ca3961f1e302642336dcd0bf42af9",
+        "1a9bc8b73349d8c0559f74005304e143990f1e59",
         [
          null,
          [
@@ -270911,7 +262120,23 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              1
+             ],
+             [
+              0,
+              5204
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.composite.shadow.html": [
@@ -270941,7 +262166,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.composite.w.html": [
-        "6aa83a32788057e5fc8a3d0643574c3c000c6cac",
+        "5c90fe95aa7be034bcf790ac84e721875f6e3482",
         [
          null,
          [
@@ -270950,11 +262175,27 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              1
+             ],
+             [
+              0,
+              5204
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.html": [
-        "f1d631c25ce17402b1a58f341f8e7224ce1e04ec",
+        "f64e8925f0c4c3b2631cfacd95d37733c4582aa1",
         [
          null,
          [
@@ -270963,11 +262204,27 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              2
+             ],
+             [
+              0,
+              6766
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.shadow.html": [
-        "2548c211810ced1086c0b670847c649f0499ede5",
+        "5e8911ee176e36dbe390cec9f117a928a3126f08",
         [
          null,
          [
@@ -270976,11 +262233,27 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              2
+             ],
+             [
+              0,
+              6311
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.shadow.w.html": [
-        "5e1494422ee0e9aa7f5bb7cae7f8a9401fe20eb7",
+        "b3be7e1ac80f29e3bb3cf5baccc3f0e830d8e4df",
         [
          null,
          [
@@ -270989,11 +262262,27 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              2
+             ],
+             [
+              0,
+              6311
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.alpha.w.html": [
-        "e75d668ad5489cadec9a6405a715bd980d89410a",
+        "21e55f856c78c05e4e5e79c770ab4344d87b499f",
         [
          null,
          [
@@ -271002,7 +262291,23 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              2
+             ],
+             [
+              0,
+              6766
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "2d.layer.global-states.filter.blending.html": [
@@ -285392,6 +276697,19 @@
       {}
      ]
     ],
+    "line-height-preserved-segment-break.html": [
+     "8ad2651f4b999091996682be72745e31e0ce559a",
+     [
+      null,
+      [
+       [
+        "/css/reference/ref-filled-green-100px-square.xht",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
     "line-height-quirks-mode.html": [
      "9e9baf62226dfccc15f81b6d22edb87a29e2d313",
      [
@@ -293737,6 +285055,14 @@
       []
      ]
     },
+    "interest-group": {
+     "permissions": {
+      "default.py": [
+       "c24531c2f76db54d1af8cf415368e0b4ec2eb4d2",
+       []
+      ]
+     }
+    },
     "private-aggregation": {
      "debug": {
       "report-protected-audience": [
@@ -295441,7 +286767,7 @@
       []
      ],
      "helpers.js": [
-      "5778159d4c8f0ae56801d169841bf1aaf3c2b9ed",
+      "e5c749931e03c2335d1a5f9f076fe3caaee70fa7",
       []
      ],
      "reporting_origin.py": [
@@ -295693,11 +287019,11 @@
     ],
     "headers": {
      "header-origin-same-origin-expected.txt": [
-      "65ed3be30ce73f18b39e687772dbfbdc65bfa8f8",
+      "0fab8104bf5a860c6b45af4b79309c18bd87a652",
       []
      ],
      "header-referrer.js": [
-      "f30385386aca6f1f4b4a9defd1bea4ddfa21dd5a",
+      "1e9d4f697d008ee793b8649280bbe712acf56d0f",
       []
      ]
     },
@@ -300223,6 +291549,10 @@
        "00700666675413d378bba7c3f8bed12f2b9b4849",
        []
       ],
+      "manifest-token-nocors.json": [
+       "77ba1b4702bc03c324d1af007eacb9d24df62c3b",
+       []
+      ],
       "manifest.py": [
        "a40fc100eee697ed7dcd451626409af18606442e",
        []
@@ -300292,7 +291622,7 @@
        []
       ],
       "request-params-check.py": [
-       "daf91aad8f154af610d299c0de249bbc76db53c8",
+       "b774496d5dab3e9bbce92f94cb0dc27128b909d4",
        []
       ],
       "resolve.html": [
@@ -300312,7 +291642,7 @@
        []
       ],
       "token.py": [
-       "b914eb2d9656cb4a892c8b51dc1754748b86d5c5",
+       "7ec81c390a9ea116e0a1809e08159a1d1c40e5a1",
        []
       ],
       "token_with_account_id.py": [
@@ -300547,286 +291877,10 @@
        "95d6ab883eaf9cb79630886c4c1a5bdcc07bb88a",
        []
       ],
-      "background-color-002-ref.xht": [
-       "b469a4cb8dc47b04b31f83653a9cc922dd245e73",
-       []
-      ],
-      "background-color-003-ref.xht": [
-       "ecc99ecb07c1d6a8beb8df2ad668ebff5b8dd957",
-       []
-      ],
-      "background-color-004-ref.xht": [
-       "f0ae15aefb36bcd94b1d96b2d9d68707986cea98",
-       []
-      ],
-      "background-color-005-ref.xht": [
-       "388bd8ab70a55a4e8658d639b165a1cf4f6f180d",
-       []
-      ],
-      "background-color-006-ref.xht": [
-       "5041fb87d3c62a16e2739771f9760f00f422e1d2",
-       []
-      ],
-      "background-color-009-ref.xht": [
-       "e818c26885f403013c862d5885a0c9bdf46c7665",
-       []
-      ],
-      "background-color-010-ref.xht": [
-       "8dbab72574bd48d801a73bf1fd92c22c618792c1",
-       []
-      ],
-      "background-color-011-ref.xht": [
-       "9f4b87fd5ee387732160485bb278cd3216c8c6af",
-       []
-      ],
-      "background-color-012-ref.xht": [
-       "59025f39b7088aae2e3f440e3b6f35819e6ec939",
-       []
-      ],
-      "background-color-013-ref.xht": [
-       "62226dacb9fbebd99a74c33442c19be4edaa5cf3",
-       []
-      ],
-      "background-color-014-ref.xht": [
-       "cdfa33419c2579113469e2d54f22067d5c703440",
-       []
-      ],
-      "background-color-015-ref.xht": [
-       "150cb97303574c700075265144b88ba915c9c1d4",
-       []
-      ],
-      "background-color-016-ref.xht": [
-       "60460bd998e78fc909be797e9073c2b6e197f83e",
-       []
-      ],
-      "background-color-017-ref.xht": [
-       "3c841881993c43bc5a654097b43603306cbd5c1a",
-       []
-      ],
-      "background-color-019-ref.xht": [
-       "79ac0258078cec2368b62a01002880291c5049a1",
-       []
-      ],
-      "background-color-020-ref.xht": [
-       "290b880fe841b6b90a4598aeb5efb05c5f001284",
-       []
-      ],
-      "background-color-021-ref.xht": [
-       "2c7402ed17ca96f4da87f217c3500bd3ede85433",
-       []
-      ],
-      "background-color-022-ref.xht": [
-       "307427e5b791e9b8aeac9391afd191b6bff0a6aa",
-       []
-      ],
-      "background-color-025-ref.xht": [
-       "b469a4cb8dc47b04b31f83653a9cc922dd245e73",
-       []
-      ],
-      "background-color-026-ref.xht": [
-       "0b2d2856df50f76e5a2745e1aa178a88b9bca266",
-       []
-      ],
-      "background-color-027-ref.xht": [
-       "f0ae15aefb36bcd94b1d96b2d9d68707986cea98",
-       []
-      ],
-      "background-color-028-ref.xht": [
-       "59a7fa02b72b3f09b3aeda914377126432d2180d",
-       []
-      ],
-      "background-color-029-ref.xht": [
-       "5041fb87d3c62a16e2739771f9760f00f422e1d2",
-       []
-      ],
-      "background-color-032-ref.xht": [
-       "366b222e9bdd1a941c67a51d5c3060c413e5b2be",
-       []
-      ],
-      "background-color-033-ref.xht": [
-       "8dbab72574bd48d801a73bf1fd92c22c618792c1",
-       []
-      ],
-      "background-color-034-ref.xht": [
-       "9f135dc7454ab8bbada2414a75798939219e05b4",
-       []
-      ],
-      "background-color-035-ref.xht": [
-       "59025f39b7088aae2e3f440e3b6f35819e6ec939",
-       []
-      ],
-      "background-color-037-ref.xht": [
-       "75cf4a2f3428da7cc1e7f187b912090156b54c21",
-       []
-      ],
-      "background-color-038-ref.xht": [
-       "150cb97303574c700075265144b88ba915c9c1d4",
-       []
-      ],
-      "background-color-039-ref.xht": [
-       "6d08ab58951a7d082fd70728a3a12fee38035f4b",
-       []
-      ],
-      "background-color-040-ref.xht": [
-       "3c841881993c43bc5a654097b43603306cbd5c1a",
-       []
-      ],
-      "background-color-041-ref.xht": [
-       "389ae583eddca353182c93107ffd97746d81de4a",
-       []
-      ],
-      "background-color-042-ref.xht": [
-       "916cd6647cd851f9cbf3c5ab1c8ed7c94267c36c",
-       []
-      ],
-      "background-color-043-ref.xht": [
-       "290b880fe841b6b90a4598aeb5efb05c5f001284",
-       []
-      ],
-      "background-color-044-ref.xht": [
-       "1435c39446263a6f72620e79789c84f8d855223d",
-       []
-      ],
-      "background-color-045-ref.xht": [
-       "307427e5b791e9b8aeac9391afd191b6bff0a6aa",
-       []
-      ],
-      "background-color-049-020202-ref.xht": [
-       "4b37e52103130a79b77dd5aa0f451bbd47dd0058",
-       []
-      ],
-      "background-color-049-030303-ref.xht": [
-       "f5381c0c0d3bcfd0f52b2f84b2df3a6aa1cd0ae3",
-       []
-      ],
-      "background-color-052-ref.xht": [
-       "1e98cfe008bf52bb115b50f615f403eb30f59c81",
-       []
-      ],
-      "background-color-054-fcfcfc-ref.xht": [
-       "602375664818ca9cbdc958e17818ef5947c863e5",
-       []
-      ],
-      "background-color-054-fdfdfd-ref.xht": [
-       "58104c73c17620edc1caccf8d50a4bc956892fd5",
-       []
-      ],
-      "background-color-063-ref.xht": [
-       "43cbdd90997717c5c9186057cef95d9890e87432",
-       []
-      ],
-      "background-color-070-020000-ref.xht": [
-       "b60b3c17e0ef75ac5582c892bea5fa4f5b737648",
-       []
-      ],
-      "background-color-070-030000-ref.xht": [
-       "97ab0b2a04cf27c6bddfd9267c6da2f516001736",
-       []
-      ],
-      "background-color-073-ref.xht": [
-       "3c4b5c2af038c7e9596cf7b58fa188163613e431",
-       []
-      ],
-      "background-color-075-fc0000-ref.xht": [
-       "7cfa6f5b93c93a476d077adba85e9f91ccd4bc9c",
-       []
-      ],
-      "background-color-075-fd0000-ref.xht": [
-       "77c1d9a5ac56422c0a0b0c36c16516dd9163a851",
-       []
-      ],
-      "background-color-083-ref.xht": [
-       "05116ff48083a1f9da5949b8e7a8cd0cdb1b068e",
-       []
-      ],
-      "background-color-090-000200-ref.xht": [
-       "1e43bfad1c6a3a4bb0244480dbd02d73dcebb660",
-       []
-      ],
-      "background-color-090-000300-ref.xht": [
-       "6a072d9954c8cf07b24c21d57c9a8e32e432b283",
-       []
-      ],
-      "background-color-093-ref.xht": [
-       "280c4e54056c11b69d7cc4e12c1cc58233cac440",
-       []
-      ],
-      "background-color-095-00fc00-ref.xht": [
-       "d1d9355d9bb213e22a162c53ba1d7ad38d1fef79",
-       []
-      ],
-      "background-color-095-00fd00-ref.xht": [
-       "e5dec694c474cca4224249290ca57bbcdaa7ad81",
-       []
-      ],
-      "background-color-103-ref.xht": [
-       "934fcd6da64b14d20a116291e7e7e4ff1636d1fe",
-       []
-      ],
-      "background-color-110-000002-ref.xht": [
-       "ce7525c80bb273eee70f83795a37393404d6887e",
-       []
-      ],
-      "background-color-110-000003-ref.xht": [
-       "b6e2f8a8c37fc2f16698d244c1c8514a2163f4a8",
-       []
-      ],
-      "background-color-113-ref.xht": [
-       "120857be31ede81fbfb6f69b7545b364be2c04c3",
-       []
-      ],
-      "background-color-115-0000fc-ref.xht": [
-       "55590fcccb1912be93bbdb8f112d5cafca94c345",
-       []
-      ],
-      "background-color-115-0000fd-ref.xht": [
-       "83a5e96e608d6ccfc93688c4f76a58f56c24437c",
-       []
-      ],
-      "background-color-123-ref.xht": [
-       "68617d2c43a82f4c5e3e6b94e0f21268f72cbab7",
-       []
-      ],
       "background-color-129-ref.xht": [
        "bf2a612ed02080e0af2f28030cfb0ea0729fdb2e",
        []
       ],
-      "background-color-132-ref.xht": [
-       "9d6a313268e70b523a1cbe4bfd8376bac8ee1033",
-       []
-      ],
-      "background-color-135-ref.xht": [
-       "aa547b0a5422cd92009e37c1ce42ccc66f92b233",
-       []
-      ],
-      "background-color-136-ref.xht": [
-       "c3382a769aa55fa6c36654268e8d3cd7bdfa7f70",
-       []
-      ],
-      "background-color-138-ref.xht": [
-       "832375425ce6abe2776d38fba0f48153587eb8c7",
-       []
-      ],
-      "background-color-139-ref.xht": [
-       "587737848bf87d704c725eeab4a3c81c9189d736",
-       []
-      ],
-      "background-color-140-ref.xht": [
-       "056f8e4dcf20e08de5fe1f694fa4476b0e72e268",
-       []
-      ],
-      "background-color-142-ref.xht": [
-       "3f7ffb2f2bf589ea4190ac77a63bcb9dbee5a94a",
-       []
-      ],
-      "background-color-143-ref.xht": [
-       "70c54ff1a9ba59c67c087c9cf6d1aec670a3bd75",
-       []
-      ],
-      "background-color-145-ref.xht": [
-       "1d05b5f071d0d8018d39d12fb98bf4cc9db22c1c",
-       []
-      ],
       "background-color-175-ref.xht": [
        "3b320296aebfaeb6d8b68a8de4a876921c5edb6a",
        []
@@ -301671,246 +292725,10 @@
        "ff381421b7ac5f70952f610b93d18561d81136d6",
        []
       ],
-      "border-bottom-color-001-ref.xht": [
-       "7c5bdccdce16321e12a9664f98e0c092001d9e0c",
-       []
-      ],
-      "border-bottom-color-003-ref.xht": [
-       "b2b51318751345c51948f7dfa1aa24ed0099cffc",
-       []
-      ],
-      "border-bottom-color-004-ref.xht": [
-       "aa7950069d2f18c2ee8cd2bd8c74dce664bce530",
-       []
-      ],
-      "border-bottom-color-005-ref.xht": [
-       "eb79eb193dfa3fccc3968f7274eee22f337f0713",
-       []
-      ],
-      "border-bottom-color-006-ref.xht": [
-       "9ef802086a8d161e34aa7ed91d2033051294965f",
-       []
-      ],
-      "border-bottom-color-009-ref.xht": [
-       "e5076a43ed8851c197db6bd87d8690f80e26a9aa",
-       []
-      ],
-      "border-bottom-color-010-ref.xht": [
-       "92ea2c169f32b5952ee8bab82508b6d704a09295",
-       []
-      ],
-      "border-bottom-color-011-ref.xht": [
-       "1c97de1ffcd359c3df039df08c35051fe89d44b6",
-       []
-      ],
-      "border-bottom-color-012-ref.xht": [
-       "ea9e7c3bcdc57c08b92cb58c19870f26b0098882",
-       []
-      ],
-      "border-bottom-color-014-ref.xht": [
-       "d3082895e93514d855cf9159e01d28eb650b3ae6",
-       []
-      ],
-      "border-bottom-color-015-ref.xht": [
-       "b04da2378811af19ed28f568692447c4b6dd1ee7",
-       []
-      ],
-      "border-bottom-color-016-ref.xht": [
-       "538f9051c2b3edaa4c1804a4333a3ccd455a8498",
-       []
-      ],
-      "border-bottom-color-017-ref.xht": [
-       "cf6912694c1cbf16307ffa906fe0a92c8da9d6d7",
-       []
-      ],
-      "border-bottom-color-019-ref.xht": [
-       "322c6fc059e8408446c6fbd0fb07cc0adf9371a8",
-       []
-      ],
-      "border-bottom-color-020-ref.xht": [
-       "833ec72aa3470948a6f34127f8cdc54b82266b08",
-       []
-      ],
-      "border-bottom-color-021-ref.xht": [
-       "4ea14313ac48b87efbf9063b96b259571dab2fad",
-       []
-      ],
-      "border-bottom-color-022-ref.xht": [
-       "d99e3eaf48175af761b16462ce04d618d9c6f24c",
-       []
-      ],
-      "border-bottom-color-026-ref.xht": [
-       "79cf8fd3c0a71b7977f79ba3ec1e92549171f1aa",
-       []
-      ],
-      "border-bottom-color-027-ref.xht": [
-       "aa7950069d2f18c2ee8cd2bd8c74dce664bce530",
-       []
-      ],
-      "border-bottom-color-028-ref.xht": [
-       "dad179e9eaa12581ee254f9e1d75fabb6ca6a54e",
-       []
-      ],
-      "border-bottom-color-032-ref.xht": [
-       "d5f9edb9e36f4ba7bf6e529984d97ec148dcb3ac",
-       []
-      ],
-      "border-bottom-color-034-ref.xht": [
-       "29939695788f42b1031f386872b99a0f5811ad2f",
-       []
-      ],
-      "border-bottom-color-037-ref.xht": [
-       "f89e162bd8d34f009de02fa02484a217d4c86237",
-       []
-      ],
-      "border-bottom-color-038-ref.xht": [
-       "b04da2378811af19ed28f568692447c4b6dd1ee7",
-       []
-      ],
-      "border-bottom-color-039-ref.xht": [
-       "192db0e6f9b80b00b0157cebd450928aa72f2cfe",
-       []
-      ],
-      "border-bottom-color-042-ref.xht": [
-       "11bffd78f2ef34c8b338d83c69d48da548ea45f6",
-       []
-      ],
-      "border-bottom-color-044-ref.xht": [
-       "3d27161bc47909d73451c90abdb08fe06b0a4165",
-       []
-      ],
-      "border-bottom-color-049-ref.xht": [
-       "344ce16730732139c44a3c60d2d182ac300b1271",
-       []
-      ],
-      "border-bottom-color-052-ref.xht": [
-       "8096f85a34258c38b50736f331cc9324d639c512",
-       []
-      ],
-      "border-bottom-color-054-ref.xht": [
-       "9d1c01f601152b10beac4885b2154b51bd29d469",
-       []
-      ],
-      "border-bottom-color-063-ref.xht": [
-       "3afc17f0ed9e19131ef2a2792c420ec13019eafa",
-       []
-      ],
-      "border-bottom-color-070-ref.xht": [
-       "8e185252fab793f51f3537625409ec24555f7294",
-       []
-      ],
-      "border-bottom-color-073-ref.xht": [
-       "9c8b4d8c643ae7ab5b587c1b745699c2271d3188",
-       []
-      ],
-      "border-bottom-color-075-ref.xht": [
-       "813946da33074aaf8f2f42e23b59adf0b9ed7389",
-       []
-      ],
-      "border-bottom-color-083-ref.xht": [
-       "bf6367d4efe0f088d3852dc42929ef32f51666a9",
-       []
-      ],
-      "border-bottom-color-090-ref.xht": [
-       "d18a102f4f32d56131b8005b69f09d57f7980f5c",
-       []
-      ],
-      "border-bottom-color-093-ref.xht": [
-       "e6d82904856a35607382acc4888f44429a9dda88",
-       []
-      ],
-      "border-bottom-color-095-ref.xht": [
-       "938e1105056f58129ea38841da63af1d938e6d88",
-       []
-      ],
-      "border-bottom-color-100-ref.xht": [
-       "27a0264086698c9c81d40d3662f684ab5c92d3de",
-       []
-      ],
-      "border-bottom-color-103-ref.xht": [
-       "3f0eb480ad0b3af5a8d6b9eb4934a30b1f11d69a",
-       []
-      ],
-      "border-bottom-color-110-ref.xht": [
-       "a9241f5351a6549d567054c490f526e240e903a1",
-       []
-      ],
-      "border-bottom-color-113-ref.xht": [
-       "030ee6ec0043f264d54420f366932cfa170a9033",
-       []
-      ],
-      "border-bottom-color-115-ref.xht": [
-       "46288771833caa3639376da59ae71359d37e6e71",
-       []
-      ],
-      "border-bottom-color-123-ref.xht": [
-       "6e03bafdd7502298116d316686a2d875a11adee4",
-       []
-      ],
       "border-bottom-color-129-ref.xht": [
        "290b83cf674ff6e0ba3a74ad044dedb0d0b9f98b",
        []
       ],
-      "border-bottom-color-131-ref.xht": [
-       "4e5d9de91eb969b1244d6c2836b6a0a17b09115d",
-       []
-      ],
-      "border-bottom-color-132-ref.xht": [
-       "713977b023b6dac8c314d3b226d5b4022003a40b",
-       []
-      ],
-      "border-bottom-color-133-ref.xht": [
-       "5db22dc25452f49a1247fa0e5849e03e7d4c7099",
-       []
-      ],
-      "border-bottom-color-134-ref.xht": [
-       "beccb7d434eb75f68a7238e6d2a5e7473b542d15",
-       []
-      ],
-      "border-bottom-color-135-ref.xht": [
-       "7546efe622d40e13e011e6393416a4172cbc9b33",
-       []
-      ],
-      "border-bottom-color-136-ref.xht": [
-       "a6b78590d5342d0495df54e6dacc8d64e507a104",
-       []
-      ],
-      "border-bottom-color-137-ref.xht": [
-       "80bc045ae08f5826caef14c45515bbe741db9051",
-       []
-      ],
-      "border-bottom-color-138-ref.xht": [
-       "23131e179cb76fde6b031509af72d61f4e8a2cb0",
-       []
-      ],
-      "border-bottom-color-139-ref.xht": [
-       "3569017b366dc38d2f5f63f67e295d8ac8a775c4",
-       []
-      ],
-      "border-bottom-color-140-ref.xht": [
-       "f0efa8828606ceddd7fabfcf671ad4cc983f2ba0",
-       []
-      ],
-      "border-bottom-color-141-ref.xht": [
-       "b15072ea27cb2117ede0a10fcbca98fc0f9a2b19",
-       []
-      ],
-      "border-bottom-color-142-ref.xht": [
-       "814f26daa65784771ab95e1e0d5f08b76cf371ea",
-       []
-      ],
-      "border-bottom-color-143-ref.xht": [
-       "2acd5974e35221bc35421a7e892d5b2ed38b4d17",
-       []
-      ],
-      "border-bottom-color-144-ref.xht": [
-       "374461a4f0cd8126c88902cbef16d90857905bbf",
-       []
-      ],
-      "border-bottom-color-145-ref.xht": [
-       "a7e37e77a62ab18c7c93537db0a065abca66c830",
-       []
-      ],
       "border-bottom-style-005-ref.xht": [
        "be3e33274f9b84abc9f3ec76f6aa01c4fc05492d",
        []
@@ -302059,250 +292877,10 @@
        "fb0c1f515d21888af7f48f1d2b3d8e18885d965f",
        []
       ],
-      "border-right-color-001-ref.xht": [
-       "5e969a7057d1c3326337d338b802007e0a4a378d",
-       []
-      ],
-      "border-right-color-003-ref.xht": [
-       "cd50ec9c95f08b6e37571ec431219a37fc1df8a0",
-       []
-      ],
-      "border-right-color-004-ref.xht": [
-       "6658033e03f13acd886066c14f3e6b65d0a35cbc",
-       []
-      ],
-      "border-right-color-005-ref.xht": [
-       "271f0257338379fb8ab5c2598285ae13442a2621",
-       []
-      ],
-      "border-right-color-006-ref.xht": [
-       "54a3f0780dfa36b5358e8977889dbd3d9c64729d",
-       []
-      ],
-      "border-right-color-007-ref.xht": [
-       "33ec214d70c4ae870d06c7f232daa64acb76aa48",
-       []
-      ],
-      "border-right-color-009-ref.xht": [
-       "d29b3cff006f317349ebd99c6cf8092b20b854df",
-       []
-      ],
-      "border-right-color-010-ref.xht": [
-       "1f4e1bb39346a5dd3d3cf12c3ab10d38ed83cd8e",
-       []
-      ],
-      "border-right-color-011-ref.xht": [
-       "caf4b75eecef0f493aba5772770f20b2bf3a31cf",
-       []
-      ],
-      "border-right-color-012-ref.xht": [
-       "97e1d2d5511f5c6d01fb011ca292fbd4c9fdb474",
-       []
-      ],
-      "border-right-color-014-ref.xht": [
-       "1d6efa8dbaabf6fae1af6eeb82f4c9967508c5bc",
-       []
-      ],
-      "border-right-color-015-ref.xht": [
-       "ea5d366423906797c2433a6e84579d11ca2517ba",
-       []
-      ],
-      "border-right-color-016-ref.xht": [
-       "ce65cb7b2eaa63b67039cc6b01edb4e8f31ab5a7",
-       []
-      ],
-      "border-right-color-017-ref.xht": [
-       "5c86113e20a49fd8817c992c8b7607e278fb6340",
-       []
-      ],
-      "border-right-color-019-ref.xht": [
-       "2ed1d89d019e06e9115a61c96fb85a8293b9481a",
-       []
-      ],
-      "border-right-color-020-ref.xht": [
-       "3678117f240f14cf5c58f4876537218149197447",
-       []
-      ],
-      "border-right-color-021-ref.xht": [
-       "54e59ecce1a6a050b4928a0b8998983f763b98e3",
-       []
-      ],
-      "border-right-color-022-ref.xht": [
-       "5649a4692fb1220d3d74d267feaa69f391e6a99e",
-       []
-      ],
-      "border-right-color-026-ref.xht": [
-       "b04781282ed8545b782a70be86d1a15937de78db",
-       []
-      ],
-      "border-right-color-027-ref.xht": [
-       "6658033e03f13acd886066c14f3e6b65d0a35cbc",
-       []
-      ],
-      "border-right-color-028-ref.xht": [
-       "e2f0624e0a438079515931f66482038ea4b5b291",
-       []
-      ],
-      "border-right-color-032-ref.xht": [
-       "4de6e2612e0cc33708706d3cf11ca6e76c07a007",
-       []
-      ],
-      "border-right-color-034-ref.xht": [
-       "b42d611a0ccf752035f59929131f90cfd455841a",
-       []
-      ],
-      "border-right-color-037-ref.xht": [
-       "c471d6e34896379a5e150c070b17844d498613eb",
-       []
-      ],
-      "border-right-color-038-ref.xht": [
-       "ea5d366423906797c2433a6e84579d11ca2517ba",
-       []
-      ],
-      "border-right-color-039-ref.xht": [
-       "75d200c8f69eceba1b8a8ce8839062f5151f6cec",
-       []
-      ],
-      "border-right-color-042-ref.xht": [
-       "c62e0983af57c009fca90168f3ebf00abaf2ebc3",
-       []
-      ],
-      "border-right-color-044-ref.xht": [
-       "935decca7110cbe0ac0bd2019727af82d6e2a999",
-       []
-      ],
-      "border-right-color-049-ref.xht": [
-       "a1e55f878d87501c59a110127c66665a74361b0e",
-       []
-      ],
-      "border-right-color-052-ref.xht": [
-       "3eab45d6ef27f2d62be7673afc5f40688b658f67",
-       []
-      ],
-      "border-right-color-054-ref.xht": [
-       "1a8528541919b23e32d6e3a12c4dd634ea6bcd73",
-       []
-      ],
-      "border-right-color-063-ref.xht": [
-       "31fcddc30bcc184d9917ba305cb642338bd07e15",
-       []
-      ],
-      "border-right-color-070-ref.xht": [
-       "f0ed168b38131f3422032380115266ee2346546d",
-       []
-      ],
-      "border-right-color-073-ref.xht": [
-       "a851dd306fd2b1925d59c41f1d240e8e48c02a02",
-       []
-      ],
-      "border-right-color-075-ref.xht": [
-       "c0708eb0b317c74821b1ec2eff8e47f67d8c556d",
-       []
-      ],
-      "border-right-color-083-ref.xht": [
-       "fcb41f086599be2c6cb8026387fc3139d8102a50",
-       []
-      ],
-      "border-right-color-090-ref.xht": [
-       "07a74483a102d85722177173be0338347df2619d",
-       []
-      ],
-      "border-right-color-093-ref.xht": [
-       "8a38a2b9e27cd1775ab556f8ed8bd06dba5913cf",
-       []
-      ],
-      "border-right-color-095-ref.xht": [
-       "89fbb1ece749f1e5afd682993d2f28cc6191d47d",
-       []
-      ],
-      "border-right-color-100-ref.xht": [
-       "af48ac1dc0ba87ed1616a27262faef9da059b50d",
-       []
-      ],
-      "border-right-color-103-ref.xht": [
-       "94d16c8f06901ecf3d84d6b6ac16c55b2c71627b",
-       []
-      ],
-      "border-right-color-110-ref.xht": [
-       "7c5049a194bae7f75457de0ea7b61b9a7ed5934b",
-       []
-      ],
-      "border-right-color-113-ref.xht": [
-       "4579ac40b253383c4a62e7ee2e93b341ab60fd48",
-       []
-      ],
-      "border-right-color-115-ref.xht": [
-       "e573484d0cfd41082899a81b3b3ad46e6e0c0859",
-       []
-      ],
-      "border-right-color-123-ref.xht": [
-       "b8637fa28e7260c38acc74d33434f2553a32af80",
-       []
-      ],
       "border-right-color-129-ref.xht": [
        "9bce8d0dcbd7dfee7ffd27cc3f316087ef4a2fe3",
        []
       ],
-      "border-right-color-131-ref.xht": [
-       "28f861bbf670d6afd46d82cfa1301a1b63050dda",
-       []
-      ],
-      "border-right-color-132-ref.xht": [
-       "44f62e9915dcccaaccda468b6ab96d99c635b3ec",
-       []
-      ],
-      "border-right-color-133-ref.xht": [
-       "f8ff0058e43e48a8e4bd9a4c4f7b11ae20f8ec9e",
-       []
-      ],
-      "border-right-color-134-ref.xht": [
-       "3b3157912f9edbc7a3a70804b0758e74ef75604f",
-       []
-      ],
-      "border-right-color-135-ref.xht": [
-       "d2ccb1bf2b5749af4cbdef3c71a4ef18b86552a8",
-       []
-      ],
-      "border-right-color-136-ref.xht": [
-       "ad88d9b088ba59c15a0853c0a08189cadff288fb",
-       []
-      ],
-      "border-right-color-137-ref.xht": [
-       "861a21b121565e4b01064fba1211abe9d152ffad",
-       []
-      ],
-      "border-right-color-138-ref.xht": [
-       "d51452ccc960df5a9508352677698e0c94835579",
-       []
-      ],
-      "border-right-color-139-ref.xht": [
-       "d11d7998d0a4df700bc564cfa789f34eeb44792c",
-       []
-      ],
-      "border-right-color-140-ref.xht": [
-       "69f95adc7c3559eb53792c4ea243235fb6618dc6",
-       []
-      ],
-      "border-right-color-141-ref.xht": [
-       "8fa051bf2f7b1c923133d9415f1a66576bdbed06",
-       []
-      ],
-      "border-right-color-142-ref.xht": [
-       "82ae509f8201564cb5216f67b7b75805e1f33c77",
-       []
-      ],
-      "border-right-color-143-ref.xht": [
-       "b5927d37c258f0f0ee89e06cd7ef5106a2594f21",
-       []
-      ],
-      "border-right-color-144-ref.xht": [
-       "da46e0dd1c5d0cdfcc837eb84970dafd0b8e90aa",
-       []
-      ],
-      "border-right-color-145-ref.xht": [
-       "5c93a0cee79fe51b28e15b4dac12bdff1366fa99",
-       []
-      ],
       "border-right-color-175-ref.xht": [
        "ed715694de436241e51a456430bee01dec4b397a",
        []
@@ -306178,6 +296756,12 @@
        []
       ]
      },
+     "syntax": {
+      "character-encoding-041-ref.xht": [
+       "6839a38aeae645b3106c4c4fdea800ddd75f7743",
+       []
+      ]
+     },
      "tables": {
       "background-table-README": [
        "9ab51bc6a9d61cca5c241323fc2b08ea510bb9f8",
@@ -308060,6 +298644,10 @@
       "dc7f77f2b3441ebee25f3e40a9480b668ee79ea4",
       []
      ],
+     "idlharness-expected.txt": [
+      "2417c4417ca06db26face863e0a00d9b0dad0f5f",
+      []
+     ],
      "inset-area-inline-container-ref.html": [
       "ecf54f1a9ac2d756cb78f4d2c0690c1ac8b65916",
       []
@@ -310398,6 +300986,10 @@
      ]
     },
     "css-borders": {
+     "META.yml": [
+      "e1ef68513f7cabfd9c1ec444e8e9c5f00c9e0baf",
+      []
+     ],
      "reference": {
       "border-radius-greater-than-width-ref.html": [
        "3c8c470ef5ac93ed8d29fb26d40a2c4bbea47827",
@@ -317791,7 +308383,7 @@
       []
      ],
      "idlharness-expected.txt": [
-      "f13cbb2c4ea938be460398f30f1e5e882bc76a48",
+      "92fd02c4809a11fbcd892c0b1c8265d047587457",
       []
      ],
      "inheritance-expected.txt": [
@@ -326093,7 +316685,7 @@
       []
      ],
      "highlight-pseudo-computed-expected.txt": [
-      "ea640859dce0cfcc5b3024bc8a066311045b32a2",
+      "34d8abea11982a5784f3ebf4fb0b42d9b67537cd",
       []
      ],
      "painting": {
@@ -328412,6 +319004,10 @@
         "6cd7e76774bdfada51ae9fc3058db5f65f5fb2f8",
         []
        ],
+       "clip-path-animation-inherit-ref.html": [
+        "5b1cf397294adfc5adfcd87461c5db56201bf95c",
+        []
+       ],
        "clip-path-animation-missing-0-percent-ref.html": [
         "200edcd03821ba2899e43fd560c475b23e7678f3",
         []
@@ -335620,6 +326216,14 @@
       "ab9d83927458d5b9881b07bc7fd8a1d31e471b33",
       []
      ],
+     "collapsed-border-partial-invalidation-001-ref.html": [
+      "a3705965fe4470f25cb98c331f148b8b93fd22fc",
+      []
+     ],
+     "collapsed-border-partial-invalidation-002-ref.html": [
+      "d89389a6dc3bc2d86a17ea6f22857feaff6119fb",
+      []
+     ],
      "collapsed-border-positioned-tr-td-ref.html": [
       "b3099017699bb83d78bf0492c9c451ccd1e034bf",
       []
@@ -344304,13 +334908,29 @@
       "a0f6add684a57f394f2dd97b163a3ca9fc61a1ef",
       []
      ],
+     "calc-rounding-001-ref.html": [
+      "476e337505b0e21292a84f3fb91472db864716c5",
+      []
+     ],
+     "calc-rounding-002-ref.html": [
+      "a2e9fd0d188940cd1f6b198480141cde59801b97",
+      []
+     ],
      "calc-size": {
       "animation": {
+       "calc-size-height-interpolation.tentative-expected.txt": [
+        "324756dcdf30f4b943781fef91372ba0e119696f",
+        []
+       ],
        "calc-size-width-interpolation.tentative-expected.txt": [
         "3541504e188c9b1aadab2965ce499f164cb1d690",
         []
        ]
       },
+      "calc-size-height.tentative-expected.txt": [
+       "0931cad225e121be2fa732ff9c15588bbe2a8710",
+       []
+      ],
       "calc-size-width.tentative-expected.txt": [
        "8b44b9c67c4af4438c1df74250c3005a9a85bb53",
        []
@@ -344958,6 +335578,10 @@
       "5c882ada040ec700eda008e016d0a1827e31d368",
       []
      ],
+     "clip-path-larger-than-border-box-on-child-of-named-element-ref.html": [
+      "67d55eedf4872f828e2838c6f7c77d6d4d053b11",
+      []
+     ],
      "content-object-fit-fill-ref.html": [
       "b86e0a95a172bcc191f17d954b2cf6bd710a1fd1",
       []
@@ -348081,7 +338705,7 @@
       []
      ],
      "getComputedStyle-pseudo-with-argument-expected.txt": [
-      "182655510ef7b66755e561b41d7b14a18f1a0d62",
+      "8ca2b6411e71068844959637a3014128b868b431",
       []
      ],
      "getComputedStyle-width-scroll.tentative-expected.txt": [
@@ -358799,8 +349423,12 @@
       []
      ],
      "resources": {
+      "additional-bids.py": [
+       "060606b41dfa2f52acfd8f2e38a6f2ee60f741ed",
+       []
+      ],
       "bidding-logic.sub.py": [
-       "707e37f36bb1423dfb168a88320e3be620249109",
+       "e17f2c2c75d294d7cdf53d3f0afb2826bae10813",
        []
       ],
       "decision-logic.sub.py": [
@@ -358820,7 +349448,7 @@
        []
       ],
       "fledge-util.sub.js": [
-       "4fc77933634aa276e4ea83bd53be5ad612789e1d",
+       "5819357e299dcfc2d5ca78d28eaafc3445ee9bc9",
        []
       ],
       "fledge_http_server_util.py": [
@@ -358831,6 +349459,10 @@
        "47afcdef2a2812acccecd0f203d30d3023593f3d",
        []
       ],
+      "permissions.py": [
+       "eed93c42756b75045dd38ccc4c085059d040bf66",
+       []
+      ],
       "redirect-to-trusted-signals.py": [
        "7da27cd6872f9119c8647be939aecc4452526e50",
        []
@@ -360851,10 +351483,6 @@
          "d2a7d1b017c9e68f6802162c6f7c41d76d3fda19",
          []
         ],
-        "inflight-fetch-1-expected.txt": [
-         "75bc6680928aa9189234d08064fe354020b7eb21",
-         []
-        ],
         "inflight-fetch-redirects-expected.txt": [
          "ba35bd1eae99b0b84fc266bedeba883a0653952f",
          []
@@ -360869,6 +351497,10 @@
         []
        ],
        "resources": {
+        "disable_bfcache.js": [
+         "dea70ef4bdf17c87a8e01d71d1faa592a93c0b65",
+         []
+        ],
         "echo-worker.js": [
          "3e3ecb52e9f13f83053e99e3871e950937ebce05",
          []
@@ -360878,15 +351510,15 @@
          []
         ],
         "executor-pushstate.html": [
-         "dcf4a798d00de34672e5b5480e4df6f27f96fa2d",
+         "3dd8f341f1e3affb60814666be080a3477e8bd95",
          []
         ],
         "executor.html": [
-         "2d118bbe2b2b8019bad58cb184acbf697e63275e",
+         "c3af5f6ba810eaee5c069c4b0d7ec918831abc9d",
          []
         ],
         "executor.js": [
-         "67ce0681303da0860095797bebeabdaf58fefd78",
+         "5137616d858eb7d6bd4de38ed5e433dcb2e7a9b9",
          []
         ],
         "helper.sub.js": [
@@ -360898,7 +351530,7 @@
          []
         ],
         "rc-helper.js": [
-         "80c164f56053d3379e0ac5ed31cde312c09ae6a3",
+         "ad2119b7385684dff539d80b5f3a37aefae10816",
          []
         ],
         "service-worker.js": [
@@ -363882,24 +354514,44 @@
         "86c5710132f348bd3e2332983d7211f4b3315cdb",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.isotropic-expected.html": [
-        "f9571f208ea843b11bc18dfe142c08a950571ff7",
+       "2d.filter.canvasFilterObject.gaussianBlur.isotropic.tentative-expected.html": [
+        "dac31c97f126b4841499110f28a9fcbea711a732",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-x-expected.html": [
-        "e76613271f3971ac267e13a6a36fe87036902a25",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-x.tentative-expected.html": [
+        "88d0cb2de28097a7663b40a0fdb11383a4834363",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-y-expected.html": [
-        "0f214fca9fdf37aba06dc20425c85d84c9bf2b19",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-y.tentative-expected.html": [
+        "744983d4ae2127be450791ddbe5fb60473d378da",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.x-only-expected.html": [
-        "285a6417266212d28aec1515a9d7c5a339d47338",
+       "2d.filter.canvasFilterObject.gaussianBlur.x-only.tentative-expected.html": [
+        "e611113e420c52605d133c444e2452a866ce7730",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.y-only-expected.html": [
-        "d59945b5da6da751480b8d4361aa26670d69b3cc",
+       "2d.filter.canvasFilterObject.gaussianBlur.y-only.tentative-expected.html": [
+        "c6d915cb078f55d306cc369da8b1c3d1c4c0ef63",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.isotropic-expected.html": [
+        "4f937548628d17bb9a1760c04471f8386e080261",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-x-expected.html": [
+        "255270c192c54be83e27b2c24f0fe3c5b53839b4",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-y-expected.html": [
+        "76a46b15338faea4306c6454ba2e54129732a460",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.x-only-expected.html": [
+        "26741f984749f44d2974ecbd4ce59a708971b81c",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.y-only-expected.html": [
+        "d00eec6b578ad0434da90f83020f079ba27cced1",
         []
        ]
       },
@@ -363968,6 +354620,22 @@
         "60f78d80965fd0dec9ea11bc21d3652fc3d7bad1",
         []
        ],
+       "2d.layer.ctm.filter-expected.html": [
+        "5fc1ac9acd5ec1b6132fb57a0c34e74a835f3372",
+        []
+       ],
+       "2d.layer.ctm.resetTransform-expected.html": [
+        "fd4c1746c755b631da3b92428139a7cb29f81083",
+        []
+       ],
+       "2d.layer.ctm.setTransform-expected.html": [
+        "45a3d095e13a87bb4b8827a13e580de14b2e09ad",
+        []
+       ],
+       "2d.layer.ctm.shadow-in-transformed-layer-expected.html": [
+        "312ca19b4c24450160749386634aaef4794bb05b",
+        []
+       ],
        "2d.layer.drawImage-expected.html": [
         "26f6e752149102af7cd3bda76045092545712ba4",
         []
@@ -365018,24 +355686,44 @@
         "86c5710132f348bd3e2332983d7211f4b3315cdb",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.isotropic-expected.html": [
-        "f9571f208ea843b11bc18dfe142c08a950571ff7",
+       "2d.filter.canvasFilterObject.gaussianBlur.isotropic.tentative-expected.html": [
+        "dac31c97f126b4841499110f28a9fcbea711a732",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-x-expected.html": [
-        "e76613271f3971ac267e13a6a36fe87036902a25",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-x.tentative-expected.html": [
+        "88d0cb2de28097a7663b40a0fdb11383a4834363",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.mostly-y-expected.html": [
-        "0f214fca9fdf37aba06dc20425c85d84c9bf2b19",
+       "2d.filter.canvasFilterObject.gaussianBlur.mostly-y.tentative-expected.html": [
+        "744983d4ae2127be450791ddbe5fb60473d378da",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.x-only-expected.html": [
-        "285a6417266212d28aec1515a9d7c5a339d47338",
+       "2d.filter.canvasFilterObject.gaussianBlur.x-only.tentative-expected.html": [
+        "e611113e420c52605d133c444e2452a866ce7730",
         []
        ],
-       "2d.filter.canvasFilterObject.gaussianBlur.tentative.y-only-expected.html": [
-        "d59945b5da6da751480b8d4361aa26670d69b3cc",
+       "2d.filter.canvasFilterObject.gaussianBlur.y-only.tentative-expected.html": [
+        "c6d915cb078f55d306cc369da8b1c3d1c4c0ef63",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.isotropic-expected.html": [
+        "4f937548628d17bb9a1760c04471f8386e080261",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-x-expected.html": [
+        "255270c192c54be83e27b2c24f0fe3c5b53839b4",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.mostly-y-expected.html": [
+        "76a46b15338faea4306c6454ba2e54129732a460",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.x-only-expected.html": [
+        "26741f984749f44d2974ecbd4ce59a708971b81c",
+        []
+       ],
+       "2d.filter.layers.gaussianBlur.y-only-expected.html": [
+        "d00eec6b578ad0434da90f83020f079ba27cced1",
         []
        ]
       },
@@ -365104,6 +355792,22 @@
         "60f78d80965fd0dec9ea11bc21d3652fc3d7bad1",
         []
        ],
+       "2d.layer.ctm.filter-expected.html": [
+        "5fc1ac9acd5ec1b6132fb57a0c34e74a835f3372",
+        []
+       ],
+       "2d.layer.ctm.resetTransform-expected.html": [
+        "fd4c1746c755b631da3b92428139a7cb29f81083",
+        []
+       ],
+       "2d.layer.ctm.setTransform-expected.html": [
+        "45a3d095e13a87bb4b8827a13e580de14b2e09ad",
+        []
+       ],
+       "2d.layer.ctm.shadow-in-transformed-layer-expected.html": [
+        "312ca19b4c24450160749386634aaef4794bb05b",
+        []
+       ],
        "2d.layer.drawImage-expected.html": [
         "26f6e752149102af7cd3bda76045092545712ba4",
         []
@@ -365478,7 +356182,7 @@
        []
       ],
       "gentestutilsunion.py": [
-       "cf141f2f07475edb4912b6846aa67468648a6a74",
+       "4fe7f2bd42ee4fca6f3613fb60caca862f6d1baa",
        []
       ],
       "name2dir-canvas.yaml": [
@@ -365575,11 +356279,11 @@
         []
        ],
        "filters.yaml": [
-        "01c83a33e2c0b92fc46b69039f47a4a867f809b3",
+        "e18ab61b41ef31153e4d55eb4020f60e02a492ef",
         []
        ],
        "layers.yaml": [
-        "dfef55d081b9d46ba71d216ec76cbf9c0fe6f338",
+        "938cc74d21460434856f5cff4a8851cb92a126db",
         []
        ],
        "line-styles.yaml": [
@@ -370886,10 +361590,6 @@
       "slot-no-isolate-001-ref.html": [
        "6675f0a16644c8f5cff7e1ba88953982031b37bc",
        []
-      ],
-      "unicode-bidi-ua-rules-expected.txt": [
-       "41874763b1f3857ad75718e48a75d9a98b693706",
-       []
       ]
      },
      "bindings": {
@@ -377477,7 +368177,7 @@
       },
       "tools": {
        "generate.py": [
-        "3457f94d70598ca4590aa27ec9929ebec61c0039",
+        "f0db885814b8997cd80ff34121132607d7e71c17",
         []
        ]
       }
@@ -378576,10 +369276,6 @@
     "META.yml": [
      "212cae7fa52e95b820d11e7ca8e2eed7d36bf112",
      []
-    ],
-    "names-expected.txt": [
-     "5f7b69fbdee2c42443d374cf57ef185f2eed54bd",
-     []
     ]
    },
    "html-media-capture": {
@@ -379514,7 +370210,7 @@
      []
     ],
     "CSP.idl": [
-     "ac0a6ff5638eb0f64464d35cb11c7550a72d715f",
+     "d4a6377ebb30af39a7c3f470d4d2139179986285",
      []
     ],
     "DOM-Parsing.idl": [
@@ -379802,7 +370498,7 @@
      []
     ],
     "contact-picker.idl": [
-     "0119d0e2ce658f02df30120083f7d1b6b203bdad",
+     "fc589fa06697ce6632bd1487ebb3e7ff48904dfc",
      []
     ],
     "content-index.idl": [
@@ -379830,7 +370526,7 @@
      []
     ],
     "css-anchor-position.idl": [
-     "5d3973eff3d3b23b6641857ba3d7f5305cf6c62c",
+     "b79e3fce893ddc13bc89324bacea4340777d09e6",
      []
     ],
     "css-animation-worklet.idl": [
@@ -379878,7 +370574,7 @@
      []
     ],
     "css-fonts.idl": [
-     "070cbc58f5df950f4d856c71e490e8ad2340517d",
+     "7a917662b5927a374f4cb5b1b1371a5590f2dc6a",
      []
     ],
     "css-highlight-api.idl": [
@@ -379977,6 +370673,10 @@
      "38cedac40cddc71ea754df7171d68018d1a0854b",
      []
     ],
+    "digital-identities.idl": [
+     "9027ce61af8175a78fdd4a6b7ca41324756c8b85",
+     []
+    ],
     "document-picture-in-picture.idl": [
      "f54f437a9365a7f8540fb1bb1c42a3c9118cbf57",
      []
@@ -379986,7 +370686,7 @@
      []
     ],
     "edit-context.idl": [
-     "eb3174e25f548314348a4414a014a1a0cbb62858",
+     "60ddbafe7585b390643d20b4811554005fdb4794",
      []
     ],
     "element-capture.idl": [
@@ -380054,7 +370754,7 @@
      []
     ],
     "gamepad.idl": [
-     "77a22c1d85805197b3d005f51055d5171690c304",
+     "024e5ea58c1c33ed4c9a0b94ddf53317fa43936b",
      []
     ],
     "generic-sensor.idl": [
@@ -380090,7 +370790,7 @@
      []
     ],
     "html.idl": [
-     "9193a7487eefb7b4eef7fb7119aa1b8743f5a12e",
+     "8992ceab1ee2cd423f8c34ed154a453ca2c6d97d",
      []
     ],
     "idle-detection.idl": [
@@ -380117,6 +370817,10 @@
      "6a2147b93e640109a1930cdc23279138c216c4ed",
      []
     ],
+    "interest-invokers.tentative.idl": [
+     "f89af4d73418bc14628a33349483e435275fa71f",
+     []
+    ],
     "intersection-observer.idl": [
      "8502a11357faabd327d5659089198f0133a9db4c",
      []
@@ -380158,7 +370862,7 @@
      []
     ],
     "longtasks.idl": [
-     "13d4940c1c0aa5268310f799f2b4c17226147c45",
+     "e5b6ece16a1c373905f1b8a8561b1dc402704311",
      []
     ],
     "magnetometer.idl": [
@@ -380218,7 +370922,7 @@
      []
     ],
     "mediasession.idl": [
-     "57c62dfbc9d409feaac1a1755a2247e0c4ce8512",
+     "8e9a21aff063a7b6d5f34f59cb293c493ffb8c4c",
      []
     ],
     "mediastream-recording.idl": [
@@ -380438,7 +371142,7 @@
      []
     ],
     "service-workers.idl": [
-     "6d44d61debbef6f86a170855a791bb4b71179d51",
+     "c740e1098a884726b28dbd07cfe12bbebf2f1a00",
      []
     ],
     "shape-detection-api.idl": [
@@ -380490,11 +371194,11 @@
      []
     ],
     "trusted-types.idl": [
-     "6723994aae621f8d69022993c250a94649182dff",
+     "db5bd635cf9f699a6a8628898883d79a34336255",
      []
     ],
     "turtledove.idl": [
-     "f5813b5d03d6f7fc35c37c6bbb3bdc4f81aba556",
+     "8a2d7bb594f56d163acbc0cd88605857f1c608ca",
      []
     ],
     "ua-client-hints.idl": [
@@ -380502,7 +371206,7 @@
      []
     ],
     "uievents.idl": [
-     "21c40c308a8a175452f43e695cbc178673ea0d6a",
+     "0f9d3d3c1883f76bac8748d1e80e98fb0919eb0d",
      []
     ],
     "url.idl": [
@@ -380534,7 +371238,7 @@
      []
     ],
     "wai-aria.idl": [
-     "13e3b0f8b1976330788059ab61b263ba2f7a7ebd",
+     "78083f03f91fd987b6e19da391e640bf9816d701",
      []
     ],
     "wasm-js-api.idl": [
@@ -380630,7 +371334,7 @@
      []
     ],
     "webgl1.idl": [
-     "4552610c0d58222b34a345b21baf72ece278eb48",
+     "1b711e1a4ce9df841d62229e3598333ce22f7747",
      []
     ],
     "webgl2.idl": [
@@ -380638,7 +371342,7 @@
      []
     ],
     "webgpu.idl": [
-     "15074009cf65b4fbb79f995900565d6af94cec86",
+     "ef5b9c730abed4a31306cfb36d9a68c51ac91528",
      []
     ],
     "webhid.idl": [
@@ -380654,7 +371358,7 @@
      []
     ],
     "webnn.idl": [
-     "721ee788bda051d908713c4e848e3433226e5f05",
+     "cafba9de5e122fe78aa5ed490858a14060076079",
      []
     ],
     "webrtc-encoded-transform.idl": [
@@ -380690,7 +371394,7 @@
      []
     ],
     "webtransport.idl": [
-     "281c096d21d6849c38d4eaef62dbe082bd748536",
+     "7421dcb432c02b176876c30e620d71c32a94fe02",
      []
     ],
     "webusb.idl": [
@@ -381159,7 +371863,7 @@
     ]
    },
    "lint.ignore": [
-    "64266fc8e38ba5725c24dd320544690489820177",
+    "ebe734d00836233082291ab02ed0db2ca51a7936",
     []
    ],
    "loading": {
@@ -381462,7 +372166,7 @@
      []
     ],
     "idlharness.window-expected.txt": [
-     "1b543275c7840ecb3f3066948224367cac5baee7",
+     "db85b36f9dcc831238f52dac204840a402061749",
      []
     ],
     "resources": {
@@ -383670,7 +374374,11 @@
       "5a2fbb151d9b4eec6f6dc16fc12d8708e01e25d9",
       []
      ]
-    }
+    },
+    "idlharness.window-expected.txt": [
+     "c2fd8138e32b011ca6eafefe1b4d259dba762e7f",
+     []
+    ]
    },
    "merchant-validation": {
     "META.yml": [
@@ -385010,20 +375718,8 @@
      []
     ],
     "not-restored-reasons": {
-     "abort-block-bfcache.window-expected.txt": [
-      "6ff24d8eca516fea5b1255f2c1de4fdc93a179e3",
-      []
-     ],
-     "performance-navigation-timing-lock.https.tentative.window-expected.txt": [
-      "781a7c7a8ec887bd8d6f77b07aeee5618c7f50d7",
-      []
-     ],
-     "performance-navigation-timing-navigation-failure.tentative.window-expected.txt": [
-      "0a4aa3f96ce1ba0d949396bf28be3dfe8968d21e",
-      []
-     ],
      "test-helper.js": [
-      "97695cd0acec89bc5fa223eadf516d3103ddc302",
+      "826b0ccb2bead6135d513564f80f786da4a98544",
       []
      ]
     },
@@ -388904,7 +379600,7 @@
      []
     ],
     "testdriver.js": [
-     "3d3ed31dabe1d630fcdc31fde54cac4553c3e27c",
+     "20140b2fc0a0b7c5bb32089b4e8283ffbb6e2a01",
      []
     ],
     "testdriver.js.headers": [
@@ -390600,7 +381296,7 @@
      ]
     },
     "idlharness.https.any.serviceworker-expected.txt": [
-     "cef679598544391c1cba8e4e87f3f66ba41d8f52",
+     "81b187a52e0d900c732b7ef443852d596902c171",
      []
     ],
     "idlharness.https.any.sharedworker-expected.txt": [
@@ -392945,7 +383641,7 @@
       []
      ],
      "credentials-test-helper.py": [
-      "81a988e3581f0567a29a58b7303f124c5cc5e38e",
+      "46fc0ea6fb2a99877dbb6b69cb3da25a19f490fd",
       []
      ],
      "delete-key.https.html": [
@@ -393092,6 +383788,10 @@
       "1b63235b7cdffe9ebb43bfac3a01d5220e1519fb",
       []
      ],
+     "verify-length-module.js": [
+      "8ba10fbcb64fc40535f216454e64199ae49ffa67",
+      []
+     ],
      "verify-shared-storage.https.html": [
       "52c79e7e85afc66782d7d6c144c1a6b55bfccada",
       []
@@ -393852,7 +384552,7 @@
        []
       ],
       "utils.js": [
-       "940edcc0ca359e3ececefac7498acf66af898c67",
+       "bc1bc5911eb8552efd689f84a0e61d2f74aa268a",
        []
       ],
       "wake-lock.https.html": [
@@ -396058,13 +386758,7 @@
     "META.yml": [
      "b0a59c18030bd44644bde1df16b0c08e74ff6abd",
      []
-    ],
-    "name": {
-     "comp_host_language_label-expected.txt": [
-      "d0112f13dd5aab6c4531c551534dcdc0cbfe0641",
-      []
-     ]
-    }
+    ]
    },
    "timing-entrytypes-registry": {
     "META.yml": [
@@ -396303,6 +386997,10 @@
       []
      ]
     },
+    "idlharness.window-expected.txt": [
+     "9940085d10951c80fe4262aa7f1e72f2b29667f6",
+     []
+    ],
     "interface": {
      "README.md": [
       "970fdd4df3517297e344019930d88fbb53b1a002",
@@ -397279,10 +387977,6 @@
      "ReadMe.md": [
       "eb89da7846bec8a2611446dac153e16484937111",
       []
-     ],
-     "generic-roles-expected.txt": [
-      "9cbbb87c61b339bffd46069521e69c8df033679f",
-      []
      ]
     },
     "scripts": {
@@ -399711,7 +390405,7 @@
         ]
        },
        "conftest.py": [
-        "934b649c9132a467d0331b648e5eb70c818420b5",
+        "40fe20ddfe94533b10c636c6489b9f50be6e77c6",
         []
        ],
        "continue_request": {
@@ -399916,6 +390610,12 @@
         "0941411fab84f20df84563698821f5cdb7a13ccd",
         []
        ],
+       "delete_cookies": {
+        "__init__.py": [
+         "4b73b0bcedf401f9af495d853e943501f81cce7e",
+         []
+        ]
+       },
        "get_cookies": {
         "__init__.py": [
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -400851,184 +391551,222 @@
      "3f87fc8042d2b3de1bf13d64333ba08cdfdabb3b",
      []
     ],
-    "arg_min_max.https.any-expected.txt": [
-     "4aff9eaedf2f7e9403866c4d47e0c3a3bceb8e9d",
-     []
-    ],
-    "arg_min_max.https.any.worker-expected.txt": [
-     "4aff9eaedf2f7e9403866c4d47e0c3a3bceb8e9d",
-     []
-    ],
-    "batch_normalization.https.any-expected.txt": [
-     "0070a9c43de29a2e0722afc3c0751df54e6b5296",
-     []
-    ],
-    "batch_normalization.https.any.worker-expected.txt": [
-     "0070a9c43de29a2e0722afc3c0751df54e6b5296",
-     []
-    ],
-    "cast.https.any-expected.txt": [
-     "9b4696afb657b1e3f51ba2eac4109b9341cae542",
-     []
-    ],
-    "cast.https.any.worker-expected.txt": [
-     "9b4696afb657b1e3f51ba2eac4109b9341cae542",
-     []
-    ],
-    "constant.https.any-expected.txt": [
-     "f1e5051ab903e205575c1ddcd637d0f2860cc9c3",
-     []
-    ],
-    "constant.https.any.worker-expected.txt": [
-     "f1e5051ab903e205575c1ddcd637d0f2860cc9c3",
-     []
-    ],
-    "conv2d.https.any-expected.txt": [
-     "f2ab788fee7af0fa4affb55e9da84b7aa8df2597",
-     []
-    ],
-    "conv2d.https.any.worker-expected.txt": [
-     "f2ab788fee7af0fa4affb55e9da84b7aa8df2597",
-     []
-    ],
-    "conv_transpose2d.https.any-expected.txt": [
-     "a25167826cd77476a78d98450e1165a26ace77ad",
-     []
-    ],
-    "conv_transpose2d.https.any.worker-expected.txt": [
-     "a25167826cd77476a78d98450e1165a26ace77ad",
-     []
-    ],
-    "elementwise_binary.https.any-expected.txt": [
-     "8d8ca860775b4d5283204dc5b5bc8d851a147f26",
-     []
-    ],
-    "elementwise_binary.https.any.worker-expected.txt": [
-     "8d8ca860775b4d5283204dc5b5bc8d851a147f26",
-     []
-    ],
-    "elementwise_logical.https.any-expected.txt": [
-     "257892f56f4b7a5332f3eb6df01ee3872b8f7748",
-     []
-    ],
-    "elementwise_unary.https.any-expected.txt": [
-     "65caf10349d8ed5289723fd375eaebf8c26c8e73",
-     []
-    ],
-    "elementwise_unary.https.any.worker-expected.txt": [
-     "65caf10349d8ed5289723fd375eaebf8c26c8e73",
-     []
-    ],
-    "elu.https.any-expected.txt": [
-     "4e44422b63cf51e81ff32ccd4ed93404b6c4051c",
-     []
-    ],
-    "elu.https.any.worker-expected.txt": [
-     "4e44422b63cf51e81ff32ccd4ed93404b6c4051c",
-     []
-    ],
-    "expand.https.any-expected.txt": [
-     "8f2c06a76d63c9ff281d7e2fd01b5fd30811918a",
-     []
-    ],
-    "expand.https.any.worker-expected.txt": [
-     "8f2c06a76d63c9ff281d7e2fd01b5fd30811918a",
-     []
-    ],
-    "gather.https.any-expected.txt": [
-     "c2c963cb7b83e31d0e5767e0103713b2dafb87f3",
-     []
-    ],
-    "gather.https.any.worker-expected.txt": [
-     "c2c963cb7b83e31d0e5767e0103713b2dafb87f3",
-     []
-    ],
-    "gemm.https.any-expected.txt": [
-     "3bc8a4d835fa3cd726ebb51333b95c7ab878ae96",
-     []
-    ],
-    "gemm.https.any.worker-expected.txt": [
-     "3bc8a4d835fa3cd726ebb51333b95c7ab878ae96",
-     []
-    ],
-    "hard_sigmoid.https.any-expected.txt": [
-     "512251a4980693a848fdc96a2a91a1014017dff8",
-     []
-    ],
-    "hard_sigmoid.https.any.worker-expected.txt": [
-     "512251a4980693a848fdc96a2a91a1014017dff8",
-     []
-    ],
+    "conformance_tests": {
+     "arg_min_max.https.any-expected.txt": [
+      "4aff9eaedf2f7e9403866c4d47e0c3a3bceb8e9d",
+      []
+     ],
+     "arg_min_max.https.any.worker-expected.txt": [
+      "4aff9eaedf2f7e9403866c4d47e0c3a3bceb8e9d",
+      []
+     ],
+     "batch_normalization.https.any-expected.txt": [
+      "0070a9c43de29a2e0722afc3c0751df54e6b5296",
+      []
+     ],
+     "batch_normalization.https.any.worker-expected.txt": [
+      "0070a9c43de29a2e0722afc3c0751df54e6b5296",
+      []
+     ],
+     "cast.https.any-expected.txt": [
+      "9b4696afb657b1e3f51ba2eac4109b9341cae542",
+      []
+     ],
+     "cast.https.any.worker-expected.txt": [
+      "9b4696afb657b1e3f51ba2eac4109b9341cae542",
+      []
+     ],
+     "constant.https.any-expected.txt": [
+      "f1e5051ab903e205575c1ddcd637d0f2860cc9c3",
+      []
+     ],
+     "constant.https.any.worker-expected.txt": [
+      "f1e5051ab903e205575c1ddcd637d0f2860cc9c3",
+      []
+     ],
+     "conv2d.https.any-expected.txt": [
+      "d31182677c49246e6a5e820b4a9a10be1640ffee",
+      []
+     ],
+     "conv2d.https.any.worker-expected.txt": [
+      "d31182677c49246e6a5e820b4a9a10be1640ffee",
+      []
+     ],
+     "conv_transpose2d.https.any-expected.txt": [
+      "d3dc54396cee862117d1d4711fbd27a2f780a033",
+      []
+     ],
+     "conv_transpose2d.https.any.worker-expected.txt": [
+      "d3dc54396cee862117d1d4711fbd27a2f780a033",
+      []
+     ],
+     "elementwise_binary.https.any-expected.txt": [
+      "8d8ca860775b4d5283204dc5b5bc8d851a147f26",
+      []
+     ],
+     "elementwise_binary.https.any.worker-expected.txt": [
+      "8d8ca860775b4d5283204dc5b5bc8d851a147f26",
+      []
+     ],
+     "elementwise_logical.https.any-expected.txt": [
+      "257892f56f4b7a5332f3eb6df01ee3872b8f7748",
+      []
+     ],
+     "elementwise_logical.https.any.worker-expected.txt": [
+      "257892f56f4b7a5332f3eb6df01ee3872b8f7748",
+      []
+     ],
+     "elementwise_unary.https.any-expected.txt": [
+      "65caf10349d8ed5289723fd375eaebf8c26c8e73",
+      []
+     ],
+     "elementwise_unary.https.any.worker-expected.txt": [
+      "65caf10349d8ed5289723fd375eaebf8c26c8e73",
+      []
+     ],
+     "elu.https.any-expected.txt": [
+      "4e44422b63cf51e81ff32ccd4ed93404b6c4051c",
+      []
+     ],
+     "elu.https.any.worker-expected.txt": [
+      "4e44422b63cf51e81ff32ccd4ed93404b6c4051c",
+      []
+     ],
+     "expand.https.any-expected.txt": [
+      "8f2c06a76d63c9ff281d7e2fd01b5fd30811918a",
+      []
+     ],
+     "expand.https.any.worker-expected.txt": [
+      "8f2c06a76d63c9ff281d7e2fd01b5fd30811918a",
+      []
+     ],
+     "gather.https.any-expected.txt": [
+      "c2c963cb7b83e31d0e5767e0103713b2dafb87f3",
+      []
+     ],
+     "gather.https.any.worker-expected.txt": [
+      "c2c963cb7b83e31d0e5767e0103713b2dafb87f3",
+      []
+     ],
+     "gemm.https.any-expected.txt": [
+      "3bc8a4d835fa3cd726ebb51333b95c7ab878ae96",
+      []
+     ],
+     "gemm.https.any.worker-expected.txt": [
+      "3bc8a4d835fa3cd726ebb51333b95c7ab878ae96",
+      []
+     ],
+     "hard_sigmoid.https.any-expected.txt": [
+      "512251a4980693a848fdc96a2a91a1014017dff8",
+      []
+     ],
+     "hard_sigmoid.https.any.worker-expected.txt": [
+      "512251a4980693a848fdc96a2a91a1014017dff8",
+      []
+     ],
+     "instance_normalization.https.any-expected.txt": [
+      "a21bb3c22b15814c0fd81c093d5abadbf97caed7",
+      []
+     ],
+     "instance_normalization.https.any.worker-expected.txt": [
+      "a21bb3c22b15814c0fd81c093d5abadbf97caed7",
+      []
+     ],
+     "layer_normalization.https.any-expected.txt": [
+      "5ac33602acdc73862d9b9d2b9cf86066c81ef641",
+      []
+     ],
+     "layer_normalization.https.any.worker-expected.txt": [
+      "5ac33602acdc73862d9b9d2b9cf86066c81ef641",
+      []
+     ],
+     "linear.https.any-expected.txt": [
+      "95c04e19f5b365acde0bdb2119d2feff03b7f2c1",
+      []
+     ],
+     "linear.https.any.worker-expected.txt": [
+      "95c04e19f5b365acde0bdb2119d2feff03b7f2c1",
+      []
+     ],
+     "matmul.https.any-expected.txt": [
+      "37ab231f355b9966ed525721a6f5f76dee909398",
+      []
+     ],
+     "matmul.https.any.worker-expected.txt": [
+      "37ab231f355b9966ed525721a6f5f76dee909398",
+      []
+     ],
+     "pad.https.any-expected.txt": [
+      "3a61439d50dd7980dc465d81e04977e665e559ba",
+      []
+     ],
+     "pad.https.any.worker-expected.txt": [
+      "3a61439d50dd7980dc465d81e04977e665e559ba",
+      []
+     ],
+     "pooling.https.any-expected.txt": [
+      "c565fca9ee5f407148c1bff6730032fc46ef4723",
+      []
+     ],
+     "pooling.https.any.worker-expected.txt": [
+      "c565fca9ee5f407148c1bff6730032fc46ef4723",
+      []
+     ],
+     "prelu.https.any-expected.txt": [
+      "3c022185f74d7e6dcde8aa7074af95fb4a260af0",
+      []
+     ],
+     "prelu.https.any.worker-expected.txt": [
+      "3c022185f74d7e6dcde8aa7074af95fb4a260af0",
+      []
+     ],
+     "reduction.https.any-expected.txt": [
+      "b910943e96a179e3099dd12b8f7d4b7c785d88ed",
+      []
+     ],
+     "reduction.https.any.worker-expected.txt": [
+      "b910943e96a179e3099dd12b8f7d4b7c785d88ed",
+      []
+     ],
+     "softplus.https.any-expected.txt": [
+      "4334c31880022c9b62c331dd959f3afc22a9c79e",
+      []
+     ],
+     "softplus.https.any.worker-expected.txt": [
+      "4334c31880022c9b62c331dd959f3afc22a9c79e",
+      []
+     ],
+     "softsign.https.any-expected.txt": [
+      "36f99abe023229e7485caf5b69ed7ec314110b91",
+      []
+     ],
+     "softsign.https.any.worker-expected.txt": [
+      "36f99abe023229e7485caf5b69ed7ec314110b91",
+      []
+     ],
+     "triangular.https.any-expected.txt": [
+      "d1b95c65a9d3858125789c418cd56f60910e2058",
+      []
+     ],
+     "triangular.https.any.worker-expected.txt": [
+      "d1b95c65a9d3858125789c418cd56f60910e2058",
+      []
+     ],
+     "where.https.any-expected.txt": [
+      "2d02412c0be6254be345bb9f292eff49adc42b99",
+      []
+     ],
+     "where.https.any.worker-expected.txt": [
+      "2d02412c0be6254be345bb9f292eff49adc42b99",
+      []
+     ]
+    },
     "idlharness.https.any-expected.txt": [
-     "33b741877478f013beb9290bb020692db8740f9a",
+     "d8b5b08dc9774fa2bd1e2ce6bcad121e3f02d7d9",
      []
     ],
     "idlharness.https.any.worker-expected.txt": [
-     "bb5fd6afa730e67c607bd381f58f0b5cf9827d0b",
-     []
-    ],
-    "instance_normalization.https.any-expected.txt": [
-     "a21bb3c22b15814c0fd81c093d5abadbf97caed7",
-     []
-    ],
-    "instance_normalization.https.any.worker-expected.txt": [
-     "a21bb3c22b15814c0fd81c093d5abadbf97caed7",
-     []
-    ],
-    "layer_normalization.https.any-expected.txt": [
-     "5ac33602acdc73862d9b9d2b9cf86066c81ef641",
-     []
-    ],
-    "layer_normalization.https.any.worker-expected.txt": [
-     "5ac33602acdc73862d9b9d2b9cf86066c81ef641",
-     []
-    ],
-    "linear.https.any-expected.txt": [
-     "95c04e19f5b365acde0bdb2119d2feff03b7f2c1",
-     []
-    ],
-    "linear.https.any.worker-expected.txt": [
-     "95c04e19f5b365acde0bdb2119d2feff03b7f2c1",
-     []
-    ],
-    "matmul.https.any-expected.txt": [
-     "37ab231f355b9966ed525721a6f5f76dee909398",
-     []
-    ],
-    "matmul.https.any.worker-expected.txt": [
-     "37ab231f355b9966ed525721a6f5f76dee909398",
-     []
-    ],
-    "pad.https.any-expected.txt": [
-     "3a61439d50dd7980dc465d81e04977e665e559ba",
-     []
-    ],
-    "pad.https.any.worker-expected.txt": [
-     "3a61439d50dd7980dc465d81e04977e665e559ba",
-     []
-    ],
-    "pooling.https.any-expected.txt": [
-     "7cf96aa069b82b5b560500d95195c7399c02b9b9",
-     []
-    ],
-    "pooling.https.any.worker-expected.txt": [
-     "7cf96aa069b82b5b560500d95195c7399c02b9b9",
-     []
-    ],
-    "prelu.https.any-expected.txt": [
-     "3c022185f74d7e6dcde8aa7074af95fb4a260af0",
-     []
-    ],
-    "prelu.https.any.worker-expected.txt": [
-     "3c022185f74d7e6dcde8aa7074af95fb4a260af0",
-     []
-    ],
-    "reduction.https.any-expected.txt": [
-     "b910943e96a179e3099dd12b8f7d4b7c785d88ed",
-     []
-    ],
-    "reduction.https.any.worker-expected.txt": [
-     "b910943e96a179e3099dd12b8f7d4b7c785d88ed",
+     "05cd225c9302239f0dc71884c9ba48857a8a5d5f",
      []
     ],
     "resources": {
@@ -401050,7 +391788,7 @@
        []
       ],
       "average_pool2d.json": [
-       "5a9f4e28b1044b2fcc640c4c88c49c399da17665",
+       "3d0c43227317ffc6f433eb9e81932b2e7fd3151d",
        []
       ],
       "batch_normalization.json": [
@@ -401078,11 +391816,11 @@
        []
       ],
       "conv2d.json": [
-       "5f8cd814a90dc935ea083315ef13680e84c03f5d",
+       "13e6b17242849b8e760d6b18af85d701a603b317",
        []
       ],
       "conv_transpose2d.json": [
-       "42274e6fa37f099cafa4c627fb56ac422a710ba5",
+       "742752fd41d6a682bba884cddefabcb5e72b4987",
        []
       ],
       "cos.json": [
@@ -401150,7 +391888,7 @@
        []
       ],
       "l2_pool2d.json": [
-       "bab89e0e3940b980f4d6206ffa46cff841d5e277",
+       "a65687721a33c10aec6c75f0e621859a2cf7ec1a",
        []
       ],
       "layer_normalization.json": [
@@ -401190,7 +391928,7 @@
        []
       ],
       "max_pool2d.json": [
-       "4532843d2b504222d1ca7518d2ed9af83a0ae123",
+       "216b4c55ddbe30940a21e24d9ad30c47fa7e1039",
        []
       ],
       "min.json": [
@@ -401329,48 +392067,12 @@
      "utils.js": [
       "002ddbd706c0c86d26036483de4b769bc825108f",
       []
+     ],
+     "utils_validation.js": [
+      "10c704384f46107be234bcbd65d3beea034ba2bf",
+      []
      ]
-    },
-    "softplus.https.any-expected.txt": [
-     "4334c31880022c9b62c331dd959f3afc22a9c79e",
-     []
-    ],
-    "softplus.https.any.worker-expected.txt": [
-     "4334c31880022c9b62c331dd959f3afc22a9c79e",
-     []
-    ],
-    "softsign.https.any-expected.txt": [
-     "36f99abe023229e7485caf5b69ed7ec314110b91",
-     []
-    ],
-    "softsign.https.any.worker-expected.txt": [
-     "36f99abe023229e7485caf5b69ed7ec314110b91",
-     []
-    ],
-    "squeeze.https.any-expected.txt": [
-     "e1a2e675c721944ac46c12517a6cceb968824d43",
-     []
-    ],
-    "squeeze.https.any.worker-expected.txt": [
-     "e1a2e675c721944ac46c12517a6cceb968824d43",
-     []
-    ],
-    "triangular.https.any-expected.txt": [
-     "d1b95c65a9d3858125789c418cd56f60910e2058",
-     []
-    ],
-    "triangular.https.any.worker-expected.txt": [
-     "d1b95c65a9d3858125789c418cd56f60910e2058",
-     []
-    ],
-    "where.https.any-expected.txt": [
-     "2d02412c0be6254be345bb9f292eff49adc42b99",
-     []
-    ],
-    "where.https.any.worker-expected.txt": [
-     "2d02412c0be6254be345bb9f292eff49adc42b99",
-     []
-    ]
+    }
    },
    "webrtc": {
     "DIR_METADATA": [
@@ -402274,6 +392976,10 @@
       "ce5f3a7f6ae7a7f816471e869584ab2eb01632e5",
       []
      ],
+     "passive-close-abort_wsh.py": [
+      "ac3f67c8db17f2cfe796431249525bfdf5c435f0",
+      []
+     ],
      "protocol_array_wsh.py": [
       "be24ee01fd9aabd0722b7a498289a26eeb532037",
       []
@@ -402294,6 +393000,10 @@
       "9df652dc3cbf12f6364462839e340848dec8e08f",
       []
      ],
+     "remote-close_wsh.py": [
+      "aadd99ea950d0d8414c432356443d5f3ce3e444e",
+      []
+     ],
      "send-backpressure_wsh.py": [
       "d3288d0e858d811ed9e5b80197e7883c1cb8ff65",
       []
@@ -402519,6 +393229,22 @@
        "44ec0771d8d016219790ea61d5d1a5b0242f1750",
        []
       ],
+      "remote-close.any.serviceworker_wpt_flags=h2-expected.txt": [
+       "7d8f86827274bfb56e3c3587e827000e3f3693bb",
+       []
+      ],
+      "remote-close.any.sharedworker_wpt_flags=h2-expected.txt": [
+       "7d8f86827274bfb56e3c3587e827000e3f3693bb",
+       []
+      ],
+      "remote-close.any.worker_wpt_flags=h2-expected.txt": [
+       "7d8f86827274bfb56e3c3587e827000e3f3693bb",
+       []
+      ],
+      "remote-close.any_wpt_flags=h2-expected.txt": [
+       "7d8f86827274bfb56e3c3587e827000e3f3693bb",
+       []
+      ],
       "resources": {
        "url-constants.js": [
         "fe681af5c42a446944ce130d6cb2fcd2d11bde95",
@@ -402794,19 +393520,19 @@
      ]
     },
     "idlharness.https.any-expected.txt": [
-     "2b4e26a0e2379ab438778449b5cd87ce1a8ba087",
+     "e4fc294fc4399330e9a3516f378c40c80c6203a0",
      []
     ],
     "idlharness.https.any.serviceworker-expected.txt": [
-     "2b4e26a0e2379ab438778449b5cd87ce1a8ba087",
+     "e4fc294fc4399330e9a3516f378c40c80c6203a0",
      []
     ],
     "idlharness.https.any.sharedworker-expected.txt": [
-     "2b4e26a0e2379ab438778449b5cd87ce1a8ba087",
+     "e4fc294fc4399330e9a3516f378c40c80c6203a0",
      []
     ],
     "idlharness.https.any.worker-expected.txt": [
-     "2b4e26a0e2379ab438778449b5cd87ce1a8ba087",
+     "e4fc294fc4399330e9a3516f378c40c80c6203a0",
      []
     ],
     "resources": {
@@ -423847,7 +414573,7 @@
       ]
      ],
      "header-origin-same-origin.html": [
-      "747c67244c06ff369d20b341dad87857cd0cc03b",
+      "7c1bb2ce9a5e8a01aea008d176a4d0a9ddd6322e",
       [
        null,
        {}
@@ -443342,7 +434068,7 @@
      ]
     ],
     "fedcm-button-mode-basics.https.html": [
-     "d7b063fca552896b17443f874ca7e639c7defe5e",
+     "abf46ee7db0511e14278e683d4b5cac00d4d615f",
      [
       null,
       {
@@ -443438,6 +434164,15 @@
       }
      ]
     ],
+    "fedcm-identity-assertion-nocors.https.html": [
+     "612387b4a0dc69a428f85333868b7f9877c76a81",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "fedcm-iframe.https.html": [
      "dc0c17dea695e632988c773df32a7c0e20d24d91",
      [
@@ -443474,6 +434209,15 @@
       ]
      ]
     },
+    "fedcm-login-status-unknown.https.html": [
+     "d542524c884790fe6a957ffa789d8336284df252",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "fedcm-loginhint.https.html": [
      "edae955a7617561b28c7ce9d897c83af722ba357",
      [
@@ -443626,7 +434370,7 @@
      ]
     ],
     "fedcm-pending-call-rejected.https.html": [
-     "feb3f903d87a32380a2f4e2ef074bf706be6a8d6",
+     "bb9f885a8a1b9b4ad231774f6936fc99c701b255",
      [
       null,
       {
@@ -445774,13 +436518,6 @@
        {}
       ]
      ],
-     "anchor-non-oof-inherit.html": [
-      "75f98a1ebfe0e6b61008e2152bea88228829af08",
-      [
-       null,
-       {}
-      ]
-     ],
      "anchor-parse-invalid.html": [
       "de4b0ffac45ec09914bac7bbfd43fabf8b083989",
       [
@@ -446280,14 +437017,14 @@
      ],
      "parsing": {
       "position-try-options-computed.html": [
-       "d6423c164b656814104305b9a2a0099814c0cbec",
+       "ac84b8fa4b312890070a0c256e9f6561304d8196",
        [
         null,
         {}
        ]
       ],
       "position-try-options-parsing.html": [
-       "dfc9997e9fdd0a4b7bc310bf26e9fd9c81f835fa",
+       "cb250a178d4236405ba26bdf19935f4d8c1b3c87",
        [
         null,
         {}
@@ -446308,7 +437045,7 @@
        ]
       ],
       "position-try-parsing.html": [
-       "7f50459710629cefd0282a8d78a60e8d760e719f",
+       "8c36ddbaace11770b015c2f2d55c77c9b736b7db",
        [
         null,
         {}
@@ -459604,6 +450341,27 @@
       ]
      },
      "text-box-trim": {
+      "text-box-edge-computed.html": [
+       "50a963297ce430fd0b6c81db1f76e73a3c8aa36e",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-box-edge-invalid.html": [
+       "401f8c61a39346a1438eefafc2d811fc87ca32b3",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-box-edge-valid.html": [
+       "36f37715b9947b8195de1f036e880d8a96d30bfa",
+       [
+        null,
+        {}
+       ]
+      ],
       "text-box-trim-valid.html": [
        "61622774f6f33054ad97e74dde0b020619eb1d02",
        [
@@ -475971,13 +466729,6 @@
        {}
       ]
      ],
-     "calc-rounding-001.html": [
-      "dfd03a695305e0721154bf26f68a5912216d9862",
-      [
-       null,
-       {}
-      ]
-     ],
      "calc-rounds-to-integer.html": [
       "80589785c36e14d0859b3f4a5555f7e9d47ac963",
       [
@@ -476001,23 +466752,37 @@
      ],
      "calc-size": {
       "animation": {
+       "calc-size-height-interpolation.tentative.html": [
+        "525c38805d66ccf00719d3ce64a2703c32629042",
+        [
+         null,
+         {}
+        ]
+       ],
        "calc-size-width-interpolation.tentative.html": [
-        "7254951db32c61f5d7da2e70427d3524b635e209",
+        "ff72ba6a0d84bcafffb75cd6c7f87731a053219a",
         [
          null,
          {}
         ]
        ]
       },
+      "calc-size-height.tentative.html": [
+       "6f93cc0c8998c27c7db4e823f7fffa75656c7a36",
+       [
+        null,
+        {}
+       ]
+      ],
       "calc-size-parsing.tentative.html": [
-       "fec24aaed13989e49dc2225847d51734bd523a3d",
+       "bc0048f826eaad91acfa194db5431aaa98c6137b",
        [
         null,
         {}
        ]
       ],
       "calc-size-width.tentative.html": [
-       "228f526752fc800681bb3950ee87908c29994792",
+       "c8000f345f73b9019128bea3ceb2dbc65d9eb307",
        [
         null,
         {}
@@ -477987,6 +468752,13 @@
        {}
       ]
      ],
+     "CSSStyleSheet-constructable-invalidation.html": [
+      "f63abaa80c4a20d7b37916d05a1be37ef87bdefa",
+      [
+       null,
+       {}
+      ]
+     ],
      "CSSStyleSheet-constructable-replace-cssRules.html": [
       "adb1b5f70988a33a6535e9c27c9c86dffdb99aaf",
       [
@@ -480028,6 +470800,13 @@
        {}
       ]
      ],
+     "smooth-scroll-in-load-event.html": [
+      "e515b067102a938d3310487d89ef214bdfebb0ee",
+      [
+       null,
+       {}
+      ]
+     ],
      "subpixel-sizes-and-offsets.tentative.html": [
       "d198b9dde60c8cac16241c412d3e55f772166010",
       [
@@ -488937,6 +479716,15 @@
        }
       ]
      ],
+     "delete-in-inline-editing-host-under-shadow-root.html": [
+      "c1a825a6452f31305d8677bccfb2804ba92dfd0d",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "delete-in-last-definition-list-item-when-parent-list-is-editing-host.html": [
       "e068f9bcd22a654a4eeed4c59c920c9cc353c70e",
       [
@@ -523151,6 +513939,41 @@
        }
       ]
      ],
+     "additional-bids.https.window.js": [
+      "0e1d22c261984872f80cb09b39a6be24a038d311",
+      [
+       "fledge/tentative/additional-bids.https.window.html?1-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "auction-config-passed-to-worklets.https.window.js": [
       "c78a27bb87a67cae52c411beb6990796afd95f42",
       [
@@ -525606,9 +516429,9 @@
       ]
      ],
      "generate-bid-browser-signals.https.window.js": [
-      "3ab8bbf51f6baf80e9c6f293c53160c2be703242",
+      "615702ba9e21e009628c6a9f2fc72ad94ff02ab7",
       [
-       "fledge/tentative/generate-bid-browser-signals.https.window.html?1-last",
+       "fledge/tentative/generate-bid-browser-signals.https.window.html?1-4",
        {
         "script_metadata": [
          [
@@ -525633,7 +516456,215 @@
          ],
          [
           "variant",
-          "?1-last"
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/generate-bid-browser-signals.https.window.html?13-16",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/generate-bid-browser-signals.https.window.html?17-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/generate-bid-browser-signals.https.window.html?5-8",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/generate-bid-browser-signals.https.window.html?9-12",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-last"
          ]
         ],
         "timeout": "long"
@@ -536307,6 +527338,79 @@
          {}
         ]
        ],
+       "pageconceal": {
+        "pageconceal-cross-origin.sub.html": [
+         "bcc8a9f888ed05839a11a4f5b6c7e6831ca7b41e",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "pageconceal-iframe.html": [
+         "4202cf0e5a90dad828d89d328025988af732193b",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "pageconceal-push-from-click.html": [
+         "a2a6eb941a3779df441ffdc0cef6b95a8e7b34d6",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "pageconceal-push-navigation-hidden-document.html": [
+         "fdff57c7fb94abd40a022d7b19dd238c90d03ea3",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "pageconceal-push-navigation.html": [
+         "57e12d9ee64a257b897308b53bd804f832d7af4b",
+         [
+          null,
+          {}
+         ]
+        ],
+        "pageconceal-push-with-redirect.html": [
+         "9ad5ee72f4f9bf474b10d2b1f6b2ba99d570550c",
+         [
+          null,
+          {}
+         ]
+        ],
+        "pageconceal-reload-navigation.html": [
+         "0dd135c160a3493ddcc637dd688f2bd2a8bf38f2",
+         [
+          null,
+          {}
+         ]
+        ],
+        "pageconceal-replace-navigation.html": [
+         "012439ae9bbfbdcce9278398db7ad1b60fecd807",
+         [
+          null,
+          {}
+         ]
+        ],
+        "pageconceal-traverse-navigation-no-bfcache.https.html": [
+         "c34c443beadc167ff9fba8ffa9469e0f0dd43208",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
        "pagereveal": {
         "order-in-bfcache-restore.html": [
          "f453c80a2aee8c2cff5bca12f361a6a7b7683be8",
@@ -545642,6 +536746,13 @@
          {}
         ]
        ],
+       "2d.layer.ctm.getTransform.html": [
+        "7a69c595272195e9c87e563704183b083c719d19",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.layer.exceptions-are-no-op.html": [
         "7ab2080fca382babacd8908b1b5ebbddb9f2c2ad",
         [
@@ -556144,6 +547255,20 @@
          {}
         ]
        ],
+       "2d.layer.ctm.getTransform.html": [
+        "b2306d95acb15dfa39a35e2082e0dd1b8fa616f8",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.layer.ctm.getTransform.worker.js": [
+        "54b1fee5d0958de27d9e8f4520ebb43a8c6e0662",
+        [
+         "html/canvas/offscreen/layers/2d.layer.ctm.getTransform.worker.html",
+         {}
+        ]
+       ],
        "2d.layer.exceptions-are-no-op.html": [
         "a047c539cfbda487598412027f441f0794c44c07",
         [
@@ -568457,6 +559582,69 @@
         {}
        ]
       ],
+      "element-render-blocking-029.tentative.html": [
+       "44dff3cb8429d901b65f5991d3696abb31ff6831",
+       [
+        null,
+        {}
+       ]
+      ],
+      "element-render-blocking-030.tentative.html": [
+       "307c2d303d045d090c180ae22476b1419b91d9bc",
+       [
+        null,
+        {}
+       ]
+      ],
+      "element-render-blocking-031.tentative.html": [
+       "2098483a0600c642f32403fff97be2bb4fed4572",
+       [
+        null,
+        {}
+       ]
+      ],
+      "element-render-blocking-032.tentative.html": [
+       "307c2d303d045d090c180ae22476b1419b91d9bc",
+       [
+        null,
+        {}
+       ]
+      ],
+      "element-render-blocking-033.tentative.html": [
+       "59d41c08c0a677e0e462c53e47e76635cb3bf9b1",
+       [
+        null,
+        {}
+       ]
+      ],
+      "element-render-blocking-034.tentative.html": [
+       "92d4a06b1a93f4f2f6dfb77b4c293064522ebca4",
+       [
+        null,
+        {}
+       ]
+      ],
+      "element-render-blocking-035.tentative.html": [
+       "fd3b6b1759f21d2b71fd9b0b137324529c72f14a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "element-render-blocking-036.tentative.html": [
+       "83637b3a08b859b0fa46b3bfdab6edc8df86c7bb",
+       [
+        null,
+        {}
+       ]
+      ],
+      "element-render-blocking-037.tentative.html": [
+       "885d64604fe8c1ad4b605a3582c90c70c8302f5d",
+       [
+        null,
+        {}
+       ]
+      ],
       "non-render-blocking-scripts.optional.html": [
        "a4c32ea037b7b47490c54ddd7616b88bfebcdc76",
        [
@@ -580799,6 +571987,13 @@
         {}
        ]
       ],
+      "interestelement-interface.tentative.html": [
+       "531bf0e1a629989c743094686f50388d9bbe28be",
+       [
+        null,
+        {}
+       ]
+      ],
       "invokeelement-interface.tentative.html": [
        "b003daf20d4be5b9eac15b930d10ae2b859ec505",
        [
@@ -608174,7 +599369,7 @@
     ],
     "not-restored-reasons": {
      "abort-block-bfcache.window.js": [
-      "09a73509b8a834eca47032972d90b14c430bd1af",
+      "e5dbb0f43c8dd3d447e7bfe455d4ae1ad7ae8e91",
       [
        "performance-timeline/not-restored-reasons/abort-block-bfcache.window.html",
        {
@@ -608184,6 +599379,10 @@
           "Aborting a parser should block bfcache"
          ],
          [
+          "script",
+          "./test-helper.js"
+         ],
+         [
           "timeout",
           "long"
          ]
@@ -635681,6 +626880,15 @@
       {}
      ]
     ],
+    "append-exceed-former-entry-limit.tentative.https.html": [
+     "921b9d45733a559d082056a64706238b429a565c",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
     "blob-module-script-url-invalid-mime-type.tentative.https.sub.html": [
      "116facbcd5f558b3d186878a3247ba81ea9c7c4e",
      [
@@ -635702,6 +626910,41 @@
       {}
      ]
     ],
+    "cross-origin-create-worklet-credentials-include.tentative.https.sub.html": [
+     "9c44d2a29f8d3324df8966addcffe7ebf08cea0f",
+     [
+      null,
+      {}
+     ]
+    ],
+    "cross-origin-create-worklet-credentials-omit.tentative.https.sub.html": [
+     "ddda1809f2ca9590d5f6391da0f4843140d98f9a",
+     [
+      null,
+      {}
+     ]
+    ],
+    "cross-origin-create-worklet-credentials-same-origin.tentative.https.sub.html": [
+     "99701d2b7d40a12179b9f45058baf166b0a55062",
+     [
+      null,
+      {}
+     ]
+    ],
+    "cross-origin-create-worklet-failure-missing-access-control-allow-credentials.tentative.https.sub.html": [
+     "598fd8f405abdc88662078e34b5f52d58355e20b",
+     [
+      null,
+      {}
+     ]
+    ],
+    "cross-origin-create-worklet-failure-missing-access-control-allow-origin.tentative.https.sub.html": [
+     "4195d09fc06c46d34b9eff2b582486da2c585e30",
+     [
+      null,
+      {}
+     ]
+    ],
     "embedder-context.tentative.https.sub.html": [
      "44f45a7643111f169be1a1b8935720325103099e",
      [
@@ -635842,6 +627085,15 @@
       {}
      ]
     ],
+    "set-exceed-former-entry-limit.tentative.https.html": [
+     "b78abbf1efd17711d2bffe641b83266c8f862e14",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
     "setters-long-string.tentative.https.sub.html": [
      "69b66a53a0d0655abb0d0f13273a9091ba301014",
      [
@@ -649022,6 +640274,13 @@
         {}
        ]
       ],
+      "svg-checkIntersection-002.svg": [
+       "1ff1f7829f3cf7192d73549f50743c29d617fa8f",
+       [
+        null,
+        {}
+       ]
+      ],
       "svg-getIntersectionList-001.svg": [
        "a360bad3d35af84f0d65a4d00391cf454332691e",
        [
@@ -649030,7 +640289,7 @@
        ]
       ],
       "svg-getIntersectionList-002.svg": [
-       "c2c1f8e425af84c68e4dc7a51c68e1c668e2b4b1",
+       "dd30943569050c210cce66681b6092abc00eb382",
        [
         null,
         {}
@@ -649050,6 +640309,20 @@
         {}
        ]
       ],
+      "svg-getIntersectionList-005.svg": [
+       "717c15eef5272bb8621744bfe7e2c199f147d17a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "svg-getIntersectionList-006.svg": [
+       "a7b946501377b5512c57286711a51d006d33db62",
+       [
+        null,
+        {}
+       ]
+      ],
       "use-load-error-events.tentative.html": [
        "2c52072e16906575679ab654b7e901a08b5541c7",
        [
@@ -649867,6 +641140,16 @@
       }
      ]
     ],
+    "mouseevents-after-touchend.tentative.html": [
+     "3032fadf193613ac1374c1ea5e3ab083374f6f3f",
+     [
+      null,
+      {
+       "testdriver": true,
+       "timeout": "long"
+      }
+     ]
+    ],
     "multi-touch-interactions.html": [
      "a10416bdfd458cc7008ffc401153be08c7e068d0",
      [
@@ -663601,6 +654884,13 @@
         {}
        ]
       ],
+      "audioworkletprocessor-unconnected-outputs.https.window.js": [
+       "16adddd3394d6d956234376343fb53062038ea59",
+       [
+        "webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-unconnected-outputs.https.window.html",
+        {}
+       ]
+      ],
       "baseaudiocontext-audioworklet.https.html": [
        "4281f56379bb20f1e173c22c99ab208d2be0fdd4",
        [
@@ -664449,7 +655739,7 @@
        ]
       ],
       "waveshaper.html": [
-       "8bfa009b181d4fc43f35e3bda7733923c2e08500",
+       "5e6ed24e9ea30f20d8a0342f958a9f52a1785a0a",
        [
         null,
         {}
@@ -671818,776 +663108,11 @@
     ]
    },
    "webnn": {
-    "arg_min_max.https.any.js": [
-     "cff1d6a955ce31fbecde084f8407a8f53bf6b889",
-     [
-      "webnn/arg_min_max.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API argMin/Max operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/arg_min_max.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API argMin/Max operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "batch_normalization.https.any.js": [
-     "15e66a8bc06b2e73c19f910c765428b89b3f3b3d",
-     [
-      "webnn/batch_normalization.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API batchNormalization operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/batch_normalization.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API batchNormalization operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "cast.https.any.js": [
-     "c9be45a770d3ad6247bfca04e20dc915eb12fc10",
-     [
-      "webnn/cast.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API cast operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/cast.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API cast operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "clamp.https.any.js": [
-     "9818aed7c12be552b24427efa3beb78547ef2e0e",
-     [
-      "webnn/clamp.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API clamp operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/clamp.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API clamp operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "concat.https.any.js": [
-     "cce43e492ff4c5347bf8fd1d8c558ae97ea4a65a",
-     [
-      "webnn/concat.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API concat operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/concat.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API concat operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "constant.https.any.js": [
-     "afb020d275cd1578cae83ffb2c5d2cb1c1329285",
-     [
-      "webnn/constant.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API constant"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/constant.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API constant"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "conv2d.https.any.js": [
-     "b26b35ec676457d4d21c5f20fd0aff9eab3baf8e",
-     [
-      "webnn/conv2d.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API conv2d operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/conv2d.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API conv2d operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "conv_transpose2d.https.any.js": [
-     "99e76b825e55a59c590b86b2b7e1983d8e2b0650",
-     [
-      "webnn/conv_transpose2d.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API convTranspose2d operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/conv_transpose2d.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API convTranspose2d operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "elementwise_binary.https.any.js": [
-     "06c2404f95489da2c2558639d9b631c8c2124295",
-     [
-      "webnn/elementwise_binary.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API element-wise binary operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/elementwise_binary.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API element-wise binary operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "elementwise_logical.https.any.js": [
-     "e614b94df5e906630bf656889690b2c22d5b6d46",
-     [
-      "webnn/elementwise_logical.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API element-wise logical operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/elementwise_logical.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API element-wise logical operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "elementwise_unary.https.any.js": [
-     "4cdfee5bcb07f8ab011460f23564e081372267ac",
-     [
-      "webnn/elementwise_unary.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API element-wise unary operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/elementwise_unary.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API element-wise unary operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "elu.https.any.js": [
-     "57b624b5daa50e72ab87af69c22e61051c1c72e2",
-     [
-      "webnn/elu.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API elu operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/elu.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API elu operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "expand.https.any.js": [
-     "11abb9baa89da3a819ca67f99a83109c433fc88e",
-     [
-      "webnn/expand.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API expand operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/expand.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API expand operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "gather.https.any.js": [
-     "52bcece8043ebf1ca7a4f227ad3a4243f49ff502",
-     [
-      "webnn/gather.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API gather operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/gather.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API gather operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "gemm.https.any.js": [
-     "e5de9521fba767d5269b0829af3e55248e16f6fc",
-     [
-      "webnn/gemm.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API gemm operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/gemm.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API gemm operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "gpu": {
+    "conformance_tests": {
      "arg_min_max.https.any.js": [
-      "76092ea92e6931f64f24f068341fe7335fd58259",
+      "123c8b1048f5a2e14d37eb16320e2b3cb6fee55f",
       [
-       "webnn/gpu/arg_min_max.https.any.html",
+       "webnn/conformance_tests/arg_min_max.https.any.html",
        {
         "script_metadata": [
          [
@@ -672611,7 +663136,7 @@
        }
       ],
       [
-       "webnn/gpu/arg_min_max.https.any.worker.html",
+       "webnn/conformance_tests/arg_min_max.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -672636,9 +663161,9 @@
       ]
      ],
      "batch_normalization.https.any.js": [
-      "90b6def636d1090dc0fe19368fbb5ac38d0133cd",
+      "9a1c85db1971b79f5667760c5698885c4536e0a1",
       [
-       "webnn/gpu/batch_normalization.https.any.html",
+       "webnn/conformance_tests/batch_normalization.https.any.html",
        {
         "script_metadata": [
          [
@@ -672662,7 +663187,7 @@
        }
       ],
       [
-       "webnn/gpu/batch_normalization.https.any.worker.html",
+       "webnn/conformance_tests/batch_normalization.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -672687,9 +663212,9 @@
       ]
      ],
      "cast.https.any.js": [
-      "1830364eb55234a06c3b3821003ba8477bc459b9",
+      "bde2b9a4ce1cf2d25cb5866fe68725f8e13db1dd",
       [
-       "webnn/gpu/cast.https.any.html",
+       "webnn/conformance_tests/cast.https.any.html",
        {
         "script_metadata": [
          [
@@ -672713,7 +663238,7 @@
        }
       ],
       [
-       "webnn/gpu/cast.https.any.worker.html",
+       "webnn/conformance_tests/cast.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -672738,9 +663263,9 @@
       ]
      ],
      "clamp.https.any.js": [
-      "98313868b6d6802cea00603caad49288dc4a7c99",
+      "7b60c41f2cacd6700a84823c048cf0aba609b288",
       [
-       "webnn/gpu/clamp.https.any.html",
+       "webnn/conformance_tests/clamp.https.any.html",
        {
         "script_metadata": [
          [
@@ -672764,7 +663289,7 @@
        }
       ],
       [
-       "webnn/gpu/clamp.https.any.worker.html",
+       "webnn/conformance_tests/clamp.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -672789,9 +663314,9 @@
       ]
      ],
      "concat.https.any.js": [
-      "07073724feeade9df491c566ef31f1141376c2c3",
+      "254e0b657b43dbaa370779ba92186fe3d7eb1657",
       [
-       "webnn/gpu/concat.https.any.html",
+       "webnn/conformance_tests/concat.https.any.html",
        {
         "script_metadata": [
          [
@@ -672815,7 +663340,7 @@
        }
       ],
       [
-       "webnn/gpu/concat.https.any.worker.html",
+       "webnn/conformance_tests/concat.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -672840,9 +663365,9 @@
       ]
      ],
      "constant.https.any.js": [
-      "7e0933f2f1b333e5043ddfd823faf420cc156e94",
+      "4814734886e0bf94995ec1992cacd9e6be1bc7c1",
       [
-       "webnn/gpu/constant.https.any.html",
+       "webnn/conformance_tests/constant.https.any.html",
        {
         "script_metadata": [
          [
@@ -672866,7 +663391,7 @@
        }
       ],
       [
-       "webnn/gpu/constant.https.any.worker.html",
+       "webnn/conformance_tests/constant.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -672891,9 +663416,9 @@
       ]
      ],
      "conv2d.https.any.js": [
-      "b3986b65551a087d51abff83d72e012cf8147a34",
+      "0d9a6213569a7fb72c45ae47ab90245093e4ea20",
       [
-       "webnn/gpu/conv2d.https.any.html",
+       "webnn/conformance_tests/conv2d.https.any.html",
        {
         "script_metadata": [
          [
@@ -672917,7 +663442,7 @@
        }
       ],
       [
-       "webnn/gpu/conv2d.https.any.worker.html",
+       "webnn/conformance_tests/conv2d.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -672942,9 +663467,9 @@
       ]
      ],
      "conv_transpose2d.https.any.js": [
-      "020bfa9c972d9d1fe50157601fe7a8bd35331a19",
+      "ee5d28c72adc9e610ac1c09402b85b21de28bafd",
       [
-       "webnn/gpu/conv_transpose2d.https.any.html",
+       "webnn/conformance_tests/conv_transpose2d.https.any.html",
        {
         "script_metadata": [
          [
@@ -672968,7 +663493,7 @@
        }
       ],
       [
-       "webnn/gpu/conv_transpose2d.https.any.worker.html",
+       "webnn/conformance_tests/conv_transpose2d.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -672993,9 +663518,9 @@
       ]
      ],
      "elementwise_binary.https.any.js": [
-      "035d0c77c0310a18f2fe45a707a170e670d70606",
+      "5db14a43a1f4d752ce15f8bfad50031902b0a9a2",
       [
-       "webnn/gpu/elementwise_binary.https.any.html",
+       "webnn/conformance_tests/elementwise_binary.https.any.html",
        {
         "script_metadata": [
          [
@@ -673019,7 +663544,7 @@
        }
       ],
       [
-       "webnn/gpu/elementwise_binary.https.any.worker.html",
+       "webnn/conformance_tests/elementwise_binary.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673044,9 +663569,9 @@
       ]
      ],
      "elementwise_logical.https.any.js": [
-      "f597ce8e0b259eaecc57c50437ae50a1a520695c",
+      "a60c199447f1ef1e6266a4fde4a566d9b65772f8",
       [
-       "webnn/gpu/elementwise_logical.https.any.html",
+       "webnn/conformance_tests/elementwise_logical.https.any.html",
        {
         "script_metadata": [
          [
@@ -673070,7 +663595,7 @@
        }
       ],
       [
-       "webnn/gpu/elementwise_logical.https.any.worker.html",
+       "webnn/conformance_tests/elementwise_logical.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673095,9 +663620,9 @@
       ]
      ],
      "elementwise_unary.https.any.js": [
-      "45978f91ec4c5d7f0d00fd7d4abe4661788a38b8",
+      "8029539edadd8d4f96a0d04e56f7271f99b7e5c7",
       [
-       "webnn/gpu/elementwise_unary.https.any.html",
+       "webnn/conformance_tests/elementwise_unary.https.any.html",
        {
         "script_metadata": [
          [
@@ -673121,7 +663646,7 @@
        }
       ],
       [
-       "webnn/gpu/elementwise_unary.https.any.worker.html",
+       "webnn/conformance_tests/elementwise_unary.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673146,9 +663671,9 @@
       ]
      ],
      "elu.https.any.js": [
-      "965bb4d35f1eb5fcee530b4977b66f628a3e2469",
+      "382faa97fd1340f0bf04df1d2cac17390d20866d",
       [
-       "webnn/gpu/elu.https.any.html",
+       "webnn/conformance_tests/elu.https.any.html",
        {
         "script_metadata": [
          [
@@ -673172,7 +663697,7 @@
        }
       ],
       [
-       "webnn/gpu/elu.https.any.worker.html",
+       "webnn/conformance_tests/elu.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673197,9 +663722,9 @@
       ]
      ],
      "expand.https.any.js": [
-      "82fa891a39933aa5420ce88e8d888e359732faa7",
+      "b1be129eac3b768a5b2df4fdf6c75afb8c1ea916",
       [
-       "webnn/gpu/expand.https.any.html",
+       "webnn/conformance_tests/expand.https.any.html",
        {
         "script_metadata": [
          [
@@ -673223,7 +663748,7 @@
        }
       ],
       [
-       "webnn/gpu/expand.https.any.worker.html",
+       "webnn/conformance_tests/expand.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673248,9 +663773,9 @@
       ]
      ],
      "gather.https.any.js": [
-      "7c8a685c5cb3fa9b5a6a2ea267e19e5d4df1b31d",
+      "39b19705632b7682f44f40aa711bd4dc0e04b117",
       [
-       "webnn/gpu/gather.https.any.html",
+       "webnn/conformance_tests/gather.https.any.html",
        {
         "script_metadata": [
          [
@@ -673274,7 +663799,7 @@
        }
       ],
       [
-       "webnn/gpu/gather.https.any.worker.html",
+       "webnn/conformance_tests/gather.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673299,9 +663824,9 @@
       ]
      ],
      "gemm.https.any.js": [
-      "a19dc39bbc87e845eadbf74ea369780bd38e90dc",
+      "61fd7c9b3963f7c0202d46677f65ee8051da1b8e",
       [
-       "webnn/gpu/gemm.https.any.html",
+       "webnn/conformance_tests/gemm.https.any.html",
        {
         "script_metadata": [
          [
@@ -673325,7 +663850,7 @@
        }
       ],
       [
-       "webnn/gpu/gemm.https.any.worker.html",
+       "webnn/conformance_tests/gemm.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673349,10 +663874,1950 @@
        }
       ]
      ],
+     "gpu": {
+      "arg_min_max.https.any.js": [
+       "c700ee5cad7ec88167c6bc0c73956e11b1e72f6c",
+       [
+        "webnn/conformance_tests/gpu/arg_min_max.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API argMin/Max operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/arg_min_max.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API argMin/Max operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "batch_normalization.https.any.js": [
+       "534cdf6365a2c5226f0c366dae763c1656c1bce5",
+       [
+        "webnn/conformance_tests/gpu/batch_normalization.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API batchNormalization operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/batch_normalization.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API batchNormalization operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "cast.https.any.js": [
+       "e4309ffd8e3e7152b414a05fbd2ce767755c447d",
+       [
+        "webnn/conformance_tests/gpu/cast.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API cast operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/cast.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API cast operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "clamp.https.any.js": [
+       "9b3f93ecc77cc4a67a10dfd9e8f34a61dbb76c09",
+       [
+        "webnn/conformance_tests/gpu/clamp.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API clamp operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/clamp.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API clamp operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "concat.https.any.js": [
+       "c0cfb8626b80495e60e99b821ae8cdb806f716b3",
+       [
+        "webnn/conformance_tests/gpu/concat.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API concat operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/concat.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API concat operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "constant.https.any.js": [
+       "77b4d889a2306cb3645b7c9db8f45cfacca7096b",
+       [
+        "webnn/conformance_tests/gpu/constant.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API constant"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/constant.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API constant"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "conv2d.https.any.js": [
+       "770540abd85237aa54055ba47b48ed98a8ed7e5d",
+       [
+        "webnn/conformance_tests/gpu/conv2d.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API conv2d operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/conv2d.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API conv2d operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "conv_transpose2d.https.any.js": [
+       "08c441b5b4580e5118df659b5e804a5abeb7926a",
+       [
+        "webnn/conformance_tests/gpu/conv_transpose2d.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API convTranspose2d operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/conv_transpose2d.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API convTranspose2d operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "elementwise_binary.https.any.js": [
+       "8b9fa486f866d5ac1b1e504e8838c1a2b71e9282",
+       [
+        "webnn/conformance_tests/gpu/elementwise_binary.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API element-wise binary operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/elementwise_binary.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API element-wise binary operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "elementwise_logical.https.any.js": [
+       "70a887a147aff90870411d3529fea622439f96a5",
+       [
+        "webnn/conformance_tests/gpu/elementwise_logical.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API element-wise logical operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/elementwise_logical.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API element-wise logical operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "elementwise_unary.https.any.js": [
+       "887112931118dd4cf6db6ccfe6835af5a299f8c0",
+       [
+        "webnn/conformance_tests/gpu/elementwise_unary.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API element-wise unary operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/elementwise_unary.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API element-wise unary operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "elu.https.any.js": [
+       "db14442641b5750af9f5bcd60668a6a8fed74b86",
+       [
+        "webnn/conformance_tests/gpu/elu.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API elu operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/elu.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API elu operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "expand.https.any.js": [
+       "f46f4637817b94e6ca55eee8a88aca75b5715b9c",
+       [
+        "webnn/conformance_tests/gpu/expand.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API expand operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/expand.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API expand operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "gather.https.any.js": [
+       "8e457192d818be0f7c59cf985fbf7edbc039267c",
+       [
+        "webnn/conformance_tests/gpu/gather.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API gather operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/gather.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API gather operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "gemm.https.any.js": [
+       "f288c31bedff1f5f1b5be675f237f9002890d9ed",
+       [
+        "webnn/conformance_tests/gpu/gemm.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API gemm operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/gemm.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API gemm operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "hard_sigmoid.https.any.js": [
+       "d40e42a211b733acc7d94031f194ed3b81edabbf",
+       [
+        "webnn/conformance_tests/gpu/hard_sigmoid.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API hardSigmoid operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/hard_sigmoid.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API hardSigmoid operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "hard_swish.https.any.js": [
+       "031e65ee1606d54033077a3b941f27bf77b441c8",
+       [
+        "webnn/conformance_tests/gpu/hard_swish.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API tanh operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/hard_swish.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API tanh operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "instance_normalization.https.any.js": [
+       "ecfaac71eed9464e822599c8a102d328515631a2",
+       [
+        "webnn/conformance_tests/gpu/instance_normalization.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API instanceNormalization operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/instance_normalization.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API instanceNormalization operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "layer_normalization.https.any.js": [
+       "0e4f6caebf1cbc023a2c1928ebb29c22fc246c77",
+       [
+        "webnn/conformance_tests/gpu/layer_normalization.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API layerNormalization operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/layer_normalization.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API layerNormalization operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "leaky_relu.https.any.js": [
+       "9fab2353b9aac7eef800bc64d06176b6ea7025c3",
+       [
+        "webnn/conformance_tests/gpu/leaky_relu.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API leakyRelu operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/leaky_relu.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API leakyRelu operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "linear.https.any.js": [
+       "ccec2c3eac246a19214d7892df72c3c80a02df67",
+       [
+        "webnn/conformance_tests/gpu/linear.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API linear operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/linear.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API linear operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "matmul.https.any.js": [
+       "635ce84ac6b102348c1c030f518873f928025cc7",
+       [
+        "webnn/conformance_tests/gpu/matmul.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API matmul operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/matmul.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API matmul operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "pad.https.any.js": [
+       "f313e2c9f9a06b9dac028851d3e7573c8320c15c",
+       [
+        "webnn/conformance_tests/gpu/pad.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API pad operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/pad.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API pad operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "pooling.https.any.js": [
+       "837bca2c71d80d77b1071595899dbc1d82cc138a",
+       [
+        "webnn/conformance_tests/gpu/pooling.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API pooling operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/pooling.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API pooling operations"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "prelu.https.any.js": [
+       "475cd9e5ce94debff8878de0f882c6936638b25d",
+       [
+        "webnn/conformance_tests/gpu/prelu.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API prelu operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/prelu.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API prelu operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "reduction.https.any.js": [
+       "0f3cefa02eb6f52b511ac0b3a34610fa77122d7c",
+       [
+        "webnn/conformance_tests/gpu/reduction.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API reduction  operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/reduction.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API reduction  operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "relu.https.any.js": [
+       "d1a35367df44f23948262660977b41f8284191a9",
+       [
+        "webnn/conformance_tests/gpu/relu.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API relu operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/relu.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API relu operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "reshape.https.any.js": [
+       "b0217d2e67bcf343e6b00171329793d1e570f11e",
+       [
+        "webnn/conformance_tests/gpu/reshape.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API reshape operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/reshape.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API reshape operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "sigmoid.https.any.js": [
+       "26116c0ff92ee01577560429f92ee95b501545f2",
+       [
+        "webnn/conformance_tests/gpu/sigmoid.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API sigmoid operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/sigmoid.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API sigmoid operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "slice.https.any.js": [
+       "1710c79a9ced8ee8715fa89e1dd25e59fb271012",
+       [
+        "webnn/conformance_tests/gpu/slice.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API slice operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/slice.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API slice operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "softmax.https.any.js": [
+       "9eaffe2bebcfd7044ac64c0edbbac7e76fb6a267",
+       [
+        "webnn/conformance_tests/gpu/softmax.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API softmax operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/softmax.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API softmax operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "softplus.https.any.js": [
+       "5f06846113e38616c52b99641dd562ab21d10de6",
+       [
+        "webnn/conformance_tests/gpu/softplus.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API softplus operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/softplus.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API softplus operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "softsign.https.any.js": [
+       "eac0b7ec40cec0def9de674c9c9832673a6f4b8b",
+       [
+        "webnn/conformance_tests/gpu/softsign.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API softsign operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/softsign.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API softsign operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "split.https.any.js": [
+       "3b0aafd7870fb06c46b1c7e2fceb4d6a22e2fd07",
+       [
+        "webnn/conformance_tests/gpu/split.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API split operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/split.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API split operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "tanh.https.any.js": [
+       "3029f4865a49325f71d82468e74799e9dbeb21be",
+       [
+        "webnn/conformance_tests/gpu/tanh.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API tanh operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/tanh.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API tanh operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "transpose.https.any.js": [
+       "295ef43ec11f14aa27bae0cc96efc3572ba0445b",
+       [
+        "webnn/conformance_tests/gpu/transpose.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API transpose operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/transpose.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API transpose operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "triangular.https.any.js": [
+       "3e1b0d5ab130ff2a5dfb9ad66075f2c1bd980e6c",
+       [
+        "webnn/conformance_tests/gpu/triangular.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API triangular operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/triangular.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API triangular operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ],
+      "where.https.any.js": [
+       "49c6cbd4e3236d03c881e7557fbaf52812ff0550",
+       [
+        "webnn/conformance_tests/gpu/where.https.any.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API where operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ],
+       [
+        "webnn/conformance_tests/gpu/where.https.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "title",
+           "test WebNN API where operation"
+          ],
+          [
+           "global",
+           "window,dedicatedworker"
+          ],
+          [
+           "script",
+           "../../resources/utils.js"
+          ],
+          [
+           "timeout",
+           "long"
+          ]
+         ],
+         "timeout": "long"
+        }
+       ]
+      ]
+     },
      "hard_sigmoid.https.any.js": [
-      "b6f2f53b320f61f62af5288cb25dfa97acce52df",
+      "8161a2453861b3fc1ccda5cc95362c2cea78ede8",
       [
-       "webnn/gpu/hard_sigmoid.https.any.html",
+       "webnn/conformance_tests/hard_sigmoid.https.any.html",
        {
         "script_metadata": [
          [
@@ -673376,7 +665841,7 @@
        }
       ],
       [
-       "webnn/gpu/hard_sigmoid.https.any.worker.html",
+       "webnn/conformance_tests/hard_sigmoid.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673401,9 +665866,9 @@
       ]
      ],
      "hard_swish.https.any.js": [
-      "a1731490bd4f584596d410f9c3aad55864c00f1c",
+      "b4a7c53d8d2004fd2948cd016df0fa5efb8a5cae",
       [
-       "webnn/gpu/hard_swish.https.any.html",
+       "webnn/conformance_tests/hard_swish.https.any.html",
        {
         "script_metadata": [
          [
@@ -673427,7 +665892,7 @@
        }
       ],
       [
-       "webnn/gpu/hard_swish.https.any.worker.html",
+       "webnn/conformance_tests/hard_swish.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673452,9 +665917,9 @@
       ]
      ],
      "instance_normalization.https.any.js": [
-      "e1d73de387eab5e571635ec19544bb322cd125c0",
+      "fce879172e5faa464cad4feaa24dc3a1d52aa334",
       [
-       "webnn/gpu/instance_normalization.https.any.html",
+       "webnn/conformance_tests/instance_normalization.https.any.html",
        {
         "script_metadata": [
          [
@@ -673478,7 +665943,7 @@
        }
       ],
       [
-       "webnn/gpu/instance_normalization.https.any.worker.html",
+       "webnn/conformance_tests/instance_normalization.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673503,9 +665968,9 @@
       ]
      ],
      "layer_normalization.https.any.js": [
-      "1deb43bee5dc326627d0141f3dd814543a677432",
+      "ab8a50cc0374412bab18ff63a4ec894182090b06",
       [
-       "webnn/gpu/layer_normalization.https.any.html",
+       "webnn/conformance_tests/layer_normalization.https.any.html",
        {
         "script_metadata": [
          [
@@ -673529,7 +665994,7 @@
        }
       ],
       [
-       "webnn/gpu/layer_normalization.https.any.worker.html",
+       "webnn/conformance_tests/layer_normalization.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673554,9 +666019,9 @@
       ]
      ],
      "leaky_relu.https.any.js": [
-      "f3a7bd8ba536003f55715f1a0c6d5311fd62a6a4",
+      "2b6f17e95dee4a5b5ae8e5fc246278dd261ae476",
       [
-       "webnn/gpu/leaky_relu.https.any.html",
+       "webnn/conformance_tests/leaky_relu.https.any.html",
        {
         "script_metadata": [
          [
@@ -673580,7 +666045,7 @@
        }
       ],
       [
-       "webnn/gpu/leaky_relu.https.any.worker.html",
+       "webnn/conformance_tests/leaky_relu.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673605,9 +666070,9 @@
       ]
      ],
      "linear.https.any.js": [
-      "48b8d82c1e5a00fa1b7be9443ae60935b0bdf871",
+      "465b697f29ae5765805559ebb7253994d7f88f78",
       [
-       "webnn/gpu/linear.https.any.html",
+       "webnn/conformance_tests/linear.https.any.html",
        {
         "script_metadata": [
          [
@@ -673631,7 +666096,7 @@
        }
       ],
       [
-       "webnn/gpu/linear.https.any.worker.html",
+       "webnn/conformance_tests/linear.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673656,9 +666121,9 @@
       ]
      ],
      "matmul.https.any.js": [
-      "01fed04e3d3dbe8c6fd279e104b20fdb1ac5c1af",
+      "64eeb37f08bc47482e3806af7f6eb21147198f85",
       [
-       "webnn/gpu/matmul.https.any.html",
+       "webnn/conformance_tests/matmul.https.any.html",
        {
         "script_metadata": [
          [
@@ -673682,7 +666147,7 @@
        }
       ],
       [
-       "webnn/gpu/matmul.https.any.worker.html",
+       "webnn/conformance_tests/matmul.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673707,9 +666172,9 @@
       ]
      ],
      "pad.https.any.js": [
-      "26d1bf0f3858b2bb18c85a88a352589afa430983",
+      "f1a2400d1cb01c5b0dd7e16c114e92a1eec13019",
       [
-       "webnn/gpu/pad.https.any.html",
+       "webnn/conformance_tests/pad.https.any.html",
        {
         "script_metadata": [
          [
@@ -673733,7 +666198,7 @@
        }
       ],
       [
-       "webnn/gpu/pad.https.any.worker.html",
+       "webnn/conformance_tests/pad.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673758,9 +666223,9 @@
       ]
      ],
      "pooling.https.any.js": [
-      "e174bb5186a87f24fcfeeb28d48406fed38bf732",
+      "400d5ed37de1563261ffe71863e45752ea56f4b7",
       [
-       "webnn/gpu/pooling.https.any.html",
+       "webnn/conformance_tests/pooling.https.any.html",
        {
         "script_metadata": [
          [
@@ -673784,7 +666249,7 @@
        }
       ],
       [
-       "webnn/gpu/pooling.https.any.worker.html",
+       "webnn/conformance_tests/pooling.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673809,9 +666274,9 @@
       ]
      ],
      "prelu.https.any.js": [
-      "5a1580e662ad819739097f9f15cdad51a881505e",
+      "83cc9db4b4dd5f8dfa9b55b845c46205d107a882",
       [
-       "webnn/gpu/prelu.https.any.html",
+       "webnn/conformance_tests/prelu.https.any.html",
        {
         "script_metadata": [
          [
@@ -673835,7 +666300,7 @@
        }
       ],
       [
-       "webnn/gpu/prelu.https.any.worker.html",
+       "webnn/conformance_tests/prelu.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673860,9 +666325,9 @@
       ]
      ],
      "reduction.https.any.js": [
-      "69f9b64df4eeef927fafaf4951a1eb0a9639f416",
+      "30bfb4ba7a8c3c2a102d35b17dc1eda2029cc2e6",
       [
-       "webnn/gpu/reduction.https.any.html",
+       "webnn/conformance_tests/reduction.https.any.html",
        {
         "script_metadata": [
          [
@@ -673886,7 +666351,7 @@
        }
       ],
       [
-       "webnn/gpu/reduction.https.any.worker.html",
+       "webnn/conformance_tests/reduction.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673911,9 +666376,9 @@
       ]
      ],
      "relu.https.any.js": [
-      "dc09846e3b36c4b5aaeab8f2e64de35763bfefc3",
+      "51e427898fe2068bde1649071004a4d3df4f1146",
       [
-       "webnn/gpu/relu.https.any.html",
+       "webnn/conformance_tests/relu.https.any.html",
        {
         "script_metadata": [
          [
@@ -673937,7 +666402,7 @@
        }
       ],
       [
-       "webnn/gpu/relu.https.any.worker.html",
+       "webnn/conformance_tests/relu.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -673962,9 +666427,9 @@
       ]
      ],
      "reshape.https.any.js": [
-      "e5145e2403e1c32ecbfab5caaec66ac2de835dd2",
+      "c0dafb176c41c4d9d6d9dc169fbb834821a8d09e",
       [
-       "webnn/gpu/reshape.https.any.html",
+       "webnn/conformance_tests/reshape.https.any.html",
        {
         "script_metadata": [
          [
@@ -673988,7 +666453,7 @@
        }
       ],
       [
-       "webnn/gpu/reshape.https.any.worker.html",
+       "webnn/conformance_tests/reshape.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674013,9 +666478,9 @@
       ]
      ],
      "sigmoid.https.any.js": [
-      "6c85f5b3037fb33c75b1c38a68296d7fbc7c830d",
+      "186f46891816aa0cff77c1c740861791ff0c9772",
       [
-       "webnn/gpu/sigmoid.https.any.html",
+       "webnn/conformance_tests/sigmoid.https.any.html",
        {
         "script_metadata": [
          [
@@ -674039,7 +666504,7 @@
        }
       ],
       [
-       "webnn/gpu/sigmoid.https.any.worker.html",
+       "webnn/conformance_tests/sigmoid.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674064,9 +666529,9 @@
       ]
      ],
      "slice.https.any.js": [
-      "98e5f422dad504cfe937b21be12a0d108305ae29",
+      "64412045176e0af1b96d7f9bfd646d5cf3a0d8b8",
       [
-       "webnn/gpu/slice.https.any.html",
+       "webnn/conformance_tests/slice.https.any.html",
        {
         "script_metadata": [
          [
@@ -674090,7 +666555,7 @@
        }
       ],
       [
-       "webnn/gpu/slice.https.any.worker.html",
+       "webnn/conformance_tests/slice.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674115,9 +666580,9 @@
       ]
      ],
      "softmax.https.any.js": [
-      "9170dd0e145b5996c4922d355b37810430e71258",
+      "143b7d969fc51ddeecbfd6cdfef173a015e52631",
       [
-       "webnn/gpu/softmax.https.any.html",
+       "webnn/conformance_tests/softmax.https.any.html",
        {
         "script_metadata": [
          [
@@ -674141,7 +666606,7 @@
        }
       ],
       [
-       "webnn/gpu/softmax.https.any.worker.html",
+       "webnn/conformance_tests/softmax.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674166,9 +666631,9 @@
       ]
      ],
      "softplus.https.any.js": [
-      "a61e5beaefdfdbeeeca6b79798c6cf5a335ec0f8",
+      "fcd6410bdb3c875e8309516add453d11f7d05783",
       [
-       "webnn/gpu/softplus.https.any.html",
+       "webnn/conformance_tests/softplus.https.any.html",
        {
         "script_metadata": [
          [
@@ -674192,7 +666657,7 @@
        }
       ],
       [
-       "webnn/gpu/softplus.https.any.worker.html",
+       "webnn/conformance_tests/softplus.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674217,9 +666682,9 @@
       ]
      ],
      "softsign.https.any.js": [
-      "f598cbfcef486581d230a323c66c67cdce792cb7",
+      "6e26afdadee7a7e5cf38fa47eb34675aabab428d",
       [
-       "webnn/gpu/softsign.https.any.html",
+       "webnn/conformance_tests/softsign.https.any.html",
        {
         "script_metadata": [
          [
@@ -674243,7 +666708,7 @@
        }
       ],
       [
-       "webnn/gpu/softsign.https.any.worker.html",
+       "webnn/conformance_tests/softsign.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674268,9 +666733,9 @@
       ]
      ],
      "split.https.any.js": [
-      "8eecd76fa1b58c28d6302932b975273b0d478c9f",
+      "0de6cb4d8df0c214ed0f015b57d1f43524039ef9",
       [
-       "webnn/gpu/split.https.any.html",
+       "webnn/conformance_tests/split.https.any.html",
        {
         "script_metadata": [
          [
@@ -674294,7 +666759,7 @@
        }
       ],
       [
-       "webnn/gpu/split.https.any.worker.html",
+       "webnn/conformance_tests/split.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674319,9 +666784,9 @@
       ]
      ],
      "tanh.https.any.js": [
-      "15a9eeb013c0559102292266c279685369ff1afe",
+      "c5d1f86ab1ccd9af2e5b91d5ca2a3df281a85ba5",
       [
-       "webnn/gpu/tanh.https.any.html",
+       "webnn/conformance_tests/tanh.https.any.html",
        {
         "script_metadata": [
          [
@@ -674345,7 +666810,7 @@
        }
       ],
       [
-       "webnn/gpu/tanh.https.any.worker.html",
+       "webnn/conformance_tests/tanh.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674370,9 +666835,9 @@
       ]
      ],
      "transpose.https.any.js": [
-      "074e18a488372f9534238bd3031fab52d4c62371",
+      "746e53d512ac7f10fa3775082d4f8cf89eea3082",
       [
-       "webnn/gpu/transpose.https.any.html",
+       "webnn/conformance_tests/transpose.https.any.html",
        {
         "script_metadata": [
          [
@@ -674396,7 +666861,7 @@
        }
       ],
       [
-       "webnn/gpu/transpose.https.any.worker.html",
+       "webnn/conformance_tests/transpose.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674421,9 +666886,9 @@
       ]
      ],
      "triangular.https.any.js": [
-      "3b779fabd31ee547a7ce9622b4a2960ae3bb3e3d",
+      "503f310620b9c262d8b7e7186dd9f575f932384d",
       [
-       "webnn/gpu/triangular.https.any.html",
+       "webnn/conformance_tests/triangular.https.any.html",
        {
         "script_metadata": [
          [
@@ -674447,7 +666912,7 @@
        }
       ],
       [
-       "webnn/gpu/triangular.https.any.worker.html",
+       "webnn/conformance_tests/triangular.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674472,9 +666937,9 @@
       ]
      ],
      "where.https.any.js": [
-      "ec0c5530a044b4b44077743eede15f75fea0afe3",
+      "7926221d3aefb7b914202ff4f02fb2746368866a",
       [
-       "webnn/gpu/where.https.any.html",
+       "webnn/conformance_tests/where.https.any.html",
        {
         "script_metadata": [
          [
@@ -674498,7 +666963,7 @@
        }
       ],
       [
-       "webnn/gpu/where.https.any.worker.html",
+       "webnn/conformance_tests/where.https.any.worker.html",
        {
         "script_metadata": [
          [
@@ -674523,108 +666988,6 @@
       ]
      ]
     },
-    "hard_sigmoid.https.any.js": [
-     "81bd5124ce90f09da63b292def464701101e9b15",
-     [
-      "webnn/hard_sigmoid.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API hardSigmoid operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/hard_sigmoid.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API hardSigmoid operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "hard_swish.https.any.js": [
-     "052c7f2a208013ffca4d5c4ddb09404cd69d17d5",
-     [
-      "webnn/hard_swish.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API tanh operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/hard_swish.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API tanh operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
     "idlharness.https.any.js": [
      "93e88294ef1ed0347db722a9c1305aac47fc4129",
      [
@@ -674684,1077 +667047,314 @@
       }
      ]
     ],
-    "instance_normalization.https.any.js": [
-     "0b7a708917f0f65d397d7ac728b3ec59791728c7",
-     [
-      "webnn/instance_normalization.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API instanceNormalization operation"
+    "validation_tests": {
+     "arg_min_max.https.any.js": [
+      "700be83b04a7ac0af0eae6903741ccfcb89b3ba7",
+      [
+       "webnn/validation_tests/arg_min_max.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API argMin/Max operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "global",
-         "window,dedicatedworker"
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/validation_tests/arg_min_max.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API argMin/Max operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
+        "timeout": "long"
+       }
+      ]
      ],
-     [
-      "webnn/instance_normalization.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API instanceNormalization operation"
+     "batch_normalization.https.any.js": [
+      "25b542d34ea66128f2eea496d98124a7efcee209",
+      [
+       "webnn/validation_tests/batch_normalization.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API batchNormalization operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "global",
-         "window,dedicatedworker"
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/validation_tests/batch_normalization.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API batchNormalization operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "layer_normalization.https.any.js": [
-     "380db4ea528f1b9fd13a43b8fe00b788a109c955",
-     [
-      "webnn/layer_normalization.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API layerNormalization operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
+        "timeout": "long"
+       }
+      ]
      ],
-     [
-      "webnn/layer_normalization.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API layerNormalization operation"
+     "elementwise_binary.https.any.js": [
+      "97a1a2b93c9821116df58a38f50e3e5b4fa49c03",
+      [
+       "webnn/validation_tests/elementwise_binary.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API element-wise binary operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "global",
-         "window,dedicatedworker"
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/validation_tests/elementwise_binary.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API element-wise binary operations"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "leaky_relu.https.any.js": [
-     "61539ce92ea8611f0c929e390fb8d06a9259c7c4",
-     [
-      "webnn/leaky_relu.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API leakyRelu operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
+        "timeout": "long"
+       }
+      ]
      ],
-     [
-      "webnn/leaky_relu.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API leakyRelu operation"
+     "layer_normalization.https.any.js": [
+      "7dbcf5c74a71bc63e8b0b12907386f69e0ffa05f",
+      [
+       "webnn/validation_tests/layer_normalization.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "global",
-         "window,dedicatedworker"
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/validation_tests/layer_normalization.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "linear.https.any.js": [
-     "4b2c05540b7fec01a6142af2351204213d436259",
-     [
-      "webnn/linear.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API linear operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
+        "timeout": "long"
+       }
+      ]
      ],
-     [
-      "webnn/linear.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API linear operation"
+     "reduction.https.any.js": [
+      "65b71239b96f503fc1dca4cb6cd59e588f183038",
+      [
+       "webnn/validation_tests/reduction.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API reduction  operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "global",
-         "window,dedicatedworker"
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/validation_tests/reduction.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API reduction  operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "matmul.https.any.js": [
-     "8a9882afe613c68fb1fd948c2310f91eb9cb8009",
-     [
-      "webnn/matmul.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API matmul operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
+        "timeout": "long"
+       }
+      ]
      ],
-     [
-      "webnn/matmul.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API matmul operation"
+     "resample2d.https.any.js": [
+      "2e00cf297cb0720748e24c0b25e0aa9377f6fa6e",
+      [
+       "webnn/validation_tests/resample2d.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API resample2d operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "global",
-         "window,dedicatedworker"
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/validation_tests/resample2d.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "validation tests for WebNN API resample2d operation"
+         ],
+         [
+          "global",
+          "window,dedicatedworker"
+         ],
+         [
+          "script",
+          "../resources/utils_validation.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
         ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
+        "timeout": "long"
+       }
+      ]
      ]
-    ],
-    "pad.https.any.js": [
-     "05eec653c6c64eb3a199be891870bf616cf993ae",
-     [
-      "webnn/pad.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API pad operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/pad.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API pad operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "pooling.https.any.js": [
-     "c34ae2bba2422594ce03bea07dfe57ce794432fd",
-     [
-      "webnn/pooling.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API pooling operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/pooling.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API pooling operations"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "prelu.https.any.js": [
-     "c1b2e9fa2a0afffb60eec2c1445a230bca8030f9",
-     [
-      "webnn/prelu.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API prelu operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/prelu.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API prelu operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "reduction.https.any.js": [
-     "20bd74d8dee84bcf32ccf24362a73a6854cf9462",
-     [
-      "webnn/reduction.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API reduction  operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/reduction.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API reduction  operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "relu.https.any.js": [
-     "42b64e11de0eda64f587cce901861fda8e2b7ce3",
-     [
-      "webnn/relu.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API relu operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/relu.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API relu operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "reshape.https.any.js": [
-     "e0733635f8755bf1a1540e7f225754ab24d66003",
-     [
-      "webnn/reshape.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API reshape operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/reshape.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API reshape operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "sigmoid.https.any.js": [
-     "e904d8dfa7814107f0f2f2707eaebaa600533941",
-     [
-      "webnn/sigmoid.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API sigmoid operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/sigmoid.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API sigmoid operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "slice.https.any.js": [
-     "cb7acefc0539a904d165a12ca5fdd9541206012e",
-     [
-      "webnn/slice.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API slice operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/slice.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API slice operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "softmax.https.any.js": [
-     "8e5342bd75a0d85c671ecf9f7a5fbeadf805822f",
-     [
-      "webnn/softmax.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API softmax operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/softmax.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API softmax operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "softplus.https.any.js": [
-     "7096f64a043a91fba09c91df70114666c8980664",
-     [
-      "webnn/softplus.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API softplus operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/softplus.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API softplus operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "softsign.https.any.js": [
-     "61a7d5365fabca290eaeb400c961a107558e17ed",
-     [
-      "webnn/softsign.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API softsign operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/softsign.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API softsign operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "split.https.any.js": [
-     "b6fc5b4d98d53b05e0a39a10d00e1eef23f6b6ef",
-     [
-      "webnn/split.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API split operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/split.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API split operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "tanh.https.any.js": [
-     "d0d45e754b271d9bed389f3e2958ad1c15e3bf78",
-     [
-      "webnn/tanh.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API tanh operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/tanh.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API tanh operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "transpose.https.any.js": [
-     "63a123342aa3501ababcf14a0c811e7dc040ba4e",
-     [
-      "webnn/transpose.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API transpose operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/transpose.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API transpose operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "triangular.https.any.js": [
-     "1f1af6dcab6b87338c8466685ea6921290dc02cd",
-     [
-      "webnn/triangular.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API triangular operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/triangular.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API triangular operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
-    "where.https.any.js": [
-     "306128a814227550d3ce5de7d650d9d64ba67b60",
-     [
-      "webnn/where.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API where operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "webnn/where.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "title",
-         "test WebNN API where operation"
-        ],
-        [
-         "global",
-         "window,dedicatedworker"
-        ],
-        [
-         "script",
-         "./resources/utils.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ]
+    }
    },
    "webrtc": {
     "RTCCertificate-postMessage.html": [
@@ -676070,7 +667670,7 @@
      ]
     ],
     "RTCPeerConnection-createDataChannel.html": [
-     "cddbd02c7bf22420532b5dc0d5a691660b5f44ec",
+     "373630ff77236668a1e32ed56e7340594d110996",
      [
       null,
       {
@@ -676606,7 +668206,7 @@
      ]
     ],
     "RTCRtpTransceiver-setCodecPreferences.html": [
-     "30a0fa69c52143dc89997c09d7c4d5611d12df51",
+     "8142132a8c32f3a72cb65d07c0dee7cecc3c867b",
      [
       null,
       {}
@@ -689590,7 +681190,38 @@
        ]
       ],
       "close.any.js": [
-       "098caf31c82fa9b702f3e1e260c7f7af09445052",
+       "ad41dc6e2e9fd3fcff4af10da30c548a60d8e880",
+       [
+        "websockets/stream/tentative/close.any.html?default",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
        [
         "websockets/stream/tentative/close.any.html?wpt_flags=h2",
         {
@@ -689609,6 +681240,10 @@
           ],
           [
            "variant",
+           "?default"
+          ],
+          [
+           "variant",
            "?wss"
           ],
           [
@@ -689636,6 +681271,41 @@
           ],
           [
            "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/close.any.serviceworker.html?default",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
            "?wss"
           ],
           [
@@ -689663,6 +681333,10 @@
           ],
           [
            "variant",
+           "?default"
+          ],
+          [
+           "variant",
            "?wss"
           ],
           [
@@ -689690,6 +681364,41 @@
           ],
           [
            "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/close.any.sharedworker.html?default",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
            "?wss"
           ],
           [
@@ -689717,6 +681426,10 @@
           ],
           [
            "variant",
+           "?default"
+          ],
+          [
+           "variant",
            "?wss"
           ],
           [
@@ -689744,6 +681457,41 @@
           ],
           [
            "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/close.any.worker.html?default",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
            "?wss"
           ],
           [
@@ -689771,6 +681519,10 @@
           ],
           [
            "variant",
+           "?default"
+          ],
+          [
+           "variant",
            "?wss"
           ],
           [
@@ -689798,6 +681550,10 @@
           ],
           [
            "variant",
+           "?default"
+          ],
+          [
+           "variant",
            "?wss"
           ],
           [
@@ -690027,6 +681783,381 @@
         }
        ]
       ],
+      "remote-close.any.js": [
+       "b7fd321914a4e6f9bf70d431bca591a7c5460675",
+       [
+        "websockets/stream/tentative/remote-close.any.html?default",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.html?wpt_flags=h2",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.html?wss",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.serviceworker.html?default",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.serviceworker.html?wpt_flags=h2",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.serviceworker.html?wss",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.sharedworker.html?default",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.sharedworker.html?wpt_flags=h2",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.sharedworker.html?wss",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.worker.html?default",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.worker.html?wpt_flags=h2",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ],
+       [
+        "websockets/stream/tentative/remote-close.any.worker.html?wss",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "../../constants.sub.js"
+          ],
+          [
+           "script",
+           "resources/url-constants.js"
+          ],
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "variant",
+           "?default"
+          ],
+          [
+           "variant",
+           "?wss"
+          ],
+          [
+           "variant",
+           "?wpt_flags=h2"
+          ]
+         ]
+        }
+       ]
+      ],
       "websocket-error.any.js": [
        "b114bbb3e3495d2ae4ce0c75454539d4b2fddea7",
        [
@@ -714351,7 +706482,7 @@
        },
        "context_created": {
         "context_created.py": [
-         "e8b7fc5f894c8186c44e8ecdda7210952d8147ce",
+         "d77209842c1a0010b842b02c19180da6a323d827",
          [
           null,
           {}
@@ -715028,14 +707159,21 @@
       "network": {
        "add_intercept": {
         "add_intercept.py": [
-         "7648eb1934fa37d2eaef4ff1ed9be5a2d3859dbc",
+         "c073e1cc3260f08d3b781102dfcdcd54804f60ce",
+         [
+          null,
+          {}
+         ]
+        ],
+        "contexts.py": [
+         "eed4d2044cf92cff736e2d9637123c7a553a7d6f",
          [
           null,
           {}
          ]
         ],
         "invalid.py": [
-         "ac7b2738548425f8aab010e6be9145c2cad8f296",
+         "187fd9890e1236793b80cbdf8a1d69dc6fff7292",
          [
           null,
           {}
@@ -715738,6 +707876,29 @@
        }
       },
       "storage": {
+       "delete_cookies": {
+        "filter.py": [
+         "eff2f00dd320a45db4b3f7b0e99fcacee8a2c19f",
+         [
+          null,
+          {}
+         ]
+        ],
+        "invalid.py": [
+         "ba9c5a5da0ab510473afef3e860eedf71d7676a7",
+         [
+          null,
+          {}
+         ]
+        ],
+        "partition.py": [
+         "0b3726142cbba03602431402cb34fc48a1a8d6f9",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
        "get_cookies": {
         "filter.py": [
          "b244ef86ac24d22c619fcdbc73f32d3edee828cc",
@@ -715747,14 +707908,14 @@
          ]
         ],
         "invalid.py": [
-         "fbd5647f30345387e0d63e4741d2f630f47a4e1c",
+         "93d0da2ac472a7b406138198c70f9264033403ed",
          [
           null,
           {}
          ]
         ],
         "partition.py": [
-         "a1c26503525034614a1861b3512b60144df9f2ca",
+         "fb1755421ece4c9af0b1392c085af8286d17b0fd",
          [
           null,
           {}
@@ -715819,7 +707980,7 @@
          ]
         ],
         "invalid.py": [
-         "53d2573575b645b76c2e101c833e28e87e7d86b4",
+         "9962d303a14672010b56c30bf502dfaf733300d1",
          [
           null,
           {}
@@ -715833,7 +707994,7 @@
          ]
         ],
         "partition.py": [
-         "cb0ace1f4028290b2089857fb8ba9e60aa2acbd6",
+         "9283ee0732912e2a77f51ec25e8cbe413759161a",
          [
           null,
           {}
diff --git a/third_party/blink/web_tests/external/wpt/beacon/headers/header-origin-same-origin-expected.txt b/third_party/blink/web_tests/external/wpt/beacon/headers/header-origin-same-origin-expected.txt
index 65ed3be..0fab810 100644
--- a/third_party/blink/web_tests/external/wpt/beacon/headers/header-origin-same-origin-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/beacon/headers/header-origin-same-origin-expected.txt
@@ -1,7 +1,7 @@
 This is a testharness.js-based test.
-[FAIL] Test origin header http://www1.web-platform.test:8001/beacon/resources/ - GET
+[FAIL] Test origin header http://www1.web-platform.test:8001/beacon/resources/ - without body
   assert_equals: Correct origin header result expected "null" but got "http://web-platform.test:8001"
-[FAIL] Test origin header http://www1.web-platform.test:8001/beacon/resources/ - POST
+[FAIL] Test origin header http://www1.web-platform.test:8001/beacon/resources/ - with body
   assert_equals: Correct origin header result expected "null" but got "http://web-platform.test:8001"
 Harness: the test ran to completion.
 
diff --git a/third_party/blink/web_tests/external/wpt/beacon/headers/header-origin-same-origin.html b/third_party/blink/web_tests/external/wpt/beacon/headers/header-origin-same-origin.html
index 747c6724..7c1bb2c 100644
--- a/third_party/blink/web_tests/external/wpt/beacon/headers/header-origin-same-origin.html
+++ b/third_party/blink/web_tests/external/wpt/beacon/headers/header-origin-same-origin.html
@@ -13,13 +13,13 @@
     <script src="header-referrer.js"></script>
     <script>
       var testBase = RESOURCES_DIR;
-      const usePOST = true;
+      const addBody = true;
       testOriginHeader(testBase, window.location.origin);
-      testOriginHeader(testBase, window.location.origin, usePOST);
+      testOriginHeader(testBase, window.location.origin, addBody);
 
       testBase = get_host_info().HTTP_REMOTE_ORIGIN + RESOURCES_DIR;
       testOriginHeader(testBase, "null");
-      testOriginHeader(testBase, "null", usePOST);
+      testOriginHeader(testBase, "null", addBody);
     </script>
   </body>
 </html>
diff --git a/third_party/blink/web_tests/external/wpt/beacon/headers/header-referrer.js b/third_party/blink/web_tests/external/wpt/beacon/headers/header-referrer.js
index f3038538..1e9d4f6 100644
--- a/third_party/blink/web_tests/external/wpt/beacon/headers/header-referrer.js
+++ b/third_party/blink/web_tests/external/wpt/beacon/headers/header-referrer.js
@@ -18,17 +18,17 @@
   }, "Test referer header " + testBase);
 }
 
-function testOriginHeader(testBase, expectedOrigin, usePOST) {
+function testOriginHeader(testBase, expectedOrigin, addBody) {
   var id = self.token();
   var testUrl = testBase + "inspect-header.py?header=origin&cmd=put&id=" + id;
 
   promise_test(function(test) {
-    const sentBeacon = navigator.sendBeacon(testUrl, usePOST ? "data" : undefined);
+    const sentBeacon = navigator.sendBeacon(testUrl, addBody ? "data" : undefined);
     assert_true(sentBeacon, "SendBeacon Succeeded");
     return pollResult(expectedOrigin, id, "origin") .then(result => {
       assert_equals(result, expectedOrigin, "Correct origin header result");
     });
-  }, "Test origin header " + testBase + (usePOST ? " - POST" : " - GET"));
+  }, "Test origin header " + testBase + (addBody ? " - with body" : " - without body"));
 }
 
 // SendBeacon is an asynchronous and non-blocking request to a web server.
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-001.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-001.xht
deleted file mode 100644
index bd95240..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-001.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 5 digits which is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #00000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #00000;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a <strong>filled green square</strong>.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-002-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-002-ref.xht
deleted file mode 100644
index b469a4c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-002-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-002.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-002.xht
deleted file mode 100644
index f9e7e77..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-002.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with the minimum value, #000000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #000000." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #000000;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-003-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-003-ref.xht
deleted file mode 100644
index ecc99ecb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-003-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/010101_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/010101_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-003.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-003.xht
deleted file mode 100644
index d804cdd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-003.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with the minimum plus one value, #010101</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-003-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #010101." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #010101;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#010101 color swatch" src="support/010101_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-004-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-004-ref.xht
deleted file mode 100644
index f0ae15a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-004-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/999_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/999_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-004.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-004.xht
deleted file mode 100644
index f08f1a4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-004.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a nominal value #999999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-004-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #999999." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #999999;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#999 color swatch" src="support/999_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-005-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-005-ref.xht
deleted file mode 100644
index 388bd8a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-005-ref.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  body {background-color: black;}
-
-  p {color: white;}
-
-  div {margin-top: 10px;}
-
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fefefe_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fefefe_color.png" />
-  </div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-005.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-005.xht
deleted file mode 100644
index 616339f3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-005.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with the maximum minus one value of #fefefe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-005-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #fefefe." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #fefefe;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fefefe color swatch" src="support/fefefe_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-006-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-006-ref.xht
deleted file mode 100644
index 5041fb8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-006-ref.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  body {background-color: black;}
-
-  p {color: white;}
-
-  div {margin-top: 10px;}
-
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fff_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fff_color.png" />
-  </div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-006.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-006.xht
deleted file mode 100644
index 137c5917..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-006.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with the maximum value of #ffffff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-006-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #ffffff." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #ffffff;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fff color swatch" src="support/fff_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-007.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-007.xht
deleted file mode 100644
index 9b0b3e7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-007.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with the maximum plus one value of #1000000 which is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #1000000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #1000000;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a <strong>filled green square</strong>.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-008.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-008.xht
deleted file mode 100644
index ca10f241..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-008.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with the maximum plus one value of #fgfgfg which is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #fgfgfg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #fgfgfg;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a <strong>filled green square</strong>.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-009-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-009-ref.xht
deleted file mode 100644
index e818c26..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-009-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/010000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/010000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-009.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-009.xht
deleted file mode 100644
index 3e61aa6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-009.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a red set to minimum plus one value, #010000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-009-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #010000." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #010000;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#010000 color swatch" src="support/010000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-010-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-010-ref.xht
deleted file mode 100644
index 8dbab725..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-010-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/900_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/900_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-010.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-010.xht
deleted file mode 100644
index 3939ed5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-010.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a red set to a nominal value, #990000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-010-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #990000." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #990000;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#900 color swatch" src="support/900_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-011-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-011-ref.xht
deleted file mode 100644
index 9f4b87f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-011-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fe0000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fe0000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-011.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-011.xht
deleted file mode 100644
index a9362308..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-011.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a red set to maximum minus one value, #fe0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-011-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #fe0000." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #fe0000;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fe0000 color swatch" src="support/fe0000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-012-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-012-ref.xht
deleted file mode 100644
index 59025f3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-012-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/f00_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/f00_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-012.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-012.xht
deleted file mode 100644
index 22979cf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-012.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a red set to the maximum value, #ff0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-012-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #ff0000." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #ff0000;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#f00 color swatch" src="support/f00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-013-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-013-ref.xht
deleted file mode 100644
index 62226da..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-013-ref.xht
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  img {width: 100%;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there is a wide filled green rectangle.</p>
-
-  <div><img src="support/swatch-green.png" height="100" alt="Image download support must be enabled" /></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-013.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-013.xht
deleted file mode 100644
index 454cf14..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-013.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a red set to the maximum plus one value of #fg0000 which is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-013-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #fg0000 is invalid and falls back to the initial value." />
-        <style type="text/css">
-            #test
-            {
-                height: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #fg0000;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a wide filled green rectangle.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-014-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-014-ref.xht
deleted file mode 100644
index cdfa334..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-014-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000100_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000100_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-014.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-014.xht
deleted file mode 100644
index 8fb0710..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-014.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a green set to minimum plus one value, #000100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-014-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #000100." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #000100;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000100_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-015-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-015-ref.xht
deleted file mode 100644
index 150cb97..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-015-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/090_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/090_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-015.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-015.xht
deleted file mode 100644
index db83e5b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-015.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a green set to a nominal value, #009900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-015-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #009900." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #009900;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#090 color swatch" src="support/090_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-016-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-016-ref.xht
deleted file mode 100644
index 60460bd9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-016-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00fe00_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00fe00_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-016.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-016.xht
deleted file mode 100644
index 362219e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-016.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a green set to maximum minus one value, #00fe00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-016-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #00fe00." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #00fe00;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00fe00 color swatch" src="support/00fe00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-017-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-017-ref.xht
deleted file mode 100644
index 3c84188..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-017-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0f0_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0f0_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-017.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-017.xht
deleted file mode 100644
index ea1bace..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-017.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a green set to the maximum value, #00ff00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-017-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #00ff00." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #00ff00;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0f0 color swatch" src="support/0f0_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-018.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-018.xht
deleted file mode 100644
index 150ed162..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-018.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a green set to the maximum plus one value of #00fg00 is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-013-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #00fg00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #00fg00;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a wide filled green rectangle.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-019-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-019-ref.xht
deleted file mode 100644
index 79ac025..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-019-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000001_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000001_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-019.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-019.xht
deleted file mode 100644
index 5a9863aa..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-019.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a blue set to minimum plus one value, #000001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-019-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #000001." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #000001;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000001 color swatch" src="support/000001_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-020-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-020-ref.xht
deleted file mode 100644
index 290b880..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-020-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/009_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/009_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-020.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-020.xht
deleted file mode 100644
index 863be8b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-020.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a blue set to a nominal value, #000099</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-020-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #000099." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #000099;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#009 color swatch" src="support/009_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-021-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-021-ref.xht
deleted file mode 100644
index 2c7402ed..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-021-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0000fe_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0000fe_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-021.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-021.xht
deleted file mode 100644
index 0a7d39c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-021.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a blue set to maximum minus one value, #0000fe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-021-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #0000fe." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #0000fe;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0000fe color swatch" src="support/0000fe_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-022-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-022-ref.xht
deleted file mode 100644
index 307427e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-022-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00f_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00f_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-022.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-022.xht
deleted file mode 100644
index 3fb3f8a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-022.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a blue set to the maximum value, #0000ff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-022-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #0000ff." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #0000ff;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00f color swatch" src="support/00f_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-023.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-023.xht
deleted file mode 100644
index 703421aa..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-023.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 6 digits with a blue set to the maximum plus one value of #0000fg is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-013-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #0000fg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #0000fg;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a wide filled green rectangle.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-024.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-024.xht
deleted file mode 100644
index 8bac3c5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-024.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 2 digits which is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #00;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a <strong>filled green square</strong>.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-025-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-025-ref.xht
deleted file mode 100644
index b469a4c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-025-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-025.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-025.xht
deleted file mode 100644
index 8a4cb82..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-025.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with the minimum possible value #000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-025-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to #000 causes the background of the box to be black." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #000;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-026-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-026-ref.xht
deleted file mode 100644
index 0b2d2856..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-026-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/111_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/111_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-026.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-026.xht
deleted file mode 100644
index 7d4ea13..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-026.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with the minimum plus one value, #111</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-026-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #111." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #111;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#111 color swatch" src="support/111_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-027-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-027-ref.xht
deleted file mode 100644
index f0ae15a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-027-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/999_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/999_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-027.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-027.xht
deleted file mode 100644
index 3aa1c98..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-027.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a nominal value #999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-027-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #999." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #999;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#999 color swatch" src="support/999_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-028-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-028-ref.xht
deleted file mode 100644
index 59a7fa0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-028-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/eee_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/eee_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-028.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-028.xht
deleted file mode 100644
index 1601d98e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-028.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with the maximum minus one value of #eee</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-028-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #eee." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #eee;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#eee color swatch" src="support/eee_color.png" />
-        </div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-029-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-029-ref.xht
deleted file mode 100644
index 5041fb8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-029-ref.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  body {background-color: black;}
-
-  p {color: white;}
-
-  div {margin-top: 10px;}
-
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fff_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fff_color.png" />
-  </div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-029.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-029.xht
deleted file mode 100644
index 122fa11..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-029.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with the maximum value of #fff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-029-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #fff." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #fff;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fff color swatch" src="support/fff_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-030.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-030.xht
deleted file mode 100644
index 050ad814..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-030.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with the maximum plus one value of #1000 which is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-04-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #1000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #1000;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a <strong>filled green square</strong>.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-031.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-031.xht
deleted file mode 100644
index 2f70a072..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-031.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with the maximum plus one value of #ggg which is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #ggg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #ggg;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a <strong>filled green square</strong>.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-032-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-032-ref.xht
deleted file mode 100644
index 366b222..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-032-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/100_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/100_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-032.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-032.xht
deleted file mode 100644
index 5743e2b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-032.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a red set to minimum plus one value, #100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-032-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #100." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #100;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#100 color swatch" src="support/100_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-033-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-033-ref.xht
deleted file mode 100644
index 8dbab725..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-033-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/900_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/900_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-033.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-033.xht
deleted file mode 100644
index e6a1219..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-033.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a red set to a nominal value, #900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-033-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #900." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #900;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#900 color swatch" src="support/900_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-034-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-034-ref.xht
deleted file mode 100644
index 9f135dc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-034-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/e00_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/e00_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-034.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-034.xht
deleted file mode 100644
index 278fcfc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-034.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a red set to maximum minus one value, #e00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-034-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #e00." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #e00;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#e00 color swatch" src="support/e00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-035-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-035-ref.xht
deleted file mode 100644
index 59025f3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-035-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/f00_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/f00_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-035.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-035.xht
deleted file mode 100644
index 0c8afb3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-035.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a red set to the maximum value, #f00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-035-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #f00." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #f00;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#f00 color swatch" src="support/f00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-036.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-036.xht
deleted file mode 100644
index f9cf11a7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-036.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a red set to the maximum plus one value of #g00 is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-013-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #g00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #g00;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a wide filled green rectangle.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-037-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-037-ref.xht
deleted file mode 100644
index 75cf4a2f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-037-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/010_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/010_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-037.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-037.xht
deleted file mode 100644
index 32daca1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-037.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a green set to minimum plus one value, #010</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-037-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to #010." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #010;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#010 color swatch" src="support/010_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-038-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-038-ref.xht
deleted file mode 100644
index 150cb97..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-038-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/090_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/090_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-038.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-038.xht
deleted file mode 100644
index 76d4c9c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-038.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a green set to a nominal value, #090</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-038-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to #090." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #090;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#090 color swatch" src="support/090_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-039-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-039-ref.xht
deleted file mode 100644
index 6d08ab5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-039-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0e0_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0e0_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-039.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-039.xht
deleted file mode 100644
index 944c66c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-039.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a green set to maximum minus one value, #0e0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-039-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to #0e0." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #0e0;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0e0 color swatch" src="support/0e0_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-040-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-040-ref.xht
deleted file mode 100644
index 3c84188..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-040-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0f0_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0f0_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-040.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-040.xht
deleted file mode 100644
index 998e8a8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-040.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a green set to the maximum value, #0f0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-040-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to #0f0." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #0f0;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0f0 color swatch" src="support/0f0_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-041-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-041-ref.xht
deleted file mode 100644
index 389ae58..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-041-ref.xht
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  img {width: 100%;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there is a wide filled orange rectangle.</p>
-
-  <div><img src="support/swatch-orange.png" height="100" alt="Image download support must be enabled" /></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-041.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-041.xht
deleted file mode 100644
index 0ce51cc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-041.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a green set to the maximum plus one value, #0g0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-041-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #0g0 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-            }
-            #wrapper
-            {
-                background-color: orange;
-            }
-            #test
-            {
-                background-color: #0g0;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a wide filled orange rectangle.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-042-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-042-ref.xht
deleted file mode 100644
index 916cd664..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-042-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/001_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/001_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-042.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-042.xht
deleted file mode 100644
index e8b3157..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-042.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a blue set to minimum plus one value, #001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-042-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #001." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #001;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#001 color swatch" src="support/001_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-043-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-043-ref.xht
deleted file mode 100644
index 290b880..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-043-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/009_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/009_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-043.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-043.xht
deleted file mode 100644
index cbc4b003..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-043.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a blue set to a nominal value, #009</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-043-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #009." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #009;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#009 color swatch" src="support/009_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-044-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-044-ref.xht
deleted file mode 100644
index 1435c39..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-044-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00e_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00e_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-044.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-044.xht
deleted file mode 100644
index a115c6d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-044.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a blue set to maximum minus one value, #00e</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-044-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #00e." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #00e;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00e color swatch" src="support/00e_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-045-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-045-ref.xht
deleted file mode 100644
index 307427e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-045-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00f_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00f_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-045.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-045.xht
deleted file mode 100644
index 4b98028..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-045.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a blue set to the maximum value, #00f</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-045-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to #00f." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: #00f;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00f color swatch" src="support/00f_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-046.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-046.xht
deleted file mode 100644
index c32901c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-046.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to hex with 3 digits with a blue set to the maximum plus one value of #00g is invalid</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="Background-color set to #00g falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #wrapper
-            {
-                background-color: green;
-            }
-            #test
-            {
-                background-color: #00g;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a <strong>filled green square</strong>.</p>
-        <div id="wrapper">
-            <div id="test"></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-047.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-047.xht
deleted file mode 100644
index d02be6a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-047.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with the minimum minus one value, rgb(-1%, -1%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(-1%, -1%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(-1%, -1%, -1%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-048.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-048.xht
deleted file mode 100644
index 8b2b528..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-048.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with the minimum value, rgb(0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 0%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-049-020202-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-049-020202-ref.xht
deleted file mode 100644
index 4b37e52..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-049-020202-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/020202_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/020202_color.png" />
-  </div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-049-030303-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-049-030303-ref.xht
deleted file mode 100644
index f5381c0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-049-030303-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/030303_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/030303_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-049.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-049.xht
deleted file mode 100644
index df0b832..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-049.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with the minimum plus one value, rgb(1%, 1%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <!-- This test has 2 reference files to match rounding fractional color values up or down -->
-        <link rel="match" href="background-color-049-020202-ref.xht" />
-        <link rel="match" href="background-color-049-030303-ref.xht" />
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="Background-color is set to rgb(1%, 1%, 1%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                background-color: rgb(1%, 1%, 1%);
-                height: 100px;
-                width: 100px;
-            }
-            #reference
-            {
-                color: rgb(1%, 1%, 1%);
-                font: 100px/1 Ahem;
-                margin-top: 10px;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
-
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-050.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-050.xht
deleted file mode 100644
index b202b35..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-050.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with the minimum value and minus sign, rgb(-0%, -0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(-0%, -0%, -0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(-0%, -0%, -0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-051.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-051.xht
deleted file mode 100644
index 558ec9a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-051.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with the minimum value and plus sign, rgb(+0%, +0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+0%, +0%, +0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+0%, +0%, +0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-052-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-052-ref.xht
deleted file mode 100644
index 1e98cfe..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-052-ref.xht
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div {margin-top: 10px;}
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/666666_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/666666_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-052.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-052.xht
deleted file mode 100644
index f8bc8135..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-052.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with a nominal value, rgb(40%, 40%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-052-ref.xht" />
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="Background-color is set to rgb(40%, 40%, 40%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(40%, 40%, 40%);
-                margin-bottom: 10px;
-            }
-            #reference
-            {
-                color: rgb(40%, 40%, 40%);
-                font: 100px/1 Ahem;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-053.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-053.xht
deleted file mode 100644
index 1ea427b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-053.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with a nominal value and a plus sign, rgb(+40%, +40%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <meta name="flags" content="ahem" />
-        <link rel="match" href="background-color-052-ref.xht" />
-        <meta name="assert" content="Background-color is set to rgb(+40%, +40%, +40%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(+40%, +40%, +40%);
-                margin-bottom: 10px;
-            }
-            #reference
-            {
-                color: rgb(+40%, +40%, +40%);
-                font: 100px/1 Ahem;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-054-fcfcfc-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-054-fcfcfc-ref.xht
deleted file mode 100644
index 60237566..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-054-fcfcfc-ref.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          body
-          {
-            background-color: black;
-            color: white;
-          }
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fcfcfc_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fcfcfc_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-054-fdfdfd-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-054-fdfdfd-ref.xht
deleted file mode 100644
index 58104c7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-054-fdfdfd-ref.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          body
-          {
-            background-color: black;
-            color: white;
-          }
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fdfdfd_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fdfdfd_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-054.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-054.xht
deleted file mode 100644
index 27b1ea4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-054.xht
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with a maximum minus one value, rgb(99%, 99%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <!-- This test has 2 reference files to match rounding fractional color values up or down -->
-        <link rel="match" href="background-color-054-fcfcfc-ref.xht" />
-        <link rel="match" href="background-color-054-fdfdfd-ref.xht" />
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="Background-color is set to rgb(99%, 99%, 99%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            body
-            {
-                background-color: black;
-                color: white;
-            }
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(99%, 99%, 99%);
-            }
-            #reference
-            {
-                color: rgb(99%, 99%, 99%);
-                font: 100px/1 Ahem;
-                margin-top: 10px;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-055.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-055.xht
deleted file mode 100644
index d8a1483..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-055.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with a maximum value, rgb(100%, 100%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-006-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(100%, 100%, 100%)." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fff color swatch" src="support/fff_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-056.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-056.xht
deleted file mode 100644
index 21eccce..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-056.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with plus sign on each maximum value, rgb(+100%, +100%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-006-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+100%, +100%, +100%)." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+100%, +100%, +100%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fff color swatch" src="support/fff_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-057.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-057.xht
deleted file mode 100644
index 5645c50..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-057.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with a maximum plus one value, rgb(101%, 101%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-006-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(101%, 101%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(101%, 101%, 101%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fff color swatch" src="support/fff_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-058.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-058.xht
deleted file mode 100644
index 020f3fd2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-058.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with the minimum minus one value, rgb(-1, -1, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(-1, -1, -1) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(-1, -1, -1);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-059.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-059.xht
deleted file mode 100644
index d40c24d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-059.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with the minimum value, rgb(0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-060.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-060.xht
deleted file mode 100644
index 99d8156e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-060.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with the minimum plus one value, rgb(1, 1, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-003-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(1, 1, 1)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(1, 1, 1);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#010101 color swatch" src="support/010101_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-061.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-061.xht
deleted file mode 100644
index b0a262e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-061.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with the minimum value and minus sign, rgb(-0, -0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(-0, -0, -0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(-0, -0, -0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-062.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-062.xht
deleted file mode 100644
index 17e0cfe6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-062.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with the minimum value and plus sign, rgb(+0, +0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+0, +0, +0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+0, +0, +0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-063-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-063-ref.xht
deleted file mode 100644
index 43cbdd9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-063-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/808080_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/808080_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-063.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-063.xht
deleted file mode 100644
index ac2a142..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-063.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with a nominal value, rgb(128, 128, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-063-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(128, 128, 128)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(128, 128, 128);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#808080 color swatch" src="support/808080_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-064.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-064.xht
deleted file mode 100644
index e5bff1b7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-064.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with a nominal value and a plus sign, rgb(+128, +128, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-063-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+128, +128, +128)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+128, +128, +128);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#808080 color swatch" src="support/808080_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-065.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-065.xht
deleted file mode 100644
index 1211841..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-065.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with a maximum minus one value, rgb(254, 254, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-005-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(254, 254, 254)." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(254, 254, 254);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fefefe color swatch" src="support/fefefe_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-066.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-066.xht
deleted file mode 100644
index a35205fb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-066.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with a maximum value, rgb(255, 255, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-006-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(255, 255, 255)." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(255, 255, 255);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fff color swatch" src="support/fff_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-067.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-067.xht
deleted file mode 100644
index 4f3f9cbc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-067.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with a maximum value and a plus sign, rgb(+255, +255, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-006-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+255, +255, +255)." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+255, +255, +255);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fff color swatch" src="support/fff_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-068.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-068.xht
deleted file mode 100644
index 4408739..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-068.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with a maximum plus one value, rgb(256, 256, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-006-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(256, 256, 256) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(256, 256, 256);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fff color swatch" src="support/fff_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-069.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-069.xht
deleted file mode 100644
index d8c1a59..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-069.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to the minimum minus one value, rgb(-1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(-1%, 0%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(-1%, 0%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-070-020000-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-070-020000-ref.xht
deleted file mode 100644
index b60b3c17..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-070-020000-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/020000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/020000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-070-030000-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-070-030000-ref.xht
deleted file mode 100644
index 97ab0b2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-070-030000-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/030000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/030000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-070.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-070.xht
deleted file mode 100644
index 5982e24..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-070.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to the minimum plus one value, rgb(1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <!-- This test has 2 reference files to match rounding fractional color values up or down -->
-        <link rel="match" href="background-color-070-020000-ref.xht" />
-        <link rel="match" href="background-color-070-030000-ref.xht" />
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="Background-color is set to rgb(1%, 0%, 0%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(1%, 0%, 0%);
-            }
-            #reference
-            {
-                color: rgb(1%, 0%, 0%);
-                font: 100px/1 Ahem;
-                margin-top: 10px;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-071.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-071.xht
deleted file mode 100644
index 2b04f96..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-071.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to the minimum value and minus sign, rgb(-0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(-0%, 0%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(-0%, 0%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-072.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-072.xht
deleted file mode 100644
index b8d56425..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-072.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to the minimum value and plus sign, rgb(+0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+0%, 0%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+0%, 0%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-073-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-073-ref.xht
deleted file mode 100644
index 3c4b5c2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-073-ref.xht
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div {margin-top: 10px;}
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/660000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/660000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-073.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-073.xht
deleted file mode 100644
index 3ccae5540..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-073.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to a nominal value, rgb(40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <meta name="flags" content="ahem" />
-        <link rel="match" href="background-color-073-ref.xht" />
-        <meta name="assert" content="Background-color is set to rgb(40%, 0%, 0%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(40%, 0%, 0%);
-                margin-bottom: 10px;
-            }
-            #reference
-            {
-                color: rgb(40%, 0%, 0%);
-                font: 100px/1 Ahem;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-074.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-074.xht
deleted file mode 100644
index c37912b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-074.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to a nominal value with a plus sign, rgb(+40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <meta name="flags" content="ahem" />
-        <link rel="match" href="background-color-073-ref.xht" />
-        <meta name="assert" content="Background-color is set to rgb(+40%, 0%, 0%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(+40%, 0%, 0%);
-                margin-bottom: 10px;
-            }
-            #reference
-            {
-                color: rgb(+40%, 0%, 0%);
-                font: 100px/1 Ahem;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-075-fc0000-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-075-fc0000-ref.xht
deleted file mode 100644
index 7cfa6f5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-075-fc0000-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fc0000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fc0000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-075-fd0000-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-075-fd0000-ref.xht
deleted file mode 100644
index 77c1d9a5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-075-fd0000-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fd0000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fd0000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-075.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-075.xht
deleted file mode 100644
index 0a1bc87..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-075.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to a maximum minus one value, rgb(99%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <!-- This test has 2 reference files to match rounding fractional color values up or down -->
-        <link rel="match" href="background-color-075-fc0000-ref.xht" />
-        <link rel="match" href="background-color-075-fd0000-ref.xht" />
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="Background-color is set to rgb(99%, 0%, 0%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(99%, 0%, 0%);
-            }
-            #reference
-            {
-                color: rgb(99%, 0%, 0%);
-                font: 100px/1 Ahem;
-                margin-top: 10px;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-076.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-076.xht
deleted file mode 100644
index 0dc3c45..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-076.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to a maximum value, rgb(100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-012-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(100%, 0%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#f00 color swatch" src="support/f00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-077.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-077.xht
deleted file mode 100644
index f5a8449a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-077.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to a maximum value with a plus sign, rgb(+100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-012-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+100%, 0%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+100%, 0%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#f00 color swatch" src="support/f00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-078.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-078.xht
deleted file mode 100644
index 4fd825bd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-078.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with red set to a maximum plus one value, rgb(101%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-012-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color is set to rgb(101%, 0%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(101%, 0%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#f00 color swatch" src="support/f00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-079.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-079.xht
deleted file mode 100644
index 62a6ad7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-079.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to the minimum minus one value, rgb(-1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(-1, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-080.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-080.xht
deleted file mode 100644
index e0a77a7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-080.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to the minimum plus one value, rgb(1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-009-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(1, 0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(1, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#010000 color swatch" src="support/010000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-081.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-081.xht
deleted file mode 100644
index a558636a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-081.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to the minimum value with a minus sign, rgb(-0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(-0, 0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(-0, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-082.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-082.xht
deleted file mode 100644
index 65dccc4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-082.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to the minimum value with a plus sign, rgb(+0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+0, 0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+0, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-083-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-083-ref.xht
deleted file mode 100644
index 05116ff..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-083-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/800000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/800000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-083.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-083.xht
deleted file mode 100644
index 46a0a56..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-083.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to a nominal value, rgb(128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-083-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(128, 0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(128, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#800000 color swatch" src="support/800000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-084.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-084.xht
deleted file mode 100644
index a2568503..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-084.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to a nominal value with a plus sign, rgb(+128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-083-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+128, 0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+128, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#800000 color swatch" src="support/800000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-085.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-085.xht
deleted file mode 100644
index e20926d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-085.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to a maximum minus one value, rgb(254, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-011-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(254, 0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(254, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fe0000 color swatch" src="support/fe0000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-086.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-086.xht
deleted file mode 100644
index 95ed289..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-086.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to a maximum value, rgb(255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-012-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(255, 0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(255, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#f00 color swatch" src="support/f00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-087.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-087.xht
deleted file mode 100644
index 3b732620..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-087.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to a maximum value with a plus sign, rgb(+255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-012-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(+255, 0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(+255, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#f00 color swatch" src="support/f00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-088.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-088.xht
deleted file mode 100644
index 7a4cadf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-088.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with red set to a maximum plus one value, rgb(256, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-012-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(256, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(256, 0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#f00 color swatch" src="support/f00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-089.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-089.xht
deleted file mode 100644
index d21b7fe0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-089.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to the minimum minus one value, rgb(0%, -1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(0%, -1%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, -1%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-090-000200-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-090-000200-ref.xht
deleted file mode 100644
index 1e43bfa..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-090-000200-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000200_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000200_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-090-000300-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-090-000300-ref.xht
deleted file mode 100644
index 6a072d9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-090-000300-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000300_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000300_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-090.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-090.xht
deleted file mode 100644
index 59f63dd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-090.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to the minimum plus one value, rgb(0%, 1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <!-- This test has 2 reference files to match rounding fractional color values up or down -->
-        <link rel="match" href="background-color-090-000200-ref.xht" />
-        <link rel="match" href="background-color-090-000300-ref.xht" />
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 1%, 0%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(0%, 1%, 0%);
-            }
-            #reference
-            {
-                color: rgb(0%, 1%, 0%);
-                font: 100px/1 Ahem;
-                margin-top: 10px;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-091.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-091.xht
deleted file mode 100644
index 2d6ce46..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-091.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to the minimum value and minus sign, rgb(0%, -0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, -0%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, -0%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-092.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-092.xht
deleted file mode 100644
index 5c9a4e0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-092.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to the minimum value and plus sign, rgb(0%, +0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, +0%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, +0%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-093-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-093-ref.xht
deleted file mode 100644
index 280c4e54..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-093-ref.xht
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/>
-    <meta name="flags" content="image"/>
-    <style type="text/css"><![CDATA[
-    div {margin-top: 10px;}
-
-    img
-    {
-    height: 100px;
-    vertical-align: top;
-    width: 100px;
-    }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/006600_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/006600_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-093.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-093.xht
deleted file mode 100644
index dae3822c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-093.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to a nominal value, rgb(0%, 40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <meta name="flags" content="ahem" />
-        <link rel="match" href="background-color-093-ref.xht" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 40%, 0%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(0%, 40%, 0%);
-                margin-bottom: 10px;
-            }
-            #reference
-            {
-                color: rgb(0%, 40%, 0%);
-                font: 100px/1 Ahem;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-094.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-094.xht
deleted file mode 100644
index a5b31906..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-094.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to a nominal value with a plus sign, rgb(0%, +40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <meta name="flags" content="ahem" />
-        <link rel="match" href="background-color-093-ref.xht" />
-        <meta name="assert" content="Background-color is set to rgb(0%, +40%, 0%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(0%, +40%, 0%);
-                margin-bottom: 10px;
-            }
-            #reference
-            {
-                color: rgb(0%, +40%, 0%);
-                font: 100px/1 Ahem;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-095-00fc00-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-095-00fc00-ref.xht
deleted file mode 100644
index d1d9355d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-095-00fc00-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00fc00_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00fc00_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-095-00fd00-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-095-00fd00-ref.xht
deleted file mode 100644
index e5dec694c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-095-00fd00-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00fd00_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/00fd00_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-095.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-095.xht
deleted file mode 100644
index ad19592..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-095.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to a maximum minus one value, rgb(0%, 99%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <!-- This test has 2 reference files to match rounding fractional color values up or down -->
-        <link rel="match" href="background-color-095-00fc00-ref.xht" />
-        <link rel="match" href="background-color-095-00fd00-ref.xht" />
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 99%, 0%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(0%, 99%, 0%);
-            }
-            #reference
-            {
-                color: rgb(0%, 99%, 0%);
-                font: 100px/1 Ahem;
-                margin-top: 10px;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-096.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-096.xht
deleted file mode 100644
index baa9de1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-096.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to a maximum value, rgb(0%, 100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-017-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 100%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0f0 color swatch" src="support/0f0_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-097.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-097.xht
deleted file mode 100644
index 37d949a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-097.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to a maximum value with a plus sign, rgb(0%, +100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-017-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, +100%, 0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, +100%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0f0 color swatch" src="support/0f0_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-098.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-098.xht
deleted file mode 100644
index 7a258fa..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-098.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with green set to a maximum plus one value, rgb(0%, 101%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-017-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(0%, 101%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, 101%, 0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0f0 color swatch" src="support/0f0_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-099.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-099.xht
deleted file mode 100644
index c13af740..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-099.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to the minimum minus one value, rgb(0, -1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, -1, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-100.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-100.xht
deleted file mode 100644
index 86544845..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-100.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to the minimum plus one value, rgb(0, 1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-014-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to rgb(0, 1, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 1, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000100_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-101.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-101.xht
deleted file mode 100644
index 7bb78ce..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-101.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to the minimum value with a minus sign, rgb(0, -0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, -0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, -0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-102.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-102.xht
deleted file mode 100644
index 3ae1433..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-102.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to the minimum value with a plus sign, rgb(0, +0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, +0, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, +0, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-103-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-103-ref.xht
deleted file mode 100644
index 934fcd6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-103-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/008000_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/008000_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-103.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-103.xht
deleted file mode 100644
index 9330608..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-103.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to a nominal value, rgb(0, 128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-103-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 128, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 128, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#008000 color swatch" src="support/008000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-104.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-104.xht
deleted file mode 100644
index 049f2bb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-104.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to a nominal value with a plus sign, rgb(0, +128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-103-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, +128, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, +128, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#008000 color swatch" src="support/008000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-105.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-105.xht
deleted file mode 100644
index f684792..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-105.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to a maximum minus one value, rgb(0, 254, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-016-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 254, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 254, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00fe00 color swatch" src="support/00fe00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-106.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-106.xht
deleted file mode 100644
index 9bcabb3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-106.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to a maximum value, rgb(0, 255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-017-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 255, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 255, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0f0 color swatch" src="support/0f0_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-107.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-107.xht
deleted file mode 100644
index b690bfd4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-107.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to a maximum value with a plus sign, rgb(0, +255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-017-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, +255, 0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, +255, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0f0 color swatch" src="support/0f0_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-108.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-108.xht
deleted file mode 100644
index 14f2e56..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-108.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with green set to a maximum plus one value, rgb(0, 256 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-017-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(0, 256, 0) properly truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 256, 0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0f0 color swatch" src="support/0f0_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-109.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-109.xht
deleted file mode 100644
index 224c8285..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-109.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to the minimum minus one value, rgb(0%, 0%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(0%, 0%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, 0%, -1%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-110-000002-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-110-000002-ref.xht
deleted file mode 100644
index ce7525c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-110-000002-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000002_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000002_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-110-000003-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-110-000003-ref.xht
deleted file mode 100644
index b6e2f8a8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-110-000003-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000003_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000003_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-110.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-110.xht
deleted file mode 100644
index 1c298ccc9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-110.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to the minimum plus one value, rgb(0%, 0%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <!-- This test has 2 reference files to match rounding fractional color values up or down -->
-        <link rel="match" href="background-color-110-000002-ref.xht" />
-        <link rel="match" href="background-color-110-000003-ref.xht" />
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 0%, 1%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(0%, 0%, 1%);
-            }
-            #reference
-            {
-                color: rgb(0%, 0%, 1%);
-                font: 100px/1 Ahem;
-                margin-top: 10px;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-111.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-111.xht
deleted file mode 100644
index b1c1d4a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-111.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to the minimum value and minus sign, rgb(0%, 0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 0%, -0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, 0%, -0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-112.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-112.xht
deleted file mode 100644
index 094c0dbc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-112.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to the minimum value and plus sign, rgb(0%, 0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 0%, +0%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, 0%, +0%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-113-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-113-ref.xht
deleted file mode 100644
index 120857b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-113-ref.xht
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div {margin-top: 10px;}
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000066_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000066_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-113.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-113.xht
deleted file mode 100644
index b8245d5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-113.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to a nominal value, rgb(0%, 0%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <meta name="flags" content="ahem" />
-        <link rel="match" href="background-color-113-ref.xht" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 0%, 40%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(0%, 0%, 40%);
-                margin-bottom: 10px;
-            }
-            #reference
-            {
-                color: rgb(0%, 0%, 40%);
-                font: 100px/1 Ahem;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-114.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-114.xht
deleted file mode 100644
index cd27c6e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-114.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to a nominal value with a plus sign, rgb(0%, 0%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <meta name="flags" content="ahem" />
-        <link rel="match" href="background-color-113-ref.xht" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 0%, +40%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(0%, 0%, +40%);
-                margin-bottom: 10px;
-            }
-            #reference
-            {
-                color: rgb(0%, 0%, +40%);
-                font: 100px/1 Ahem;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-115-0000fc-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-115-0000fc-ref.xht
deleted file mode 100644
index 55590fc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-115-0000fc-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0000fc_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0000fc_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-115-0000fd-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-115-0000fd-ref.xht
deleted file mode 100644
index 83a5e96e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-115-0000fd-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-    <style type="text/css"><![CDATA[
-          div
-          {
-          margin-top: 10px;
-          }
-          img
-          {
-          height: 100px;
-          vertical-align: top;
-          width: 100px;
-          }
-    ]]></style>
-</head>
-<body>
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0000fd_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/0000fd_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-115.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-115.xht
deleted file mode 100644
index 25903e5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-115.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to a maximum minus one value, rgb(0%, 0%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <!-- This test has 2 reference files to match rounding fractional color values up or down -->
-        <link rel="match" href="background-color-115-0000fc-ref.xht" />
-        <link rel="match" href="background-color-115-0000fd-ref.xht" />
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 0%, 99%)." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css"><![CDATA[
-            #test
-            {
-                height: 100px;
-                width: 100px;
-                background-color: rgb(0%, 0%, 99%);
-            }
-            #reference
-            {
-                color: rgb(0%, 0%, 99%);
-                font: 100px/1 Ahem;
-                margin-top: 10px;
-            }
-        ]]></style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">X</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-116.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-116.xht
deleted file mode 100644
index db69014..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-116.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to a maximum value, rgb(0%, 0%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-022-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 0%, 100%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00f color swatch" src="support/00f_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-117.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-117.xht
deleted file mode 100644
index 75b7f5b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-117.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to a maximum value with a plus sign, rgb(0%, 0%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-022-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0%, 0%, +100%)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, 0%, +100%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00f color swatch" src="support/00f_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-118.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-118.xht
deleted file mode 100644
index f97e581..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-118.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using percentages with blue set to a maximum plus one value, rgb(0%, 0%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-022-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(0%, 0%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0%, 0%, 101%);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00f color swatch" src="support/00f_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-119.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-119.xht
deleted file mode 100644
index f70540f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-119.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to the minimum minus one value, rgb(0, 0, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(0, 0, -1) truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, -1);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-120.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-120.xht
deleted file mode 100644
index f220efe..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-120.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to the minimum plus one value, rgb(0, 0, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-019-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 0, 1)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, 1);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000001 color swatch" src="support/000001_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-121.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-121.xht
deleted file mode 100644
index 0ef996e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-121.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to the minimum value with a minus sign, rgb(0, 0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 0, -0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, -0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-122.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-122.xht
deleted file mode 100644
index a244421..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-122.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to the minimum value with a plus sign, rgb(0, 0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 0, +0)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, +0);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-123-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-123-ref.xht
deleted file mode 100644
index 68617d2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-123-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000080_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/000080_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-123.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-123.xht
deleted file mode 100644
index c8a7dd9c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-123.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to a nominal value, rgb(0, 0, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-123-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 0, 128)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, 128);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000080 color swatch" src="support/000080_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-124.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-124.xht
deleted file mode 100644
index 896f2eb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-124.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to a nominal value with a plus sign, rgb(0, 0, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-123-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 0, +128)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, +128);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000080 color swatch" src="support/000080_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-125.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-125.xht
deleted file mode 100644
index 8630cfe..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-125.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to a maximum minus one value, rgb(0, 0, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-021-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 0, 254)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, 254);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#0000fe color swatch" src="support/0000fe_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-126.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-126.xht
deleted file mode 100644
index 4a86576..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-126.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to a maximum value, rgb(0, 0, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-022-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 0, 255)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, 255);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00f color swatch" src="support/00f_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-127.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-127.xht
deleted file mode 100644
index 98bc089..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-127.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to a maximum value with a plus sign, rgb(0, 0, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-022-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color is set to rgb(0, 0, +255)." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, +255);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00f color swatch" src="support/00f_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-128.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-128.xht
deleted file mode 100644
index b6733631..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-128.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to rgb() using integers with blue set to a maximum plus one value, rgb(0, 0, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-022-ref.xht" />
-
-        <meta name="flags" content="image invalid" />
-        <meta name="assert" content="Background-color set to rgb(0, 0, 256) properly truncates to a valid value." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: rgb(0, 0, 256);
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00f color swatch" src="support/00f_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-130.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-130.xht
deleted file mode 100644
index 7373a3f8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-130.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to black</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-002-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to black causes the background-color of the box to be black." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: black;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000 color swatch" src="support/000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-131.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-131.xht
deleted file mode 100644
index 942862b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-131.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to blue</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-022-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to blue causes the background-color of the box to be blue." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: blue;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#00f color swatch" src="support/00f_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-132-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-132-ref.xht
deleted file mode 100644
index 9d6a313..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-132-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fuchsia_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/fuchsia_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-132.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-132.xht
deleted file mode 100644
index 898cc69..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-132.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to fuchsia</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-132-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to fuchsia causes the background-color of the box to be fuchsia." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: fuchsia;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="fuchsia color swatch" src="support/fuchsia_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-133.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-133.xht
deleted file mode 100644
index 06552a6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-133.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to gray</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-063-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to gray causes the background-color of the box to be gray." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: gray;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#808080 color swatch" src="support/808080_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-134.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-134.xht
deleted file mode 100644
index 08511a73..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-134.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to green</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-103-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to green causes the background of the box to be green." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: green;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#008000 color swatch" src="support/008000_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-135-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-135-ref.xht
deleted file mode 100644
index aa547b0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-135-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/swatch-lime.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/swatch-lime.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-135.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-135.xht
deleted file mode 100644
index 64a92f90..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-135.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to lime</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-135-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to lime causes the background-color of the box to be lime." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: lime;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="lime color swatch" src="support/swatch-lime.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-136-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-136-ref.xht
deleted file mode 100644
index c3382a7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-136-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/maroon_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/maroon_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-136.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-136.xht
deleted file mode 100644
index a9aed04..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-136.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to maroon</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-136-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to maroon causes the background-color of the box to be maroon." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: maroon;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="maroon color swatch" src="support/maroon_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-137.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-137.xht
deleted file mode 100644
index a965f8c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-137.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to navy</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-123-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to navy causes the background-color of the box to be navy." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: navy;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#000080 color swatch" src="support/000080_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-138-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-138-ref.xht
deleted file mode 100644
index 8323754..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-138-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/olive_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/olive_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-138.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-138.xht
deleted file mode 100644
index e438b2ee..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-138.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to olive</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-138-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to olive causes the background-color of the box to be olive." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: olive;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="olive color swatch" src="support/olive_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-139-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-139-ref.xht
deleted file mode 100644
index 5877378..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-139-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/orange15x15.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/orange15x15.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-139.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-139.xht
deleted file mode 100644
index 28f21ae..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-139.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to orange</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-139-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to orange causes the background-color of the box to be orange." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: orange;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div>
-            <img alt="orange color swatch" src="support/orange15x15.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-140-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-140-ref.xht
deleted file mode 100644
index 056f8e4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-140-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/purple_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/purple_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-140.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-140.xht
deleted file mode 100644
index 40dd3502..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-140.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to purple</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-140-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to purple causes the background-color of the box to be purple." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: purple;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="purple color swatch" src="support/purple_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-141.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-141.xht
deleted file mode 100644
index b393f22b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-141.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to red</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-012-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to red causes the background-color of the box to be red." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: red;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#f00 color swatch" src="support/f00_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-142-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-142-ref.xht
deleted file mode 100644
index 3f7ffb2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-142-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/silver_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/silver_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-142.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-142.xht
deleted file mode 100644
index db2aaa46..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-142.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to silver</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-142-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to silver causes the background-color of the box to be silver." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: silver;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="silver color swatch" src="support/silver_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-143-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-143-ref.xht
deleted file mode 100644
index 70c54ff..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-143-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/teal_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/teal_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-143.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-143.xht
deleted file mode 100644
index b0c0e2e1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-143.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to teal</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-143-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to teal causes the background-color of the box to be teal." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: teal;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="teal color swatch" src="support/teal_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-144.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-144.xht
deleted file mode 100644
index f1668fd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-144.xht
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to white</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-006-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to white causes the background-color of the box to be white." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: white;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="#fff color swatch" src="support/fff_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-145-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-145-ref.xht
deleted file mode 100644
index 1d05b5f07..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-145-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div {margin-top: 10px;}
-  img
-  {
-  height: 100px;
-  vertical-align: top;
-  width: 100px;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/yellow_color.png" />
-  </div>
-
-  <div>
-    <img alt="Image download support must be enabled" src="support/yellow_color.png" />
-  </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-145.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-145.xht
deleted file mode 100644
index 3afa2192..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/backgrounds/background-color-145.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Background-color set to yellow</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-04-08 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#propdef-background-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties" />
-        <link rel="match" href="background-color-145-ref.xht" />
-
-        <meta name="flags" content="image" />
-        <meta name="assert" content="Background-color set to yellow causes the background-color of the box to be yellow." />
-        <style type="text/css">
-            img, #test
-            {
-                height: 100px;
-                width: 100px;
-            }
-            #test
-            {
-                background-color: yellow;
-                margin-bottom: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there are 2 squares with the <strong>same color</strong>.</p>
-        <div id="test"></div>
-        <div id="reference">
-            <img alt="yellow color swatch" src="support/yellow_color.png" />
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-001-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-001-ref.xht
deleted file mode 100644
index 7c5bdccd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-001-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-001.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-001.xht
deleted file mode 100644
index 5214c33..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-001.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with five digits which is invalid and is equivalent to minimum minus one value for six digit hex</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #00000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #00000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-002.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-002.xht
deleted file mode 100644
index c52d2ae..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-002.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with the minimum value, #000000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #000000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #000000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-003-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-003-ref.xht
deleted file mode 100644
index b2b5131..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-003-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/010101_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-003.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-003.xht
deleted file mode 100644
index 48b0324..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-003.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with the minimum plus one value, #010101</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-003-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #010101 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #010101;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #010101;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-004-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-004-ref.xht
deleted file mode 100644
index aa79500..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-004-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/999_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-004.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-004.xht
deleted file mode 100644
index 60d1e4cb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-004.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a nominal value #999999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-004-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #999999 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #999999;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #999999;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-005-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-005-ref.xht
deleted file mode 100644
index eb79eb1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-005-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  body {background-color: black;}
-
-  p {color: white;}
-
-  div
-  {
-  background: url("support/fefefe_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-005.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-005.xht
deleted file mode 100644
index c7310c0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-005.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with the maximum minus one value of #fefefe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-005-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #fefefe renders the correct color for the border." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #fefefe;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #fefefe;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-006-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-006-ref.xht
deleted file mode 100644
index 9ef8020..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-006-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  body {background-color: black;}
-
-  p {color: white;}
-
-  div
-  {
-  background: url("support/fff_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-006.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-006.xht
deleted file mode 100644
index fbd7527..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-006.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with the maximum value of #ffffff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #ffffff renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #ffffff;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #ffffff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-007.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-007.xht
deleted file mode 100644
index d9ae994c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-007.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with the maximum plus one value of #1000000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #1000000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #1000000;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-008.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-008.xht
deleted file mode 100644
index 0f5105d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-008.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with the maximum plus one value of #fgfgfg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #fgfgfg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #fgfgfg;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-009-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-009-ref.xht
deleted file mode 100644
index e5076a43..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-009-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/010000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-009.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-009.xht
deleted file mode 100644
index 461e6e2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-009.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a red set to minimum plus one value, #010000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-009-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #010000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #010000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #010000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-010-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-010-ref.xht
deleted file mode 100644
index 92ea2c16..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-010-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background-color: #990000;
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-010.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-010.xht
deleted file mode 100644
index 990f57bc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-010.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a red set to a nominal value, #990000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-010-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #990000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #990000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #990000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-011-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-011-ref.xht
deleted file mode 100644
index 1c97de1f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-011-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/fe0000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-011.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-011.xht
deleted file mode 100644
index 94ee90e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-011.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a red set to maximum minus one value, #fe0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-011-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #fe0000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #fe0000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #fe0000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-012-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-012-ref.xht
deleted file mode 100644
index ea9e7c3b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-012-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/f00_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-012.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-012.xht
deleted file mode 100644
index fddac396..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-012.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a red set to the maximum value, #ff0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #ff0000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #ff0000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #ff0000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-013.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-013.xht
deleted file mode 100644
index 455b89d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-013.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a red set to the maximum plus one value, #fg0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #fg0000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #fg0000;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-014-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-014-ref.xht
deleted file mode 100644
index d308289..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-014-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/000100_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-014.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-014.xht
deleted file mode 100644
index fc00268..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-014.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a green set to minimum plus one value, #000100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-014-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #000100 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #000100;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000100;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-015-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-015-ref.xht
deleted file mode 100644
index b04da237..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-015-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/090_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-015.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-015.xht
deleted file mode 100644
index 8bc3c80d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-015.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a green set to a nominal value, #009900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-015-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #009900 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #009900;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #009900;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-016-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-016-ref.xht
deleted file mode 100644
index 538f905..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-016-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/00fe00_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-016.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-016.xht
deleted file mode 100644
index 40d3b774..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-016.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a green set to maximum minus one value, #00fe00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-016-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #00fe00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #00fe00;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #00fe00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-017-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-017-ref.xht
deleted file mode 100644
index cf69126..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-017-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/0f0_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-017.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-017.xht
deleted file mode 100644
index cbfaee79..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-017.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a green set to the maximum value, #00ff00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #00ff00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #00ff00;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #00ff00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-018.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-018.xht
deleted file mode 100644
index ecaea1c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-018.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a green set to the maximum plus one value, #00fg00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #00fg00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #00fg00;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-019-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-019-ref.xht
deleted file mode 100644
index 322c6fc05..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-019-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/000001_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-019.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-019.xht
deleted file mode 100644
index 267ed53..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-019.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a blue set to minimum plus one value, #000001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-019-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #000001 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #000001;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000001;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-020-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-020-ref.xht
deleted file mode 100644
index 833ec72a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-020-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/009_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-020.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-020.xht
deleted file mode 100644
index fb8cfb2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-020.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a blue set to a nominal value, #000099</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-020-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #000099 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #000099;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000099;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-021-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-021-ref.xht
deleted file mode 100644
index 4ea1431..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-021-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/0000fe_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-021.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-021.xht
deleted file mode 100644
index c84d76f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-021.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a blue set to maximum minus one value, #0000fe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-021-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #0000fe renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #0000fe;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #0000fe;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-022-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-022-ref.xht
deleted file mode 100644
index d99e3eaf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-022-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/00f_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-022.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-022.xht
deleted file mode 100644
index 0090dde..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-022.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a blue set to the maximum value, #0000ff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #0000ff renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #0000ff;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #0000ff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-023.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-023.xht
deleted file mode 100644
index d10a277..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-023.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with six digits with a blue set to the maximum plus one value, #0000fg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #0000fg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #0000fg;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-024.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-024.xht
deleted file mode 100644
index 6cd9518..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-024.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with 2 digits which is invalid and is equivalent to minimum minus one value for 3 digit hex</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #00;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-025.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-025.xht
deleted file mode 100644
index 4c5b3d1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-025.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with the minimum possible value #000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-026-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-026-ref.xht
deleted file mode 100644
index 79cf8fd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-026-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/111_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-026.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-026.xht
deleted file mode 100644
index 0e539bb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-026.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with the minimum plus one value, #111</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-026-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #111 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #111;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #111;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-027-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-027-ref.xht
deleted file mode 100644
index aa79500..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-027-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/999_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-027.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-027.xht
deleted file mode 100644
index f1a65812..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-027.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a nominal value #999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-027-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #999 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #999;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #999;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-028-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-028-ref.xht
deleted file mode 100644
index dad179e9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-028-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/eee_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-028.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-028.xht
deleted file mode 100644
index c25c89a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-028.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with the maximum minus one value of #eee</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-028-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #eee renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #eee;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #eee;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-029.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-029.xht
deleted file mode 100644
index 623072dc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-029.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with the maximum value of #fff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #fff renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #fff;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #fff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-030.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-030.xht
deleted file mode 100644
index abf930e3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-030.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with the maximum plus one value of #1000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-transparent-or-black-square-black.xht"/>
-        <link rel="match" href="../reference/ref-transparent-or-black-square-transparent.xht"/>
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #1000 is a transparent dark red square." />
-        <style type="text/css">
-            div.test
-            {
-                border: 5px solid blue;
-                height: 1in;
-                width: 1in;
-            }
-            div.test div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #1000;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black or transparent square surrounded by a blue border.</p>
-        <div class="test"><div></div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-031.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-031.xht
deleted file mode 100644
index 60f3123..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-031.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with the maximum plus one value of #ggg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #ggg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #ggg;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-032-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-032-ref.xht
deleted file mode 100644
index d5f9edb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-032-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/100_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-032.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-032.xht
deleted file mode 100644
index a14a91b2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-032.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a red set to minimum plus one value, #100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-032-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #100 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #100;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #100;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-033.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-033.xht
deleted file mode 100644
index 0eeaae83..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-033.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a red set to a nominal value, #900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-010-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #900 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #900;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #900;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-034-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-034-ref.xht
deleted file mode 100644
index 2993969..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-034-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/e00_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-034.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-034.xht
deleted file mode 100644
index 41ed5b42..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-034.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a red set to maximum minus one value, #e00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-034-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #e00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #e00;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #e00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-035.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-035.xht
deleted file mode 100644
index 43c7d2f0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-035.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a red set to the maximum value, #f00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #f00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #f00;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #f00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-036.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-036.xht
deleted file mode 100644
index 5bb1979c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-036.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a red set to the maximum plus one value, #g00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #g00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #g00;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-037-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-037-ref.xht
deleted file mode 100644
index f89e162..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-037-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/010_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-037.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-037.xht
deleted file mode 100644
index aaa0547..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-037.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a green set to minimum plus one value, #010</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-037-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #010 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #010;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #010;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-038-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-038-ref.xht
deleted file mode 100644
index b04da237..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-038-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/090_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-038.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-038.xht
deleted file mode 100644
index df795d75..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-038.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a green set to a nominal value, #090</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-038-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #090 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #090;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #090;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-039-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-039-ref.xht
deleted file mode 100644
index 192db0e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-039-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/0e0_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-039.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-039.xht
deleted file mode 100644
index e454a36..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-039.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a green set to maximum minus one value, #0e0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-039-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #0e0 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #0e0;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #0e0;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-040.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-040.xht
deleted file mode 100644
index 9343aaa..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-040.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a green set to the maximum value, #0f0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #0f0 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #0f0;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #0f0;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-041.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-041.xht
deleted file mode 100644
index 2c0b7da..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-041.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a green set to the maximum plus one value, #0g0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #0g0 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #0g0;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-042-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-042-ref.xht
deleted file mode 100644
index 11bffd7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-042-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/001_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-042.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-042.xht
deleted file mode 100644
index 0ac99a1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-042.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a blue set to minimum plus one value, #001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-042-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #001 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #001;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #001;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-043.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-043.xht
deleted file mode 100644
index 09205f4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-043.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a blue set to a nominal value, #009</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-020-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #009 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #009;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #009;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-044-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-044-ref.xht
deleted file mode 100644
index 3d27161..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-044-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/00e_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-044.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-044.xht
deleted file mode 100644
index 4e847ed..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-044.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a blue set to maximum minus one value, #00e</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-044-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #00e renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #00e;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #00e;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-045.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-045.xht
deleted file mode 100644
index b6f39cc5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-045.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a blue set to the maximum value, #00f</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to #00f renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #00f;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #00f;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-046.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-046.xht
deleted file mode 100644
index 81ff35d9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-046.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to hex with three digits with a blue set to the maximum plus one value, #00g</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to #00g falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: #00g;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-047.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-047.xht
deleted file mode 100644
index 080709f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-047.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with the minimum minus one value, rgb(-1%, -1%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(-1%, -1%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(-1%, -1%, -1%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-048.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-048.xht
deleted file mode 100644
index 800d3761..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-048.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with the minimum value, rgb(0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-049-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-049-ref.xht
deleted file mode 100644
index 344ce16..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-049-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(1%, 1%, 1%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-049.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-049.xht
deleted file mode 100644
index 0b2e262..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-049.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with the minimum plus one value, rgb(1%, 1%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-049-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(1%, 1%, 1%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(1%, 1%, 1%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(1%, 1%, 1%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-050.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-050.xht
deleted file mode 100644
index d70f8b5f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-050.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with the minimum value and minus sign, rgb(-0%, -0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(-0%, -0%, -0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(-0%, -0%, -0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-051.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-051.xht
deleted file mode 100644
index 70a6c63..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-051.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with the minimum value and plus sign, rgb(+0%, +0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+0%, +0%, +0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+0%, +0%, +0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-052-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-052-ref.xht
deleted file mode 100644
index 8096f85a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-052-ref.xht
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-052.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-052.xht
deleted file mode 100644
index a90c57a4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-052.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with a nominal value, rgb(40%, 40%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-052-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(40%, 40%, 40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(40%, 40%, 40%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-053.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-053.xht
deleted file mode 100644
index cfc23e2c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-053.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with a nominal value and a plus sign, rgb(+40%, +40%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-052-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+40%, +40%, +40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+40%, +40%, +40%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-054-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-054-ref.xht
deleted file mode 100644
index 9d1c01f6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-054-ref.xht
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(99%, 99%, 99%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-054.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-054.xht
deleted file mode 100644
index 7366be4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-054.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with a maximum minus one value, rgb(99%, 99%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-054-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(99%, 99%, 99%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(99%, 99%, 99%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(99%, 99%, 99%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-055.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-055.xht
deleted file mode 100644
index 8be065df..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-055.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with a maximum value, rgb(100%, 100%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(100%, 100%, 100%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(100%, 100%, 100%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-056.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-056.xht
deleted file mode 100644
index df3d7b4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-056.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with plus sign on each maximum value, rgb(+100%, +100%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+100%, +100%, +100%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+100%, +100%, +100%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-057.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-057.xht
deleted file mode 100644
index 5e36267..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-057.xht
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with a maximum plus one value, rgb(101%, 101%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(101%, 101%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(101%, 101%, 101%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-058.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-058.xht
deleted file mode 100644
index 79ee656..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-058.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with the minimum minus one value, rgb(-1, -1, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(-1, -1, -1) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(-1, -1, -1);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-059.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-059.xht
deleted file mode 100644
index d860b0bd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-059.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with the minimum value, rgb(0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-060.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-060.xht
deleted file mode 100644
index 2a7f414..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-060.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with the minimum plus one value, rgb(1, 1, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-003-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(1, 1, 1) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(1, 1, 1);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(1, 1, 1);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-061.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-061.xht
deleted file mode 100644
index 97a0001a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-061.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with the minimum value and minus sign, rgb(-0, -0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(-0, -0, -0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(-0, -0, -0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-062.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-062.xht
deleted file mode 100644
index 9b9eca3d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-062.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with the minimum value and plus sign, rgb(+0, +0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+0, +0, +0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+0, +0, +0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-063-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-063-ref.xht
deleted file mode 100644
index 3afc17f0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-063-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/808080_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-063.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-063.xht
deleted file mode 100644
index a6295e1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-063.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with a nominal value, rgb(128, 128, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-063-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(128, 128, 128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(128, 128, 128);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(128, 128, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-064.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-064.xht
deleted file mode 100644
index 89148be..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-064.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with a nominal value and a plus sign, rgb(+128, +128, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-063-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+128, +128, +128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+128, +128, +128);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(128, 128, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-065.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-065.xht
deleted file mode 100644
index d11d1ba..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-065.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with a maximum minus one value, rgb(254, 254, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-005-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(254, 254, 254) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(254, 254, 254);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(254, 254, 254);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-066.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-066.xht
deleted file mode 100644
index 7bad2cf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-066.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with a maximum value, rgb(255, 255, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(255, 255, 255) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(255, 255, 255);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-067.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-067.xht
deleted file mode 100644
index f53683a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-067.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with a maximum value and a plus sign, rgb(+255, +255, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+255, +255, +255) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+255, +255, +255);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-068.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-068.xht
deleted file mode 100644
index 491d575..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-068.xht
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with a maximum plus one value, rgb(256, 256, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(256, 256, 256) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(256, 256, 256);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-069.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-069.xht
deleted file mode 100644
index 3717d36..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-069.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to the minimum minus one value, rgb(-1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(-1%, 0%, 0%) falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(-1%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-070-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-070-ref.xht
deleted file mode 100644
index 8e18525..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-070-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(1%, 0%, 0%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-070.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-070.xht
deleted file mode 100644
index bdedc86..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-070.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to the minimum plus one value, rgb(1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-070-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(1%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(1%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(1%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-071.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-071.xht
deleted file mode 100644
index e17c1dff..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-071.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to the minimum value and minus sign, rgb(-0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(-0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(-0%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-072.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-072.xht
deleted file mode 100644
index b6113b8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-072.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to the minimum value and plus sign, rgb(+0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+0%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-073-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-073-ref.xht
deleted file mode 100644
index 9c8b4d8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-073-ref.xht
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-073.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-073.xht
deleted file mode 100644
index b60a4d84..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-073.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to a nominal value, rgb(40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-073-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(40%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(40%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-074.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-074.xht
deleted file mode 100644
index 851efab..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-074.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to a nominal value with a plus sign, rgb(+40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-073-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+40%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+40%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-075-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-075-ref.xht
deleted file mode 100644
index 813946d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-075-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(99%, 0%, 0%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-075.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-075.xht
deleted file mode 100644
index c8b5873..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-075.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to a maximum minus one value, rgb(99%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-075-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(99%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(99%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(99%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-076.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-076.xht
deleted file mode 100644
index 766e371b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-076.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to a maximum value, rgb(100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(100%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(100%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-077.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-077.xht
deleted file mode 100644
index 4ce0ec8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-077.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to a maximum value with a plus sign, rgb(+100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+100%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+100%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-078.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-078.xht
deleted file mode 100644
index 74358310..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-078.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with red set to a maximum plus one value, rgb(101%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(101%, 0%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(101%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-079.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-079.xht
deleted file mode 100644
index 7256c711d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-079.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to the minimum minus one value, rgb(-1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(-1, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-080.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-080.xht
deleted file mode 100644
index 46c60e78..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-080.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to the minimum plus one value, rgb(1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-009-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(1, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(1, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(1, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-081.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-081.xht
deleted file mode 100644
index 843848cb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-081.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to the minimum value with a minus sign, rgb(-0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(-0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(-0, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-082.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-082.xht
deleted file mode 100644
index 66e533b3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-082.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to the minimum value with a plus sign, rgb(+0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+0, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-083-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-083-ref.xht
deleted file mode 100644
index bf6367d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-083-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/800000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-083.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-083.xht
deleted file mode 100644
index 7b6241a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-083.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to a nominal value, rgb(128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-083-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(128, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(128, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(128, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-084.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-084.xht
deleted file mode 100644
index 2ac6901..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-084.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to a nominal value with a plus sign, rgb(+128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-083-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+128, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+128, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(128, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-085.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-085.xht
deleted file mode 100644
index bf2b53bd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-085.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to a maximum minus one value, rgb(254, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-011-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(254, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(254, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(254, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-086.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-086.xht
deleted file mode 100644
index f052625..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-086.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to a maximum value, rgb(255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(255, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(255, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-087.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-087.xht
deleted file mode 100644
index 111155f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-087.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to a maximum value with a plus sign, rgb(+255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(+255, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(+255, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-088.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-088.xht
deleted file mode 100644
index ca555852..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-088.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with red set to a maximum plus one value, rgb(256, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(256, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(256, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-089.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-089.xht
deleted file mode 100644
index 0d715dd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-089.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to the minimum minus one value, rgb(0%, -1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, -1%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, -1%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-090-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-090-ref.xht
deleted file mode 100644
index d18a102f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-090-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 1%, 0%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-090.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-090.xht
deleted file mode 100644
index 4cdd83f3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-090.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to the minimum plus one value, rgb(0%, 1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-090-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 1%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 1%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 1%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-091.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-091.xht
deleted file mode 100644
index 60c8815..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-091.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to the minimum value and minus sign, rgb(0%, -0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, -0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, -0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-092.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-092.xht
deleted file mode 100644
index 7027950d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-092.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to the minimum value and plus sign, rgb(0%, +0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, +0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, +0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-093-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-093-ref.xht
deleted file mode 100644
index e6d8290..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-093-ref.xht
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-093.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-093.xht
deleted file mode 100644
index e4f629e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-093.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to a nominal value, rgb(0%, 40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-093-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 40%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 40%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-094.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-094.xht
deleted file mode 100644
index e9d58db..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-094.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to a nominal value with a plus sign, rgb(0%, +40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-093-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, +40%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, +40%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-095-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-095-ref.xht
deleted file mode 100644
index 938e110..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-095-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 99%, 0%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-095.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-095.xht
deleted file mode 100644
index 4ddfedf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-095.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to a maximum minus one value, rgb(0%, 99%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-095-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 99%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 99%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 99%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-096.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-096.xht
deleted file mode 100644
index 245605d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-096.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to a maximum value, rgb(0%, 100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 100%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 100%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-097.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-097.xht
deleted file mode 100644
index cd33161..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-097.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to a maximum value with a plus sign, rgb(0%, +100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, +100%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, +100%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-098.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-098.xht
deleted file mode 100644
index 6d039dd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-098.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with green set to a maximum plus one value, rgb(0%, 101%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 101%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 101%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-099.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-099.xht
deleted file mode 100644
index 5f6ae6b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-099.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to the minimum minus one value, rgb(0, -1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, -1, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-100-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-100-ref.xht
deleted file mode 100644
index 27a0264..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-100-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background-color: rgb(0, 1, 0);
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-100.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-100.xht
deleted file mode 100644
index 44075c7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-100.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to the minimum plus one value, rgb(0, 1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-100-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 1, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 1, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 1, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-101.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-101.xht
deleted file mode 100644
index 8947bc5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-101.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to the minimum value with a minus sign, rgb(0, -0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, -0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, -0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-102.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-102.xht
deleted file mode 100644
index 3f4516e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-102.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to the minimum value with a plus sign, rgb(0, +0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, +0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, +0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-103-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-103-ref.xht
deleted file mode 100644
index 3f0eb48..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-103-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/008000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-103.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-103.xht
deleted file mode 100644
index 8127a90..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-103.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to a nominal value, rgb(0, 128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-103-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 128, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 128, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 128, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-104.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-104.xht
deleted file mode 100644
index 0b4f3b1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-104.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to a nominal value with a plus sign, rgb(0, +128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-103-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, +128, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, +128, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 128, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-105.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-105.xht
deleted file mode 100644
index 8e0ec285..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-105.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to a maximum minus one value, rgb(0, 254, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-016-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 254, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 254, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 254, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-106.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-106.xht
deleted file mode 100644
index bd9fc749..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-106.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to a maximum value, rgb(0, 255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 255, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 255, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-107.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-107.xht
deleted file mode 100644
index 72a38a3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-107.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to a maximum value with a plus sign, rgb(0, +255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, +255, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, +255, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-108.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-108.xht
deleted file mode 100644
index d69d7200..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-108.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with green set to a maximum plus one value, rgb(0, 256 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 256, 0) properly truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 256, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-109.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-109.xht
deleted file mode 100644
index 053febc6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-109.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to the minimum minus one value, rgb(0%, 0%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, -1%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-110-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-110-ref.xht
deleted file mode 100644
index a9241f53..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-110-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 0%, 1%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-110.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-110.xht
deleted file mode 100644
index 736365f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-110.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to the minimum plus one value, rgb(0%, 0%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-110-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, 1%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, 1%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 1%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-111.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-111.xht
deleted file mode 100644
index 7d852383..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-111.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to the minimum value and minus sign, rgb(0%, 0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, -0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, -0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-112.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-112.xht
deleted file mode 100644
index 5c70578..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-112.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to the minimum value and plus sign, rgb(0%, 0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, +0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, +0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-113-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-113-ref.xht
deleted file mode 100644
index 030ee6ec0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-113-ref.xht
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-113.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-113.xht
deleted file mode 100644
index 347344eb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-113.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to a nominal value, rgb(0%, 0%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-113-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, 40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, 40%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-114.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-114.xht
deleted file mode 100644
index c28375c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-114.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to a nominal value with a plus sign, rgb(0%, 0%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-113-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, +40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, +40%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-115-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-115-ref.xht
deleted file mode 100644
index 4628877..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-115-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 0%, 99%);
-                margin-top: 10px;
-            }
-
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-115.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-115.xht
deleted file mode 100644
index 41f4647..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-115.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to a maximum minus one value, rgb(0%, 0%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-115-ref.xht"/>
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, 99%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, 99%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 99%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-116.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-116.xht
deleted file mode 100644
index b8f1825..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-116.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to a maximum value, rgb(0%, 0%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, 100%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, 100%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-117.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-117.xht
deleted file mode 100644
index 034f0f5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-117.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to a maximum value with a plus sign, rgb(0%, 0%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, +100%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, +100%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-118.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-118.xht
deleted file mode 100644
index 25990d11c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-118.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using percentages with blue set to a maximum plus one value, rgb(0%, 0%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0%, 0%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0%, 0%, 101%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-119.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-119.xht
deleted file mode 100644
index 25ccc22..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-119.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to the minimum minus one value, rgb(0, 0, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, -1) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, -1);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-120.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-120.xht
deleted file mode 100644
index 6cf2c68e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-120.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to the minimum plus one value, rgb(0, 0, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-019-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, 1) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, 1);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 1);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-121.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-121.xht
deleted file mode 100644
index 4f6ae4f5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-121.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to the minimum value with a minus sign, rgb(0, 0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, -0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, -0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-122.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-122.xht
deleted file mode 100644
index b742b06..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-122.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to the minimum value with a plus sign, rgb(0, 0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, +0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, +0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-123-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-123-ref.xht
deleted file mode 100644
index 6e03baf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-123-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/000080_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-123.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-123.xht
deleted file mode 100644
index a95ef02..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-123.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to a nominal value, rgb(0, 0, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-123-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, 128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, 128);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-124.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-124.xht
deleted file mode 100644
index 957b9e7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-124.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to a nominal value with a plus sign, rgb(0, 0, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-123-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, +128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, +128);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-125.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-125.xht
deleted file mode 100644
index 370eb8a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-125.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to a maximum minus one value, rgb(0, 0, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-021-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, 254) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, 254);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 254);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-126.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-126.xht
deleted file mode 100644
index ab183be6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-126.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to a maximum value, rgb(0, 0, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, 255) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, 255);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-127.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-127.xht
deleted file mode 100644
index b03e5099..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-127.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to a maximum value with a plus sign, rgb(0, 0, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, +255) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, +255);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-128.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-128.xht
deleted file mode 100644
index 94462ca..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-128.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to rgb() using integers with blue set to a maximum plus one value, rgb(0, 0, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-bottom-color' set to rgb(0, 0, 256) properly truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: rgb(0, 0, 256);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-130.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-130.xht
deleted file mode 100644
index a8c1583..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-130.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to black</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to black causes the border-bottom-color of the box to be black." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: black;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: black;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-131-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-131-ref.xht
deleted file mode 100644
index 4e5d9de9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-131-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/blue15x15.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-131.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-131.xht
deleted file mode 100644
index aa987cb4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-131.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to blue</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-131-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to blue causes the border-bottom-color of the box to be blue." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: blue;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: blue;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-132-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-132-ref.xht
deleted file mode 100644
index 713977b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-132-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/fuchsia_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-132.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-132.xht
deleted file mode 100644
index ac7a228..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-132.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to fuchsia</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-132-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to fuchsia causes the border-bottom-color of the box to be fuchsia." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: fuchsia;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: fuchsia;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-133-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-133-ref.xht
deleted file mode 100644
index 5db22dc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-133-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/808080_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-133.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-133.xht
deleted file mode 100644
index 06c1c9e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-133.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to gray</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-133-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to gray causes the border-bottom-color of the box to be gray." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: gray;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: gray;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-134-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-134-ref.xht
deleted file mode 100644
index beccb7d4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-134-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/1x1-green.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-134.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-134.xht
deleted file mode 100644
index 97d168b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-134.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to green</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-134-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to green causes the background of the box to be green." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: green;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: green;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-135-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-135-ref.xht
deleted file mode 100644
index 7546efe..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-135-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/1x1-lime.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-135.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-135.xht
deleted file mode 100644
index 85ce19a0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-135.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to lime</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-135-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to lime causes the border-bottom-color of the box to be lime." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: lime;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: lime;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-136-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-136-ref.xht
deleted file mode 100644
index a6b7859..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-136-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/maroon_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-136.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-136.xht
deleted file mode 100644
index 3444b98..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-136.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to maroon</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-20 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-136-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to maroon causes the border-bottom-color of the box to be maroon." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: maroon;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: maroon;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-137-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-137-ref.xht
deleted file mode 100644
index 80bc045..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-137-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/1x1-navy.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-137.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-137.xht
deleted file mode 100644
index b3fd414..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-137.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to navy</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-137-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to navy causes the border-bottom-color of the box to be navy." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: navy;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: navy;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-138-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-138-ref.xht
deleted file mode 100644
index 23131e1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-138-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/olive_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-138.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-138.xht
deleted file mode 100644
index 6ffa065..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-138.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to olive</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-138-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to olive causes the border-bottom-color of the box to be olive." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: olive;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: olive;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-139-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-139-ref.xht
deleted file mode 100644
index 3569017b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-139-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/swatch-orange.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-139.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-139.xht
deleted file mode 100644
index 1754a33..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-139.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to orange</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-139-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to orange causes the border-bottom-color of the box to be orange." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: orange;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: orange;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-140-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-140-ref.xht
deleted file mode 100644
index f0efa88..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-140-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/purple_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-140.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-140.xht
deleted file mode 100644
index baf09054..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-140.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to purple</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-140-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to purple causes the border-bottom-color of the box to be purple." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: purple;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: purple;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-141-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-141-ref.xht
deleted file mode 100644
index b15072ea..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-141-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/swatch-red.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-141.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-141.xht
deleted file mode 100644
index c665523..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-141.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to red</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-141-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to red causes the border-bottom-color of the box to be red." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: red;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: red;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-142-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-142-ref.xht
deleted file mode 100644
index 814f26da..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-142-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/silver_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-142.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-142.xht
deleted file mode 100644
index e53654df..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-142.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to silver</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-142-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to silver causes the border-bottom-color of the box to be silver." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: silver;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: silver;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-143-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-143-ref.xht
deleted file mode 100644
index 2acd597..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-143-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/teal_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-143.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-143.xht
deleted file mode 100644
index 2a71880..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-143.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to teal</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-143-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to teal causes the border-bottom-color of the box to be teal." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: teal;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: teal;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-144-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-144-ref.xht
deleted file mode 100644
index 374461a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-144-ref.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  body {background-color: black;}
-
-  p {color: white;}
-
-  div
-  {
-  background: url("support/swatch-white.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-144.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-144.xht
deleted file mode 100644
index d1061878..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-144.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to white</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-144-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to white causes the border-bottom-color of the box to be white." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: white;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: white;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-145-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-145-ref.xht
deleted file mode 100644
index a7e37e7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-145-ref.xht
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/yellow_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-145.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-145.xht
deleted file mode 100644
index 4ac7c59..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-bottom-color-145.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-bottom-color set to yellow</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-bottom-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-145-ref.xht" />
-
-        <meta name="assert" content="The 'border-bottom-color' set to yellow causes the border-bottom-color of the box to be yellow." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-bottom-style: solid;
-                border-bottom-width: 1in;
-                border-bottom-color: yellow;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: yellow;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-001.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-001.xht
deleted file mode 100644
index 26f026c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-001.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with five digits which is invalid and is equivalent to minimum minus one value for six digit hex</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #00000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #00000;
-            }
-            #reference
-            {
-                background-color: #000000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-002.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-002.xht
deleted file mode 100644
index 0a7aeff..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-002.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with the minimum value, #000000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #000000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #000000;
-            }
-            #reference
-            {
-                background-color: #000000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-003.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-003.xht
deleted file mode 100644
index 7c7485bd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-003.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with the minimum plus one value, #010101</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-003-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #010101 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #010101;
-            }
-            #reference
-            {
-                background-color: #010101;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-004.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-004.xht
deleted file mode 100644
index fe6e8e6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-004.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a nominal value #999999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-004-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #999999 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #999999;
-            }
-            #reference
-            {
-                background-color: #999999;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-005.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-005.xht
deleted file mode 100644
index d458a71..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-005.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with the maximum minus one value of #fefefe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-005-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #fefefe renders the correct color for the border." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #fefefe;
-            }
-            #reference
-            {
-                background-color: #fefefe;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-006.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-006.xht
deleted file mode 100644
index 2aeb4e00..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-006.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with the maximum value of #ffffff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #ffffff renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #ffffff;
-            }
-            #reference
-            {
-                background-color: #ffffff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-007.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-007.xht
deleted file mode 100644
index 9679338..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-007.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with the maximum plus one value of #1000000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #1000000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #1000000;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-008.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-008.xht
deleted file mode 100644
index b95241d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-008.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with the maximum plus one value of #fgfgfg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #fgfgfg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #fgfgfg;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-009.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-009.xht
deleted file mode 100644
index 7d16705..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-009.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a red set to minimum plus one value, #010000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-009-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #010000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #010000;
-            }
-            #reference
-            {
-                background-color: #010000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-010.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-010.xht
deleted file mode 100644
index 1f41c35b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-010.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a red set to a nominal value, #990000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-010-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #990000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #990000;
-            }
-            #reference
-            {
-                background-color: #990000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-011.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-011.xht
deleted file mode 100644
index 19acbe2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-011.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a red set to maximum minus one value, #fe0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-011-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #fe0000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #fe0000;
-            }
-            #reference
-            {
-                background-color: #fe0000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-012.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-012.xht
deleted file mode 100644
index 784a876..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-012.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a red set to the maximum value, #ff0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #ff0000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #ff0000;
-            }
-            #reference
-            {
-                background-color: #ff0000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-013.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-013.xht
deleted file mode 100644
index cb89214..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-013.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a red set to the maximum plus one value, #fg0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #fg0000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #fg0000;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-014.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-014.xht
deleted file mode 100644
index c407698f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-014.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a green set to minimum plus one value, #000100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-014-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #000100 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #000100;
-            }
-            #reference
-            {
-                background-color: #000100;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-015.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-015.xht
deleted file mode 100644
index 0d502b9f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-015.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a green set to a nominal value, #009900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-015-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #009900 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #009900;
-            }
-            #reference
-            {
-                background-color: #009900;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-016.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-016.xht
deleted file mode 100644
index 41c308d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-016.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a green set to maximum minus one value, #00fe00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-016-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #00fe00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #00fe00;
-            }
-            #reference
-            {
-                background-color: #00fe00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-017.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-017.xht
deleted file mode 100644
index d8cbe8b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-017.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a green set to the maximum value, #00ff00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #00ff00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #00ff00;
-            }
-            #reference
-            {
-                background-color: #00ff00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-018.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-018.xht
deleted file mode 100644
index 49fea3c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-018.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a green set to the maximum plus one value, #00fg00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #00fg00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #00fg00;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-019.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-019.xht
deleted file mode 100644
index 58385243..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-019.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a blue set to minimum plus one value, #000001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-019-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #000001 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #000001;
-            }
-            #reference
-            {
-                background-color: #000001;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-020.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-020.xht
deleted file mode 100644
index ddfb8b4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-020.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a blue set to a nominal value, #000099</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-020-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #000099 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #000099;
-            }
-            #reference
-            {
-                background-color: #000099;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-021.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-021.xht
deleted file mode 100644
index f0c16a7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-021.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a blue set to maximum minus one value, #0000fe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-021-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #0000fe renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #0000fe;
-            }
-            #reference
-            {
-                background-color: #0000fe;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-022.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-022.xht
deleted file mode 100644
index 129f5f1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-022.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a blue set to the maximum value, #0000ff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #0000ff renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #0000ff;
-            }
-            #reference
-            {
-                background-color: #0000ff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-023.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-023.xht
deleted file mode 100644
index ed969cf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-023.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with six digits with a blue set to the maximum plus one value, #0000fg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #0000fg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #0000fg;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-024.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-024.xht
deleted file mode 100644
index fb1bf0d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-024.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with 2 digits which is invalid and is equivalent to minimum minus one value for 3 digit hex</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #00;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-025.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-025.xht
deleted file mode 100644
index 2d1e995..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-025.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with the minimum possible value #000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #000;
-            }
-            #reference
-            {
-                background-color: #000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-026.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-026.xht
deleted file mode 100644
index 4abf426..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-026.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with the minimum plus one value, #111</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-026-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #111 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #111;
-            }
-            #reference
-            {
-                background-color: #111;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-027.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-027.xht
deleted file mode 100644
index c28aa21..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-027.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a nominal value #999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-027-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #999 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #999;
-            }
-            #reference
-            {
-                background-color: #999;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-028.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-028.xht
deleted file mode 100644
index 386c42a2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-028.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with the maximum minus one value of #eee</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-028-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #eee renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #eee;
-            }
-            #reference
-            {
-                background-color: #eee;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-029.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-029.xht
deleted file mode 100644
index f2624c1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-029.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with the maximum value of #fff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #fff renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #fff;
-            }
-            #reference
-            {
-                background-color: #fff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-030.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-030.xht
deleted file mode 100644
index fc62a4b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-030.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with the maximum plus one value of #1000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-transparent-or-black-square-black.xht"/>
-        <link rel="match" href="../reference/ref-transparent-or-black-square-transparent.xht"/>
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #1000 is a transparent dark red square." />
-        <style type="text/css">
-            div.test
-            {
-                border: 5px solid blue;
-                height: 1in;
-                width: 1in;
-            }
-            div.test div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #1000;
-                height: 1in;
-                width: 0;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black or transparent square surrounded by a blue border.</p>
-        <div class="test"><div></div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-031.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-031.xht
deleted file mode 100644
index c31e9d9e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-031.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with the maximum plus one value of #ggg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #ggg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #ggg;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-032.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-032.xht
deleted file mode 100644
index 2478e78..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-032.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a red set to minimum plus one value, #100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-032-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #100 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #100;
-            }
-            #reference
-            {
-                background-color: #100;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-033.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-033.xht
deleted file mode 100644
index 79ec0085..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-033.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a red set to a nominal value, #900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-010-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #900 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #900;
-            }
-            #reference
-            {
-                background-color: #900;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-034.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-034.xht
deleted file mode 100644
index 2282d058..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-034.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a red set to maximum minus one value, #e00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-034-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #e00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #e00;
-            }
-            #reference
-            {
-                background-color: #e00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-035.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-035.xht
deleted file mode 100644
index 25acf6d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-035.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a red set to the maximum value, #f00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #f00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #f00;
-            }
-            #reference
-            {
-                background-color: #f00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-036.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-036.xht
deleted file mode 100644
index b268910e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-036.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a red set to the maximum plus one value, #g00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #g00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #g00;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-037.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-037.xht
deleted file mode 100644
index 73cf82d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-037.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a green set to minimum plus one value, #010</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-037-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #010 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #010;
-            }
-            #reference
-            {
-                background-color: #010;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-038.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-038.xht
deleted file mode 100644
index cffdd3f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-038.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a green set to a nominal value, #090</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-038-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #090 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #090;
-            }
-            #reference
-            {
-                background-color: #090;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-039.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-039.xht
deleted file mode 100644
index ffada9e7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-039.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a green set to maximum minus one value, #0e0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-039-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #0e0 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #0e0;
-            }
-            #reference
-            {
-                background-color: #0e0;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-040.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-040.xht
deleted file mode 100644
index edd44d2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-040.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a green set to the maximum value, #0f0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #0f0 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #0f0;
-            }
-            #reference
-            {
-                background-color: #0f0;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-041.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-041.xht
deleted file mode 100644
index 8a19c64..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-041.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a green set to the maximum plus one value, #0g0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #0g0 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #0g0;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-042.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-042.xht
deleted file mode 100644
index eeaa75b5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-042.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a blue set to minimum plus one value, #001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-042-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #001 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #001;
-            }
-            #reference
-            {
-                background-color: #001;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-043.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-043.xht
deleted file mode 100644
index 12cddbd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-043.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a blue set to a nominal value, #009</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-020-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #009 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #009;
-            }
-            #reference
-            {
-                background-color: #009;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-044.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-044.xht
deleted file mode 100644
index 9232b04f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-044.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a blue set to maximum minus one value, #00e</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-044-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #00e renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #00e;
-            }
-            #reference
-            {
-                background-color: #00e;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-045.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-045.xht
deleted file mode 100644
index d8afc8a8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-045.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a blue set to the maximum value, #00f</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to #00f renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #00f;
-            }
-            #reference
-            {
-                background-color: #00f;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-046.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-046.xht
deleted file mode 100644
index 0e585c32..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-046.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to hex with three digits with a blue set to the maximum plus one value, #00g</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to #00g falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: #00g;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-047.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-047.xht
deleted file mode 100644
index bb0b50b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-047.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with the minimum minus one value, rgb(-1%, -1%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(-1%, -1%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(-1%, -1%, -1%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-048.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-048.xht
deleted file mode 100644
index 2526461..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-048.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with the minimum value, rgb(0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-049.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-049.xht
deleted file mode 100644
index be71e45..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-049.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with the minimum plus one value, rgb(1%, 1%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-049-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(1%, 1%, 1%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(1%, 1%, 1%);
-            }
-            #reference
-            {
-                background-color: rgb(1%, 1%, 1%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-050.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-050.xht
deleted file mode 100644
index 62696bb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-050.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with the minimum value and minus sign, rgb(-0%, -0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(-0%, -0%, -0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(-0%, -0%, -0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-051.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-051.xht
deleted file mode 100644
index e4a7432..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-051.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with the minimum value and plus sign, rgb(+0%, +0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+0%, +0%, +0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+0%, +0%, +0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-052.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-052.xht
deleted file mode 100644
index a2469a757..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-052.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with a nominal value, rgb(40%, 40%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-052-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(40%, 40%, 40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(40%, 40%, 40%);
-            }
-            #reference
-            {
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-053.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-053.xht
deleted file mode 100644
index e082620..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-053.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with a nominal value and a plus sign, rgb(+40%, +40%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-052-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(+40%, +40%, +40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+40%, +40%, +40%);
-            }
-            #reference
-            {
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-054.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-054.xht
deleted file mode 100644
index 056a3f7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-054.xht
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with a maximum minus one value, rgb(99%, 99%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-054-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(99%, 99%, 99%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(99%, 99%, 99%);
-            }
-            #reference
-            {
-                background-color: rgb(99%, 99%, 99%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-055.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-055.xht
deleted file mode 100644
index 5142832..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-055.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with a maximum value, rgb(100%, 100%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(100%, 100%, 100%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(100%, 100%, 100%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-056.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-056.xht
deleted file mode 100644
index 9756720..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-056.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with plus sign on each maximum value, rgb(+100%, +100%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+100%, +100%, +100%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+100%, +100%, +100%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-057.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-057.xht
deleted file mode 100644
index fde87d1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-057.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with a maximum plus one value, rgb(101%, 101%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(101%, 101%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(101%, 101%, 101%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-058.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-058.xht
deleted file mode 100644
index f11c3ef..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-058.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with the minimum minus one value, rgb(-1, -1, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(-1, -1, -1) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(-1, -1, -1);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-059.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-059.xht
deleted file mode 100644
index a478244..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-059.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with the minimum value, rgb(0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-060.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-060.xht
deleted file mode 100644
index 5819fd3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-060.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with the minimum plus one value, rgb(1, 1, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-003-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(1, 1, 1) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(1, 1, 1);
-            }
-            #reference
-            {
-                background-color: rgb(1, 1, 1);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-061.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-061.xht
deleted file mode 100644
index 99debe1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-061.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with the minimum value and minus sign, rgb(-0, -0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(-0, -0, -0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(-0, -0, -0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-062.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-062.xht
deleted file mode 100644
index 99cb289..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-062.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with the minimum value and plus sign, rgb(+0, +0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+0, +0, +0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+0, +0, +0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-063.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-063.xht
deleted file mode 100644
index 653414a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-063.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with a nominal value, rgb(128, 128, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-063-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(128, 128, 128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(128, 128, 128);
-            }
-            #reference
-            {
-                background-color: rgb(128, 128, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-064.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-064.xht
deleted file mode 100644
index b894e3c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-064.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with a nominal value and a plus sign, rgb(+128, +128, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-063-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+128, +128, +128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+128, +128, +128);
-            }
-            #reference
-            {
-                background-color: rgb(128, 128, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-065.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-065.xht
deleted file mode 100644
index 11b4661..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-065.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with a maximum minus one value, rgb(254, 254, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-005-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(254, 254, 254) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(254, 254, 254);
-            }
-            #reference
-            {
-                background-color: rgb(254, 254, 254);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-066.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-066.xht
deleted file mode 100644
index 89b0058..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-066.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with a maximum value, rgb(255, 255, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(255, 255, 255) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(255, 255, 255);
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-067.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-067.xht
deleted file mode 100644
index b595cea..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-067.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with a maximum value and a plus sign, rgb(+255, +255, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+255, +255, +255) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+255, +255, +255);
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-068.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-068.xht
deleted file mode 100644
index b582d0d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-068.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with a maximum plus one value, rgb(256, 256, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(256, 256, 256) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(256, 256, 256);
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-069.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-069.xht
deleted file mode 100644
index 9662a94..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-069.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to the minimum minus one value, rgb(-1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(-1%, 0%, 0%) falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(-1%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-070.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-070.xht
deleted file mode 100644
index abfd0c6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-070.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to the minimum plus one value, rgb(1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-070-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(1%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(1%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(1%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-071.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-071.xht
deleted file mode 100644
index f1b2279..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-071.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to the minimum value and minus sign, rgb(-0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(-0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(-0%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-072.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-072.xht
deleted file mode 100644
index ba018039..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-072.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to the minimum value and plus sign, rgb(+0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+0%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-073.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-073.xht
deleted file mode 100644
index 612d700..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-073.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to a nominal value, rgb(40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-073-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(40%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(40%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-074.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-074.xht
deleted file mode 100644
index 4f49db3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-074.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to a nominal value with a plus sign, rgb(+40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-073-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(+40%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+40%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-075.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-075.xht
deleted file mode 100644
index 242b6ac..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-075.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to a maximum minus one value, rgb(99%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-075-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(99%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(99%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(99%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-076.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-076.xht
deleted file mode 100644
index 02980b5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-076.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to a maximum value, rgb(100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(100%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(100%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-077.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-077.xht
deleted file mode 100644
index da72352d1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-077.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to a maximum value with a plus sign, rgb(+100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+100%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+100%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-078.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-078.xht
deleted file mode 100644
index 6d1cd489..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-078.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with red set to a maximum plus one value, rgb(101%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(101%, 0%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(101%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-079.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-079.xht
deleted file mode 100644
index b7f8caf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-079.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to the minimum minus one value, rgb(-1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(-1, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-080.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-080.xht
deleted file mode 100644
index a9878d09..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-080.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to the minimum plus one value, rgb(1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-009-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(1, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(1, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(1, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-081.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-081.xht
deleted file mode 100644
index 95de7e7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-081.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to the minimum value with a minus sign, rgb(-0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(-0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(-0, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-082.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-082.xht
deleted file mode 100644
index a037388..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-082.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to the minimum value with a plus sign, rgb(+0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+0, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-083.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-083.xht
deleted file mode 100644
index c2123960..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-083.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to a nominal value, rgb(128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-083-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(128, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(128, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(128, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-084.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-084.xht
deleted file mode 100644
index f1ba9781..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-084.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to a nominal value with a plus sign, rgb(+128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-083-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+128, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+128, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(128, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-085.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-085.xht
deleted file mode 100644
index d348293..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-085.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to a maximum minus one value, rgb(254, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-011-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(254, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(254, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(254, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-086.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-086.xht
deleted file mode 100644
index 85a7976..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-086.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to a maximum value, rgb(255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(255, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(255, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-087.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-087.xht
deleted file mode 100644
index 9d2489a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-087.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to a maximum value with a plus sign, rgb(+255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(+255, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(+255, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-088.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-088.xht
deleted file mode 100644
index ff2bfa66..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-088.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with red set to a maximum plus one value, rgb(256, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(256, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(256, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-089.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-089.xht
deleted file mode 100644
index a0dc787..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-089.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to the minimum minus one value, rgb(0%, -1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, -1%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, -1%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-090.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-090.xht
deleted file mode 100644
index 5c1908ae..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-090.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to the minimum plus one value, rgb(0%, 1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-090-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 1%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 1%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 1%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-091.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-091.xht
deleted file mode 100644
index e639eb7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-091.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to the minimum value and minus sign, rgb(0%, -0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, -0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, -0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-092.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-092.xht
deleted file mode 100644
index 0a78434d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-092.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to the minimum value and plus sign, rgb(0%, +0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, +0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, +0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-093.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-093.xht
deleted file mode 100644
index 18d9954..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-093.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to a nominal value, rgb(0%, 40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-093-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 40%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 40%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-094.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-094.xht
deleted file mode 100644
index 2940b09..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-094.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to a nominal value with a plus sign, rgb(0%, +40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-093-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, +40%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, +40%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-095.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-095.xht
deleted file mode 100644
index 3bef268..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-095.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to a maximum minus one value, rgb(0%, 99%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-095-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 99%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 99%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 99%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-096.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-096.xht
deleted file mode 100644
index fc75c29a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-096.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to a maximum value, rgb(0%, 100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 100%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 100%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-097.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-097.xht
deleted file mode 100644
index 5b90142..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-097.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to a maximum value with a plus sign, rgb(0%, +100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, +100%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, +100%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-098.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-098.xht
deleted file mode 100644
index e38bccc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-098.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with green set to a maximum plus one value, rgb(0%, 101%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 101%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 101%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-099.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-099.xht
deleted file mode 100644
index ff193dc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-099.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to the minimum minus one value, rgb(0, -1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, -1, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-100.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-100.xht
deleted file mode 100644
index b2acc60..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-100.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to the minimum plus one value, rgb(0, 1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-100-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 1, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 1, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 1, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-101.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-101.xht
deleted file mode 100644
index cd7503f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-101.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to the minimum value with a minus sign, rgb(0, -0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, -0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, -0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-102.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-102.xht
deleted file mode 100644
index 3174a87..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-102.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to the minimum value with a plus sign, rgb(0, +0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, +0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, +0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-103.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-103.xht
deleted file mode 100644
index e2378fc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-103.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to a nominal value, rgb(0, 128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-103-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 128, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 128, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 128, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-104.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-104.xht
deleted file mode 100644
index 5adabc8d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-104.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to a nominal value with a plus sign, rgb(0, +128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-103-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, +128, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, +128, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 128, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-105.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-105.xht
deleted file mode 100644
index 65c36432..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-105.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to a maximum minus one value, rgb(0, 254, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-016-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 254, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 254, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 254, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-106.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-106.xht
deleted file mode 100644
index f992b2b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-106.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to a maximum value, rgb(0, 255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 255, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 255, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-107.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-107.xht
deleted file mode 100644
index 7c3e41e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-107.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to a maximum value with a plus sign, rgb(0, +255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, +255, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, +255, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-108.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-108.xht
deleted file mode 100644
index 4c3abbb5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-108.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with green set to a maximum plus one value, rgb(0, 256 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 256, 0) properly truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 256, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-109.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-109.xht
deleted file mode 100644
index 0023bef..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-109.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to the minimum minus one value, rgb(0%, 0%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, -1%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-110.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-110.xht
deleted file mode 100644
index c947fe8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-110.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to the minimum plus one value, rgb(0%, 0%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-110-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, 1%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, 1%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 1%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-111.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-111.xht
deleted file mode 100644
index 4c4bf57..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-111.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to the minimum value and minus sign, rgb(0%, 0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, -0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, -0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-112.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-112.xht
deleted file mode 100644
index 1d944cf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-112.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to the minimum value and plus sign, rgb(0%, 0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, +0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, +0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-113.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-113.xht
deleted file mode 100644
index 67b3276..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-113.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to a nominal value, rgb(0%, 0%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-113-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, 40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, 40%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-114.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-114.xht
deleted file mode 100644
index e10886c8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-114.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to a nominal value with a plus sign, rgb(0%, 0%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-113-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, +40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, +40%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-115.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-115.xht
deleted file mode 100644
index 72f95ec..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-115.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to a maximum minus one value, rgb(0%, 0%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-115-ref.xht"/>
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, 99%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, 99%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 99%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-116.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-116.xht
deleted file mode 100644
index bb0714d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-116.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to a maximum value, rgb(0%, 0%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, 100%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, 100%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-117.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-117.xht
deleted file mode 100644
index d35664a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-117.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to a maximum value with a plus sign, rgb(0%, 0%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, +100%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, +100%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-118.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-118.xht
deleted file mode 100644
index 64043cd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-118.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using percentages with blue set to a maximum plus one value, rgb(0%, 0%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(0%, 0%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0%, 0%, 101%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-119.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-119.xht
deleted file mode 100644
index 5fe0875..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-119.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to the minimum minus one value, rgb(0, 0, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, -1) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, -1);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-120.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-120.xht
deleted file mode 100644
index 7d7a31c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-120.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to the minimum plus one value, rgb(0, 0, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-019-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, 1) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, 1);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 1);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-121.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-121.xht
deleted file mode 100644
index 0f2141d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-121.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to the minimum value with a minus sign, rgb(0, 0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, -0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, -0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-122.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-122.xht
deleted file mode 100644
index 690c326..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-122.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to the minimum value with a plus sign, rgb(0, 0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, +0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, +0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-123.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-123.xht
deleted file mode 100644
index 5ca990e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-123.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to a nominal value, rgb(0, 0, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-123-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, 128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, 128);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-124.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-124.xht
deleted file mode 100644
index 8977d43..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-124.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to a nominal value with a plus sign, rgb(0, 0, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-123-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, +128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, +128);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-125.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-125.xht
deleted file mode 100644
index e20a77f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-125.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to a maximum minus one value, rgb(0, 0, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-021-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, 254) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, 254);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 254);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-126.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-126.xht
deleted file mode 100644
index ed1ae10..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-126.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to a maximum value, rgb(0, 0, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, 255) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, 255);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-127.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-127.xht
deleted file mode 100644
index 3f3d1f4c3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-127.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to a maximum value with a plus sign, rgb(0, 0, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, +255) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, +255);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-128.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-128.xht
deleted file mode 100644
index 2dcfe62..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-128.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to rgb() using integers with blue set to a maximum plus one value, rgb(0, 0, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-left-color' set to rgb(0, 0, 256) properly truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: rgb(0, 0, 256);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-130.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-130.xht
deleted file mode 100644
index 8afb0693..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-130.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to black</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to black causes the border-left-color of the box to be black." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: black;
-            }
-            #reference
-            {
-                background-color: black;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-131.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-131.xht
deleted file mode 100644
index 6302912..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-131.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to blue</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-131-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to blue causes the border-left-color of the box to be blue." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: blue;
-            }
-            #reference
-            {
-                background-color: blue;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-132.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-132.xht
deleted file mode 100644
index c554a06..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-132.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to fuchsia</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-132-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to fuchsia causes the border-left-color of the box to be fuchsia." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: fuchsia;
-            }
-            #reference
-            {
-                background-color: fuchsia;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-133.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-133.xht
deleted file mode 100644
index 58657b2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-133.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to gray</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-133-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to gray causes the border-left-color of the box to be gray." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: gray;
-            }
-            #reference
-            {
-                background-color: gray;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-134.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-134.xht
deleted file mode 100644
index 3b104fe..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-134.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to green</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-134-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to green causes the background of the box to be green." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: green;
-            }
-            #reference
-            {
-                background-color: green;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-135.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-135.xht
deleted file mode 100644
index 9c792672..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-135.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to lime</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-135-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to lime causes the border-left-color of the box to be lime." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: lime;
-            }
-            #reference
-            {
-                background-color: lime;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-136.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-136.xht
deleted file mode 100644
index a735813..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-136.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to maroon</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-136-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to maroon causes the border-left-color of the box to be maroon." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: maroon;
-            }
-            #reference
-            {
-                background-color: maroon;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-137.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-137.xht
deleted file mode 100644
index 72741c9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-137.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to navy</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-137-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to navy causes the border-left-color of the box to be navy." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: navy;
-            }
-            #reference
-            {
-                background-color: navy;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-138.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-138.xht
deleted file mode 100644
index 274cbeb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-138.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to olive</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-138-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to olive causes the border-left-color of the box to be olive." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: olive;
-            }
-            #reference
-            {
-                background-color: olive;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-139.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-139.xht
deleted file mode 100644
index f852c73..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-139.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to orange</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-139-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to orange causes the border-left-color of the box to be orange." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: orange;
-            }
-            #reference
-            {
-                background-color: orange;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-140.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-140.xht
deleted file mode 100644
index a0f472fe..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-140.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to purple</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-140-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to purple causes the border-left-color of the box to be purple." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: purple;
-            }
-            #reference
-            {
-                background-color: purple;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-141.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-141.xht
deleted file mode 100644
index d894273c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-141.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to red</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-141-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to red causes the border-left-color of the box to be red." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: red;
-            }
-            #reference
-            {
-                background-color: red;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-142.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-142.xht
deleted file mode 100644
index 5d42b96..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-142.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to silver</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-142-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to silver causes the border-left-color of the box to be silver." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: silver;
-            }
-            #reference
-            {
-                background-color: silver;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-143.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-143.xht
deleted file mode 100644
index fe90981..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-143.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to teal</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-143-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to teal causes the border-left-color of the box to be teal." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: teal;
-            }
-            #reference
-            {
-                background-color: teal;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-144.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-144.xht
deleted file mode 100644
index 93acb3b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-144.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to white</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-144-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to white causes the border-left-color of the box to be white." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: white;
-            }
-            #reference
-            {
-                background-color: white;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-145.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-145.xht
deleted file mode 100644
index 866e6988..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-left-color-145.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-left-color set to yellow</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-left-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-145-ref.xht" />
-
-        <meta name="assert" content="The 'border-left-color' set to yellow causes the border-left-color of the box to be yellow." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-left-style: solid;
-                border-left-width: 1in;
-                border-left-color: yellow;
-            }
-            #reference
-            {
-                background-color: yellow;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-001-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-001-ref.xht
deleted file mode 100644
index 5e969a7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-001-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-001.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-001.xht
deleted file mode 100644
index 4087d1b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-001.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with five digits which is invalid and is equivalent to minimum minus one value for six digit hex</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #00000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #00000;
-            }
-            #reference
-            {
-                background-color: #000000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-002.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-002.xht
deleted file mode 100644
index 38f25dd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-002.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with the minimum value, #000000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #000000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #000000;
-            }
-            #reference
-            {
-                background-color: #000000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-003-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-003-ref.xht
deleted file mode 100644
index cd50ec9c9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-003-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/010101_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-003.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-003.xht
deleted file mode 100644
index 581a485..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-003.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with the minimum plus one value, #010101</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-003-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #010101 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #010101;
-            }
-            #reference
-            {
-                background-color: #010101;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-004-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-004-ref.xht
deleted file mode 100644
index 6658033..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-004-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/999_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-004.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-004.xht
deleted file mode 100644
index 3fcc99a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-004.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a nominal value #999999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-004-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #999999 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #999999;
-            }
-            #reference
-            {
-                background-color: #999999;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-005-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-005-ref.xht
deleted file mode 100644
index 271f025..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-005-ref.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  body {background-color: black;}
-
-  p {color: white;}
-
-  div
-  {
-  background: url("support/fefefe_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-005.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-005.xht
deleted file mode 100644
index c499b0c2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-005.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with the maximum minus one value of #fefefe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-005-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #fefefe renders the correct color for the border." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #fefefe;
-            }
-            #reference
-            {
-                background-color: #fefefe;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-006-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-006-ref.xht
deleted file mode 100644
index 54a3f07..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-006-ref.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  body {background-color: black;}
-
-  p {color: white;}
-
-  div
-  {
-  background: url("support/fff_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-006.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-006.xht
deleted file mode 100644
index f201e2c0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-006.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with the maximum value of #ffffff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #ffffff renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #ffffff;
-            }
-            #reference
-            {
-                background-color: #ffffff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-007-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-007-ref.xht
deleted file mode 100644
index 33ec214..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-007-ref.xht
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background-color: black;
-  float: right;
-  height: 1in;
-  width: 1in;
-  }
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if there is a box below.</p>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-007.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-007.xht
deleted file mode 100644
index 559bf165..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-007.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with the maximum plus one value of #1000000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #1000000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #1000000;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-008.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-008.xht
deleted file mode 100644
index 46dcfc9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-008.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with the maximum plus one value of #fgfgfg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #fgfgfg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #fgfgfg;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-009-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-009-ref.xht
deleted file mode 100644
index d29b3cf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-009-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/010000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-009.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-009.xht
deleted file mode 100644
index ce933a7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-009.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a red set to minimum plus one value, #010000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-009-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #010000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #010000;
-            }
-            #reference
-            {
-                background-color: #010000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-010-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-010-ref.xht
deleted file mode 100644
index 1f4e1bb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-010-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background-color: #990000;
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-010.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-010.xht
deleted file mode 100644
index 157bb85..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-010.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a red set to a nominal value, #990000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-01 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-010-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #990000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #990000;
-            }
-            #reference
-            {
-                background-color: #990000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-011-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-011-ref.xht
deleted file mode 100644
index caf4b75..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-011-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/fe0000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-011.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-011.xht
deleted file mode 100644
index 41cdaef..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-011.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a red set to maximum minus one value, #fe0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-011-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #fe0000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #fe0000;
-            }
-            #reference
-            {
-                background-color: #fe0000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-012-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-012-ref.xht
deleted file mode 100644
index 97e1d2d5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-012-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/f00_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-012.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-012.xht
deleted file mode 100644
index d7ee72e9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-012.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a red set to the maximum value, #ff0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #ff0000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #ff0000;
-            }
-            #reference
-            {
-                background-color: #ff0000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-013.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-013.xht
deleted file mode 100644
index 3f1404d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-013.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a red set to the maximum plus one value, #fg0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #fg0000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #fg0000;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-014-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-014-ref.xht
deleted file mode 100644
index 1d6efa8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-014-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/000100_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-014.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-014.xht
deleted file mode 100644
index b301ae0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-014.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a green set to minimum plus one value, #000100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-014-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #000100 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #000100;
-            }
-            #reference
-            {
-                background-color: #000100;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-015-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-015-ref.xht
deleted file mode 100644
index ea5d3664..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-015-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/090_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-015.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-015.xht
deleted file mode 100644
index 266bcf8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-015.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a green set to a nominal value, #009900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-015-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #009900 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #009900;
-            }
-            #reference
-            {
-                background-color: #009900;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-016-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-016-ref.xht
deleted file mode 100644
index ce65cb7b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-016-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/00fe00_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-016.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-016.xht
deleted file mode 100644
index 6285de0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-016.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a green set to maximum minus one value, #00fe00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-016-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #00fe00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #00fe00;
-            }
-            #reference
-            {
-                background-color: #00fe00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-017-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-017-ref.xht
deleted file mode 100644
index 5c86113e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-017-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/0f0_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-017.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-017.xht
deleted file mode 100644
index 55685f8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-017.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a green set to the maximum value, #00ff00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #00ff00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #00ff00;
-            }
-            #reference
-            {
-                background-color: #00ff00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-018.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-018.xht
deleted file mode 100644
index 24e9e46..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-018.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a green set to the maximum plus one value, #00fg00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #00fg00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #00fg00;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-019-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-019-ref.xht
deleted file mode 100644
index 2ed1d89..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-019-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/000001_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-019.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-019.xht
deleted file mode 100644
index b775fd21..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-019.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a blue set to minimum plus one value, #000001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-019-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #000001 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #000001;
-            }
-            #reference
-            {
-                background-color: #000001;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-020-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-020-ref.xht
deleted file mode 100644
index 3678117..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-020-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/009_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-020.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-020.xht
deleted file mode 100644
index b7cbe63..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-020.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a blue set to a nominal value, #000099</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-020-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #000099 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #000099;
-            }
-            #reference
-            {
-                background-color: #000099;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-021-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-021-ref.xht
deleted file mode 100644
index 54e59ec..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-021-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/0000fe_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-021.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-021.xht
deleted file mode 100644
index 5b61cc5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-021.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a blue set to maximum minus one value, #0000fe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-021-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #0000fe renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #0000fe;
-            }
-            #reference
-            {
-                background-color: #0000fe;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-022-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-022-ref.xht
deleted file mode 100644
index 5649a469..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-022-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/00f_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-022.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-022.xht
deleted file mode 100644
index d6e81b5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-022.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a blue set to the maximum value, #0000ff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #0000ff renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #0000ff;
-            }
-            #reference
-            {
-                background-color: #0000ff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-023.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-023.xht
deleted file mode 100644
index f79b7c7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-023.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with six digits with a blue set to the maximum plus one value, #0000fg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #0000fg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #0000fg;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-024.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-024.xht
deleted file mode 100644
index 00537c0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-024.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with 2 digits which is invalid and is equivalent to minimum minus one value for 3 digit hex</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #00;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-025.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-025.xht
deleted file mode 100644
index ff127fb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-025.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with the minimum possible value #000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #000;
-            }
-            #reference
-            {
-                background-color: #000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-026-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-026-ref.xht
deleted file mode 100644
index b0478128..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-026-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/111_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-026.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-026.xht
deleted file mode 100644
index 6b03c4f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-026.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with the minimum plus one value, #111</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-026-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #111 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #111;
-            }
-            #reference
-            {
-                background-color: #111;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-027-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-027-ref.xht
deleted file mode 100644
index 6658033..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-027-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/999_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-027.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-027.xht
deleted file mode 100644
index d50ad62..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-027.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a nominal value #999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-027-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #999 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #999;
-            }
-            #reference
-            {
-                background-color: #999;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-028-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-028-ref.xht
deleted file mode 100644
index e2f0624..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-028-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/eee_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-028.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-028.xht
deleted file mode 100644
index 31fb4c0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-028.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with the maximum minus one value of #eee</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-028-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #eee renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #eee;
-            }
-            #reference
-            {
-                background-color: #eee;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-029.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-029.xht
deleted file mode 100644
index 758e1c7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-029.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with the maximum value of #fff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #fff renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #fff;
-            }
-            #reference
-            {
-                background-color: #fff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-030.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-030.xht
deleted file mode 100644
index bbfdc56..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-030.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with the maximum plus one value of #1000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-transparent-or-black-square-black.xht"/>
-        <link rel="match" href="../reference/ref-transparent-or-black-square-transparent.xht"/>
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #1000 is a transparent dark red square." />
-        <style type="text/css">
-            div.test
-            {
-                border: 5px solid blue;
-                height: 1in;
-                width: 1in;
-            }
-            div.test div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #1000;
-                height: 1in;
-                width: 0;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black or transparent square surrounded by a blue border.</p>
-        <div class="test"><div></div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-031.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-031.xht
deleted file mode 100644
index 340c68d9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-031.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with the maximum plus one value of #ggg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #ggg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #ggg;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-032-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-032-ref.xht
deleted file mode 100644
index 4de6e26..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-032-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/100_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-032.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-032.xht
deleted file mode 100644
index 4c36647..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-032.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a red set to minimum plus one value, #100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-032-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #100 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #100;
-            }
-            #reference
-            {
-                background-color: #100;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-033.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-033.xht
deleted file mode 100644
index 2ac7e710..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-033.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a red set to a nominal value, #900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-010-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #900 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #900;
-            }
-            #reference
-            {
-                background-color: #900;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-034-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-034-ref.xht
deleted file mode 100644
index b42d611..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-034-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/e00_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-034.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-034.xht
deleted file mode 100644
index dd7f9121..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-034.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a red set to maximum minus one value, #e00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-034-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #e00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #e00;
-            }
-            #reference
-            {
-                background-color: #e00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-035.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-035.xht
deleted file mode 100644
index 6861413..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-035.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a red set to the maximum value, #f00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #f00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #f00;
-            }
-            #reference
-            {
-                background-color: #f00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-036.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-036.xht
deleted file mode 100644
index bfb55ce..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-036.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a red set to the maximum plus one value, #g00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #g00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #g00;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-037-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-037-ref.xht
deleted file mode 100644
index c471d6e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-037-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/010_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-037.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-037.xht
deleted file mode 100644
index 2213a09f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-037.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a green set to minimum plus one value, #010</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-037-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #010 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #010;
-            }
-            #reference
-            {
-                background-color: #010;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-038-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-038-ref.xht
deleted file mode 100644
index ea5d3664..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-038-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/090_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-038.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-038.xht
deleted file mode 100644
index 55648d70..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-038.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a green set to a nominal value, #090</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-038-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #090 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #090;
-            }
-            #reference
-            {
-                background-color: #090;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-039-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-039-ref.xht
deleted file mode 100644
index 75d200c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-039-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/0e0_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-039.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-039.xht
deleted file mode 100644
index 45ca2a27..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-039.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a green set to maximum minus one value, #0e0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-039-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #0e0 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #0e0;
-            }
-            #reference
-            {
-                background-color: #0e0;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-040.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-040.xht
deleted file mode 100644
index 21c5dd2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-040.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a green set to the maximum value, #0f0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #0f0 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #0f0;
-            }
-            #reference
-            {
-                background-color: #0f0;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-041.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-041.xht
deleted file mode 100644
index ecbb600..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-041.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a green set to the maximum plus one value, #0g0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #0g0 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #0g0;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-042-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-042-ref.xht
deleted file mode 100644
index c62e0983..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-042-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/001_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-042.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-042.xht
deleted file mode 100644
index aa3e885..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-042.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a blue set to minimum plus one value, #001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-042-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #001 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #001;
-            }
-            #reference
-            {
-                background-color: #001;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-043.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-043.xht
deleted file mode 100644
index 00bd261..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-043.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a blue set to a nominal value, #009</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-020-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #009 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #009;
-            }
-            #reference
-            {
-                background-color: #009;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-044-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-044-ref.xht
deleted file mode 100644
index 935decca..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-044-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/00e_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-044.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-044.xht
deleted file mode 100644
index 514c273..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-044.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a blue set to maximum minus one value, #00e</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-044-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #00e renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #00e;
-            }
-            #reference
-            {
-                background-color: #00e;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-045.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-045.xht
deleted file mode 100644
index 05379e34..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-045.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a blue set to the maximum value, #00f</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to #00f renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #00f;
-            }
-            #reference
-            {
-                background-color: #00f;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-046.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-046.xht
deleted file mode 100644
index 3ec588fc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-046.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to hex with three digits with a blue set to the maximum plus one value, #00g</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-007-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to #00g falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: #00g;
-                height: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a box below.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-047.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-047.xht
deleted file mode 100644
index 7f68609..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-047.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with the minimum minus one value, rgb(-1%, -1%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(-1%, -1%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(-1%, -1%, -1%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-048.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-048.xht
deleted file mode 100644
index dd67378..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-048.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with the minimum value, rgb(0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-049-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-049-ref.xht
deleted file mode 100644
index a1e55f8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-049-ref.xht
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(1%, 1%, 1%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-049.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-049.xht
deleted file mode 100644
index eb1b1679..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-049.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with the minimum plus one value, rgb(1%, 1%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-049-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(1%, 1%, 1%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(1%, 1%, 1%);
-            }
-            #reference
-            {
-                background-color: rgb(1%, 1%, 1%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-050.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-050.xht
deleted file mode 100644
index 2eee1e1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-050.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with the minimum value and minus sign, rgb(-0%, -0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(-0%, -0%, -0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(-0%, -0%, -0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-051.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-051.xht
deleted file mode 100644
index cafa86ef..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-051.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with the minimum value and plus sign, rgb(+0%, +0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+0%, +0%, +0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+0%, +0%, +0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-052-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-052-ref.xht
deleted file mode 100644
index 3eab45d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-052-ref.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-            <div id="upper-square"></div>
-            <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-052.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-052.xht
deleted file mode 100644
index 15aef97..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-052.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with a nominal value, rgb(40%, 40%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-052-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(40%, 40%, 40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(40%, 40%, 40%);
-            }
-            #reference
-            {
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-053.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-053.xht
deleted file mode 100644
index 63c0eaba..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-053.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with a nominal value and a plus sign, rgb(+40%, +40%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-052-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(+40%, +40%, +40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+40%, +40%, +40%);
-            }
-            #reference
-            {
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-054-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-054-ref.xht
deleted file mode 100644
index 1a852854..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-054-ref.xht
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(99%, 99%, 99%);
-               margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-054.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-054.xht
deleted file mode 100644
index 5c36d85..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-054.xht
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with a maximum minus one value, rgb(99%, 99%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-054-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(99%, 99%, 99%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(99%, 99%, 99%);
-            }
-            #reference
-            {
-                background-color: rgb(99%, 99%, 99%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-055.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-055.xht
deleted file mode 100644
index 43c9d48d4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-055.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with a maximum value, rgb(100%, 100%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(100%, 100%, 100%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(100%, 100%, 100%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-056.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-056.xht
deleted file mode 100644
index 58fa4339f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-056.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with plus sign on each maximum value, rgb(+100%, +100%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+100%, +100%, +100%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+100%, +100%, +100%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-057.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-057.xht
deleted file mode 100644
index beee6bf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-057.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with a maximum plus one value, rgb(101%, 101%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-006-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(101%, 101%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(101%, 101%, 101%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-058.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-058.xht
deleted file mode 100644
index 173c5b8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-058.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with the minimum minus one value, rgb(-1, -1, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(-1, -1, -1) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(-1, -1, -1);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-059.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-059.xht
deleted file mode 100644
index f1f7e08..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-059.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with the minimum value, rgb(0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-060.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-060.xht
deleted file mode 100644
index fddadc9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-060.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with the minimum plus one value, rgb(1, 1, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-003-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(1, 1, 1) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(1, 1, 1);
-            }
-            #reference
-            {
-                background-color: rgb(1, 1, 1);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-061.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-061.xht
deleted file mode 100644
index 8ebc0e8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-061.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with the minimum value and minus sign, rgb(-0, -0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(-0, -0, -0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(-0, -0, -0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-062.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-062.xht
deleted file mode 100644
index 61939822..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-062.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with the minimum value and plus sign, rgb(+0, +0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+0, +0, +0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+0, +0, +0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-063-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-063-ref.xht
deleted file mode 100644
index 31fcddc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-063-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/808080_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-063.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-063.xht
deleted file mode 100644
index c7579fe..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-063.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with a nominal value, rgb(128, 128, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-063-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(128, 128, 128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(128, 128, 128);
-            }
-            #reference
-            {
-                background-color: rgb(128, 128, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-064.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-064.xht
deleted file mode 100644
index aa60d72c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-064.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with a nominal value and a plus sign, rgb(+128, +128, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-063-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+128, +128, +128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+128, +128, +128);
-            }
-            #reference
-            {
-                background-color: rgb(128, 128, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-065.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-065.xht
deleted file mode 100644
index b2d44c1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-065.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with a maximum minus one value, rgb(254, 254, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-005-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(254, 254, 254) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(254, 254, 254);
-            }
-            #reference
-            {
-                background-color: rgb(254, 254, 254);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-066.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-066.xht
deleted file mode 100644
index 06b6154d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-066.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with a maximum value, rgb(255, 255, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(255, 255, 255) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(255, 255, 255);
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-067.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-067.xht
deleted file mode 100644
index 969de38ede..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-067.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with a maximum value and a plus sign, rgb(+255, +255, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+255, +255, +255) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+255, +255, +255);
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-068.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-068.xht
deleted file mode 100644
index f5ba1346..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-068.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with a maximum plus one value, rgb(256, 256, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-006-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(256, 256, 256) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(256, 256, 256);
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-069.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-069.xht
deleted file mode 100644
index 89755e42..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-069.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to the minimum minus one value, rgb(-1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(-1%, 0%, 0%) falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(-1%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-070-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-070-ref.xht
deleted file mode 100644
index f0ed168..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-070-ref.xht
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(1%, 0%, 0%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-070.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-070.xht
deleted file mode 100644
index 39fe330..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-070.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to the minimum plus one value, rgb(1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-070-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(1%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(1%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(1%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-071.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-071.xht
deleted file mode 100644
index de7c70a9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-071.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to the minimum value and minus sign, rgb(-0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(-0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(-0%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-072.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-072.xht
deleted file mode 100644
index 2bad196..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-072.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to the minimum value and plus sign, rgb(+0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+0%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-073-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-073-ref.xht
deleted file mode 100644
index a851dd3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-073-ref.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-073.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-073.xht
deleted file mode 100644
index b8a8f62..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-073.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to a nominal value, rgb(40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-073-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(40%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(40%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-074.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-074.xht
deleted file mode 100644
index d541d7b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-074.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to a nominal value with a plus sign, rgb(+40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-073-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(+40%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+40%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-075-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-075-ref.xht
deleted file mode 100644
index c0708eb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-075-ref.xht
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(99%, 0%, 0%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-075.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-075.xht
deleted file mode 100644
index c6b160f5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-075.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to a maximum minus one value, rgb(99%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-075-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(99%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(99%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(99%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-076.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-076.xht
deleted file mode 100644
index 5691834..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-076.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to a maximum value, rgb(100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(100%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(100%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-077.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-077.xht
deleted file mode 100644
index 9350129..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-077.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to a maximum value with a plus sign, rgb(+100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+100%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+100%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-078.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-078.xht
deleted file mode 100644
index a5abe31..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-078.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with red set to a maximum plus one value, rgb(101%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-012-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(101%, 0%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(101%, 0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-079.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-079.xht
deleted file mode 100644
index c9056e5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-079.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to the minimum minus one value, rgb(-1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(-1, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-080.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-080.xht
deleted file mode 100644
index 2ea1e3f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-080.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to the minimum plus one value, rgb(1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-009-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(1, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(1, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(1, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-081.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-081.xht
deleted file mode 100644
index 6ba4a3a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-081.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to the minimum value with a minus sign, rgb(-0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(-0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(-0, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-082.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-082.xht
deleted file mode 100644
index 07a590b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-082.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to the minimum value with a plus sign, rgb(+0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+0, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-083-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-083-ref.xht
deleted file mode 100644
index fcb41f08..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-083-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/800000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-083.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-083.xht
deleted file mode 100644
index 0dcaad55..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-083.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to a nominal value, rgb(128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-083-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(128, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(128, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(128, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-084.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-084.xht
deleted file mode 100644
index cb7939c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-084.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to a nominal value with a plus sign, rgb(+128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-083-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+128, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+128, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(128, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-085.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-085.xht
deleted file mode 100644
index 2bda8e50..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-085.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to a maximum minus one value, rgb(254, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-011-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(254, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(254, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(254, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-086.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-086.xht
deleted file mode 100644
index fc63b36..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-086.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to a maximum value, rgb(255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(255, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(255, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-087.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-087.xht
deleted file mode 100644
index 0ae0d20..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-087.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to a maximum value with a plus sign, rgb(+255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(+255, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(+255, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-088.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-088.xht
deleted file mode 100644
index a8f9944..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-088.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with red set to a maximum plus one value, rgb(256, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-012-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(256, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(256, 0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-089.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-089.xht
deleted file mode 100644
index 80fa717..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-089.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to the minimum minus one value, rgb(0%, -1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, -1%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, -1%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-090-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-090-ref.xht
deleted file mode 100644
index 07a7448..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-090-ref.xht
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 1%, 0%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-090.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-090.xht
deleted file mode 100644
index 7becc80..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-090.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to the minimum plus one value, rgb(0%, 1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-090-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 1%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 1%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 1%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-091.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-091.xht
deleted file mode 100644
index 5a9cf2d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-091.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to the minimum value and minus sign, rgb(0%, -0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, -0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, -0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-092.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-092.xht
deleted file mode 100644
index f58c038..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-092.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to the minimum value and plus sign, rgb(0%, +0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, +0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, +0%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-093-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-093-ref.xht
deleted file mode 100644
index 8a38a2b9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-093-ref.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-093.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-093.xht
deleted file mode 100644
index f1e2138..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-093.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to a nominal value, rgb(0%, 40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-093-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 40%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 40%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-094.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-094.xht
deleted file mode 100644
index ecdc618..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-094.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to a nominal value with a plus sign, rgb(0%, +40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-093-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, +40%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, +40%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-095-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-095-ref.xht
deleted file mode 100644
index 89fbb1e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-095-ref.xht
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 99%, 0%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-095.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-095.xht
deleted file mode 100644
index 9ea964e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-095.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to a maximum minus one value, rgb(0%, 99%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-095-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 99%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 99%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 99%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-096.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-096.xht
deleted file mode 100644
index f4eddd2d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-096.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to a maximum value, rgb(0%, 100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 100%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 100%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-097.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-097.xht
deleted file mode 100644
index 6a2cc7ce..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-097.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to a maximum value with a plus sign, rgb(0%, +100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, +100%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, +100%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-098.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-098.xht
deleted file mode 100644
index d1337ca..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-098.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with green set to a maximum plus one value, rgb(0%, 101%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-017-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 101%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 101%, 0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-099.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-099.xht
deleted file mode 100644
index dc4f071..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-099.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to the minimum minus one value, rgb(0, -1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, -1, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-100-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-100-ref.xht
deleted file mode 100644
index af48ac1d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-100-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background-color: rgb(0, 1, 0);
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-100.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-100.xht
deleted file mode 100644
index 21df7be6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-100.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to the minimum plus one value, rgb(0, 1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-02 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-100-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 1, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 1, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 1, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-101.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-101.xht
deleted file mode 100644
index c16287a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-101.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to the minimum value with a minus sign, rgb(0, -0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, -0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, -0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-102.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-102.xht
deleted file mode 100644
index 431ce5f3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-102.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to the minimum value with a plus sign, rgb(0, +0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, +0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, +0, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-103-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-103-ref.xht
deleted file mode 100644
index 94d16c8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-103-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/008000_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-103.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-103.xht
deleted file mode 100644
index ef6d2e7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-103.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to a nominal value, rgb(0, 128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-103-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 128, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 128, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 128, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-104.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-104.xht
deleted file mode 100644
index 84c1157..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-104.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to a nominal value with a plus sign, rgb(0, +128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-103-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, +128, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, +128, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 128, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-105.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-105.xht
deleted file mode 100644
index d8bf01aa..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-105.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to a maximum minus one value, rgb(0, 254, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-016-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 254, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 254, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 254, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-106.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-106.xht
deleted file mode 100644
index b521a12..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-106.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to a maximum value, rgb(0, 255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 255, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 255, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-107.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-107.xht
deleted file mode 100644
index c57d3e9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-107.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to a maximum value with a plus sign, rgb(0, +255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, +255, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, +255, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-108.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-108.xht
deleted file mode 100644
index 1deacde..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-108.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with green set to a maximum plus one value, rgb(0, 256 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-017-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 256, 0) properly truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 256, 0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-109.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-109.xht
deleted file mode 100644
index 9cb68f1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-109.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to the minimum minus one value, rgb(0%, 0%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, -1%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-110-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-110-ref.xht
deleted file mode 100644
index 7c5049a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-110-ref.xht
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 0%, 1%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-110.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-110.xht
deleted file mode 100644
index 0c967489..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-110.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to the minimum plus one value, rgb(0%, 0%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-110-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, 1%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, 1%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 1%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-111.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-111.xht
deleted file mode 100644
index b92381f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-111.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to the minimum value and minus sign, rgb(0%, 0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, -0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, -0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-112.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-112.xht
deleted file mode 100644
index cc2c354..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-112.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to the minimum value and plus sign, rgb(0%, 0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, +0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, +0%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-113-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-113-ref.xht
deleted file mode 100644
index 4579ac4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-113-ref.xht
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-113.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-113.xht
deleted file mode 100644
index 2162aae..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-113.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to a nominal value, rgb(0%, 0%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-113-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, 40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, 40%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-114.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-114.xht
deleted file mode 100644
index bbccbfc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-114.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to a nominal value with a plus sign, rgb(0%, 0%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-113-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, +40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, +40%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-115-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-115-ref.xht
deleted file mode 100644
index e573484..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-115-ref.xht
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Reftest Reference</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-                background-color: rgb(0%, 0%, 99%);
-                margin-top: 10px;
-            }
-            #upper-square
-            {
-                margin-left: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="upper-square"></div>
-        <div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-115.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-115.xht
deleted file mode 100644
index 7eae3ce..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-115.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to a maximum minus one value, rgb(0%, 0%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-07-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-115-ref.xht"/>
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, 99%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, 99%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 99%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-116.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-116.xht
deleted file mode 100644
index 377ba1a2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-116.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to a maximum value, rgb(0%, 0%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, 100%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, 100%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-117.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-117.xht
deleted file mode 100644
index 72936fc9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-117.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to a maximum value with a plus sign, rgb(0%, 0%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, +100%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, +100%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-118.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-118.xht
deleted file mode 100644
index 5f47801..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-118.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using percentages with blue set to a maximum plus one value, rgb(0%, 0%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-022-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(0%, 0%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0%, 0%, 101%);
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-119.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-119.xht
deleted file mode 100644
index 15a6c38..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-119.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to the minimum minus one value, rgb(0, 0, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, -1) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, -1);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-120.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-120.xht
deleted file mode 100644
index b931421..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-120.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to the minimum plus one value, rgb(0, 0, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-019-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, 1) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, 1);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 1);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-121.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-121.xht
deleted file mode 100644
index 9d6a049..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-121.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to the minimum value with a minus sign, rgb(0, 0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, -0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, -0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-122.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-122.xht
deleted file mode 100644
index d7ed39a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-122.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to the minimum value with a plus sign, rgb(0, 0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, +0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, +0);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-123-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-123-ref.xht
deleted file mode 100644
index b8637fa2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-123-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/000080_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-123.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-123.xht
deleted file mode 100644
index 01d93e0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-123.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to a nominal value, rgb(0, 0, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-right-color-123-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, 128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, 128);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-124.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-124.xht
deleted file mode 100644
index 52641446..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-124.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to a nominal value with a plus sign, rgb(0, 0, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-123-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, +128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, +128);
-                width: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-125.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-125.xht
deleted file mode 100644
index 79f3d8d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-125.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to a maximum minus one value, rgb(0, 0, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-021-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, 254) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, 254);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 254);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-126.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-126.xht
deleted file mode 100644
index e5ad494f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-126.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to a maximum value, rgb(0, 0, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, 255) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, 255);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-127.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-127.xht
deleted file mode 100644
index c8a28124..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-127.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to a maximum value with a plus sign, rgb(0, 0, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, +255) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, +255);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-128.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-128.xht
deleted file mode 100644
index 88f4a4e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-128.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to rgb() using integers with blue set to a maximum plus one value, rgb(0, 0, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-022-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-right-color' set to rgb(0, 0, 256) properly truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: rgb(0, 0, 256);
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-130.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-130.xht
deleted file mode 100644
index b36a02d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-130.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to black</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to black causes the border-right-color of the box to be black." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: black;
-            }
-            #reference
-            {
-                background-color: black;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-131-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-131-ref.xht
deleted file mode 100644
index 28f861b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-131-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/blue15x15.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-131.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-131.xht
deleted file mode 100644
index 6a78aa4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-131.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to blue</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-131-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to blue causes the border-right-color of the box to be blue." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: blue;
-            }
-            #reference
-            {
-                background-color: blue;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-132-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-132-ref.xht
deleted file mode 100644
index 44f62e99..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-132-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/fuchsia_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-132.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-132.xht
deleted file mode 100644
index 0338b8fd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-132.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to fuchsia</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-132-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to fuchsia causes the border-right-color of the box to be fuchsia." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: fuchsia;
-            }
-            #reference
-            {
-                background-color: fuchsia;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-133-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-133-ref.xht
deleted file mode 100644
index f8ff0058..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-133-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/808080_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-133.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-133.xht
deleted file mode 100644
index c9fa8d20..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-133.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to gray</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-133-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to gray causes the border-right-color of the box to be gray." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: gray;
-            }
-            #reference
-            {
-                background-color: gray;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-134-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-134-ref.xht
deleted file mode 100644
index 3b31579..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-134-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/1x1-green.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-134.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-134.xht
deleted file mode 100644
index 06cf78a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-134.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to green</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-134-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to green causes the background of the box to be green." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: green;
-            }
-            #reference
-            {
-                background-color: green;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-135-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-135-ref.xht
deleted file mode 100644
index d2ccb1b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-135-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/1x1-lime.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-135.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-135.xht
deleted file mode 100644
index 3384ba8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-135.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to lime</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-135-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to lime causes the border-right-color of the box to be lime." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: lime;
-            }
-            #reference
-            {
-                background-color: lime;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-136-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-136-ref.xht
deleted file mode 100644
index ad88d9b0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-136-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/maroon_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-136.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-136.xht
deleted file mode 100644
index 181d76b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-136.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to maroon</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-136-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to maroon causes the border-right-color of the box to be maroon." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: maroon;
-            }
-            #reference
-            {
-                background-color: maroon;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-137-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-137-ref.xht
deleted file mode 100644
index 861a21b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-137-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/1x1-navy.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-137.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-137.xht
deleted file mode 100644
index c5b67ca8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-137.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to navy</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-137-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to navy causes the border-right-color of the box to be navy." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: navy;
-            }
-            #reference
-            {
-                background-color: navy;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-138-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-138-ref.xht
deleted file mode 100644
index d51452c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-138-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/olive_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-138.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-138.xht
deleted file mode 100644
index 9805de2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-138.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to olive</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-138-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to olive causes the border-right-color of the box to be olive." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: olive;
-            }
-            #reference
-            {
-                background-color: olive;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-139-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-139-ref.xht
deleted file mode 100644
index d11d799..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-139-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/swatch-orange.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-139.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-139.xht
deleted file mode 100644
index 5c41321..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-139.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to orange</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-139-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to orange causes the border-right-color of the box to be orange." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: orange;
-            }
-            #reference
-            {
-                background-color: orange;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-140-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-140-ref.xht
deleted file mode 100644
index 69f95adc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-140-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/purple_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-140.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-140.xht
deleted file mode 100644
index 9b3af4f8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-140.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to purple</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-140-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to purple causes the border-right-color of the box to be purple." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: purple;
-            }
-            #reference
-            {
-                background-color: purple;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-141-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-141-ref.xht
deleted file mode 100644
index 8fa051b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-141-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/swatch-red.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-141.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-141.xht
deleted file mode 100644
index 3d04bb82..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-141.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to red</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-141-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to red causes the border-right-color of the box to be red." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: red;
-            }
-            #reference
-            {
-                background-color: red;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-142-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-142-ref.xht
deleted file mode 100644
index 82ae509..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-142-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/silver_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-142.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-142.xht
deleted file mode 100644
index 013d4c42..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-142.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to silver</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-142-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to silver causes the border-right-color of the box to be silver." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: silver;
-            }
-            #reference
-            {
-                background-color: silver;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-143-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-143-ref.xht
deleted file mode 100644
index b5927d3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-143-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/teal_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-143.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-143.xht
deleted file mode 100644
index 1f5f9ca..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-143.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to teal</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-143-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to teal causes the border-right-color of the box to be teal." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: teal;
-            }
-            #reference
-            {
-                background-color: teal;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-144-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-144-ref.xht
deleted file mode 100644
index da46e0d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-144-ref.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  body {background-color: black;}
-
-  p {color: white;}
-
-  div
-  {
-  background: url("support/swatch-white.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-144.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-144.xht
deleted file mode 100644
index 0ed2865..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-144.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to white</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-144-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to white causes the border-right-color of the box to be white." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: white;
-            }
-            #reference
-            {
-                background-color: white;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-145-ref.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-145-ref.xht
deleted file mode 100644
index 5c93a0ce..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-145-ref.xht
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head>
-
-  <title>CSS Reftest Reference</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
-  <style type="text/css"><![CDATA[
-  div
-  {
-  background: url("support/yellow_color.png");
-  height: 1in;
-  margin-top: 10px;
-  width: 1in;
-  }
-
-  div#top {margin-left: 1in;}
-  ]]></style>
-
- </head>
-
- <body>
-
-  <p>Test passes if the boxes below are the same color.</p>
-
-  <div id="top"></div>
-
-  <div></div>
-
- </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-145.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-145.xht
deleted file mode 100644
index 436fa7d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-right-color-145.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-right-color set to yellow</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-03 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-right-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-		<link rel="match" href="border-right-color-145-ref.xht" />
-
-        <meta name="assert" content="The 'border-right-color' set to yellow causes the border-right-color of the box to be yellow." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-right-style: solid;
-                border-right-width: 1in;
-                border-right-color: yellow;
-            }
-            #reference
-            {
-                background-color: yellow;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-001.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-001.xht
deleted file mode 100644
index e6c57d1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-001.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with five digits which is invalid and is equivalent to minimum minus one value for six digit hex</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #00000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #00000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-002.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-002.xht
deleted file mode 100644
index a0586e2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-002.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with the minimum value, #000000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #000000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #000000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-003.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-003.xht
deleted file mode 100644
index ed88dab..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-003.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with the minimum plus one value, #010101</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-003-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #010101 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #010101;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #010101;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-004.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-004.xht
deleted file mode 100644
index 1820e18d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-004.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a nominal value #999999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-004-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #999999 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #999999;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #999999;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-005.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-005.xht
deleted file mode 100644
index a4b1cc9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-005.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with the maximum minus one value of #fefefe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-005-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #fefefe renders the correct color for the border." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #fefefe;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #fefefe;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-006.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-006.xht
deleted file mode 100644
index 20211f8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-006.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with the maximum value of #ffffff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #ffffff renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #ffffff;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #ffffff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-007.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-007.xht
deleted file mode 100644
index 09144da..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-007.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with the maximum plus one value of #1000000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #1000000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #1000000;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-008.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-008.xht
deleted file mode 100644
index 5276a60..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-008.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with the maximum plus one value of #fgfgfg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #fgfgfg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #fgfgfg;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-009.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-009.xht
deleted file mode 100644
index 648ca02..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-009.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a red set to minimum plus one value, #010000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-009-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #010000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #010000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #010000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-010.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-010.xht
deleted file mode 100644
index 06fbe25..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-010.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a red set to a nominal value, #990000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-010-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #990000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #990000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #990000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-011.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-011.xht
deleted file mode 100644
index 8375157..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-011.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a red set to maximum minus one value, #fe0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-011-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #fe0000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #fe0000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #fe0000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-012.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-012.xht
deleted file mode 100644
index 32c3617..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-012.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a red set to the maximum value, #ff0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #ff0000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #ff0000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #ff0000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-013.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-013.xht
deleted file mode 100644
index c7cd936..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-013.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a red set to the maximum plus one value, #fg0000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #fg0000 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #fg0000;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-014.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-014.xht
deleted file mode 100644
index a0564b6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-014.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a green set to minimum plus one value, #000100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-014-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #000100 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #000100;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000100;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-015.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-015.xht
deleted file mode 100644
index f58d07b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-015.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a green set to a nominal value, #009900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-015-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #009900 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #009900;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #009900;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-016.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-016.xht
deleted file mode 100644
index 44faf805..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-016.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a green set to maximum minus one value, #00fe00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-016-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #00fe00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #00fe00;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #00fe00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-017.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-017.xht
deleted file mode 100644
index d3432b2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-017.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a green set to the maximum value, #00ff00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #00ff00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #00ff00;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #00ff00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-018.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-018.xht
deleted file mode 100644
index 74b580f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-018.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a green set to the maximum plus one value, #00fg00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #00fg00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #00fg00;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-019.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-019.xht
deleted file mode 100644
index 32f13db9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-019.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a blue set to minimum plus one value, #000001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-019-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #000001 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #000001;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000001;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-020.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-020.xht
deleted file mode 100644
index a94c074..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-020.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a blue set to a nominal value, #000099</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-020-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #000099 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #000099;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000099;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-021.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-021.xht
deleted file mode 100644
index cd69045..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-021.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a blue set to maximum minus one value, #0000fe</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-021-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #0000fe renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #0000fe;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #0000fe;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-022.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-022.xht
deleted file mode 100644
index ad05d5e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-022.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a blue set to the maximum value, #0000ff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #0000ff renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #0000ff;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #0000ff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-023.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-023.xht
deleted file mode 100644
index 3d4f1f3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-023.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with six digits with a blue set to the maximum plus one value, #0000fg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #0000fg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #0000fg;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-024.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-024.xht
deleted file mode 100644
index 1785a0e09..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-024.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with 2 digits which is invalid and is equivalent to minimum minus one value for 3 digit hex</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #00;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-025.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-025.xht
deleted file mode 100644
index bf57265..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-025.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with the minimum possible value #000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #000 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #000;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #000;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-026.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-026.xht
deleted file mode 100644
index 3328cdf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-026.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with the minimum plus one value, #111</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-026-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #111 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #111;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #111;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-027.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-027.xht
deleted file mode 100644
index 3c1e3ef..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-027.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a nominal value #999</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-027-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #999 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #999;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #999;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-028.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-028.xht
deleted file mode 100644
index f5a4014..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-028.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with the maximum minus one value of #eee</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-028-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #eee renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #eee;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #eee;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-029.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-029.xht
deleted file mode 100644
index 82c7777..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-029.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with the maximum value of #fff</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #fff renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #fff;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #fff;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-030.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-030.xht
deleted file mode 100644
index 260ba20..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-030.xht
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with the maximum plus one value of #1000</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-transparent-or-black-square-black.xht"/>
-        <link rel="match" href="../reference/ref-transparent-or-black-square-transparent.xht"/>
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #1000 is a transparent dark red square." />
-        <style type="text/css">
-            div.test
-            {
-                border: 5px solid blue;
-                height: 1in;
-                width: 1in;
-            }
-            div.test div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #1000;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black or transparent square surrounded by a blue border.</p>
-        <div class="test"><div></div></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-031.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-031.xht
deleted file mode 100644
index 7473b23a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-031.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with the maximum plus one value of #ggg</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #ggg falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #ggg;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-032.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-032.xht
deleted file mode 100644
index be58b93..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-032.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a red set to minimum plus one value, #100</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-032-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #100 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #100;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #100;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-033.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-033.xht
deleted file mode 100644
index 4769d075b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-033.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a red set to a nominal value, #900</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-010-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #900 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #900;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #900;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-034.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-034.xht
deleted file mode 100644
index f7a6214..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-034.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a red set to maximum minus one value, #e00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-034-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #e00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #e00;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #e00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-035.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-035.xht
deleted file mode 100644
index 906a8fe..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-035.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a red set to the maximum value, #f00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #f00 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #f00;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #f00;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-036.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-036.xht
deleted file mode 100644
index d5e1636a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-036.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a red set to the maximum plus one value, #g00</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #g00 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #g00;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-037.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-037.xht
deleted file mode 100644
index 72e4cf8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-037.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a green set to minimum plus one value, #010</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-037-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #010 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #010;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #010;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-038.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-038.xht
deleted file mode 100644
index be42ca4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-038.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a green set to a nominal value, #090</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-038-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #090 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #090;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #090;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-039.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-039.xht
deleted file mode 100644
index 85ffdd2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-039.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a green set to maximum minus one value, #0e0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-039-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #0e0 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #0e0;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #0e0;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-040.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-040.xht
deleted file mode 100644
index 75c8eedb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-040.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a green set to the maximum value, #0f0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #0f0 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #0f0;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #0f0;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-041.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-041.xht
deleted file mode 100644
index 7747250..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-041.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a green set to the maximum plus one value, #0g0</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #0g0 falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #0g0;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-042.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-042.xht
deleted file mode 100644
index d842707..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-042.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a blue set to minimum plus one value, #001</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-042-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #001 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #001;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #001;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-043.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-043.xht
deleted file mode 100644
index e880ebe..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-043.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a blue set to a nominal value, #009</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-020-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #009 renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #009;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #009;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-044.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-044.xht
deleted file mode 100644
index e477769..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-044.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a blue set to maximum minus one value, #00e</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-044-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #00e renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #00e;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #00e;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-045.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-045.xht
deleted file mode 100644
index 2278178..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-045.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a blue set to the maximum value, #00f</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to #00f renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #00f;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: #00f;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-046.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-046.xht
deleted file mode 100644
index 6cbb483a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-046.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to hex with three digits with a blue set to the maximum plus one value, #00g</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="../reference/ref-filled-black-96px-square.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to #00g falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: #00g;
-                height: 0;
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled black square.</p>
-        <div></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-047.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-047.xht
deleted file mode 100644
index b8c46a7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-047.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with the minimum minus one value, rgb(-1%, -1%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(-1%, -1%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(-1%, -1%, -1%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-048.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-048.xht
deleted file mode 100644
index 97fac87b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-048.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with the minimum value, rgb(0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-049.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-049.xht
deleted file mode 100644
index b2504d2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-049.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with the minimum plus one value, rgb(1%, 1%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-049-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(1%, 1%, 1%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(1%, 1%, 1%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(1%, 1%, 1%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-050.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-050.xht
deleted file mode 100644
index 864b6131..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-050.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with the minimum value and minus sign, rgb(-0%, -0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(-0%, -0%, -0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(-0%, -0%, -0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-051.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-051.xht
deleted file mode 100644
index ed5b7e59..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-051.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with the minimum value and plus sign, rgb(+0%, +0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+0%, +0%, +0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+0%, +0%, +0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-052.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-052.xht
deleted file mode 100644
index c762d23..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-052.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with a nominal value, rgb(40%, 40%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-052-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(40%, 40%, 40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(40%, 40%, 40%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-053.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-053.xht
deleted file mode 100644
index df03a90..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-053.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with a nominal value and a plus sign, rgb(+40%, +40%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-052-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(+40%, +40%, +40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+40%, +40%, +40%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(40%, 40%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-054.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-054.xht
deleted file mode 100644
index 26fabdbf..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-054.xht
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with a maximum minus one value, rgb(99%, 99%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-054-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(99%, 99%, 99%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(99%, 99%, 99%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(99%, 99%, 99%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-055.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-055.xht
deleted file mode 100644
index 2e7d05c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-055.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with a maximum value, rgb(100%, 100%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(100%, 100%, 100%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(100%, 100%, 100%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-056.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-056.xht
deleted file mode 100644
index 346f51e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-056.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with plus sign on each maximum value, rgb(+100%, +100%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+100%, +100%, +100%) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+100%, +100%, +100%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-057.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-057.xht
deleted file mode 100644
index b4ddb79..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-057.xht
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with a maximum plus one value, rgb(101%, 101%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(101%, 101%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(101%, 101%, 101%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 100%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-058.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-058.xht
deleted file mode 100644
index 2a7a298..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-058.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with the minimum minus one value, rgb(-1, -1, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(-1, -1, -1) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(-1, -1, -1);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-059.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-059.xht
deleted file mode 100644
index 76244e57..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-059.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with the minimum value, rgb(0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-060.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-060.xht
deleted file mode 100644
index bfb3102..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-060.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with the minimum plus one value, rgb(1, 1, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-26 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-003-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(1, 1, 1) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(1, 1, 1);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(1, 1, 1);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-061.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-061.xht
deleted file mode 100644
index 40dd776..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-061.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with the minimum value and minus sign, rgb(-0, -0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(-0, -0, -0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(-0, -0, -0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-062.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-062.xht
deleted file mode 100644
index 95994d2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-062.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with the minimum value and plus sign, rgb(+0, +0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+0, +0, +0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+0, +0, +0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-063.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-063.xht
deleted file mode 100644
index c64dcdd6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-063.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with a nominal value, rgb(128, 128, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-063-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(128, 128, 128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(128, 128, 128);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(128, 128, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-064.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-064.xht
deleted file mode 100644
index 815ea1b1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-064.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with a nominal value and a plus sign, rgb(+128, +128, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-063-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+128, +128, +128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+128, +128, +128);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(128, 128, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-065.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-065.xht
deleted file mode 100644
index 1678fe4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-065.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with a maximum minus one value, rgb(254, 254, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-005-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(254, 254, 254) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(254, 254, 254);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(254, 254, 254);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-066.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-066.xht
deleted file mode 100644
index dbd5d20..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-066.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with a maximum value, rgb(255, 255, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(255, 255, 255) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(255, 255, 255);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-067.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-067.xht
deleted file mode 100644
index c1d7132..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-067.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with a maximum value and a plus sign, rgb(+255, +255, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+255, +255, +255) renders the correct color." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+255, +255, +255);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-068.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-068.xht
deleted file mode 100644
index e156363..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-068.xht
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with a maximum plus one value, rgb(256, 256, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-006-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(256, 256, 256) truncates to a valid value." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(256, 256, 256);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 255, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-069.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-069.xht
deleted file mode 100644
index 16b97eb..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-069.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to the minimum minus one value, rgb(-1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(-1%, 0%, 0%) falls back to the initial value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(-1%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-070.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-070.xht
deleted file mode 100644
index 89af64e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-070.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to the minimum plus one value, rgb(1%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-070-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(1%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(1%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(1%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-071.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-071.xht
deleted file mode 100644
index 77026543..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-071.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to the minimum value and minus sign, rgb(-0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(-0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(-0%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-072.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-072.xht
deleted file mode 100644
index 59804267..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-072.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to the minimum value and plus sign, rgb(+0%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+0%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+0%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-073.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-073.xht
deleted file mode 100644
index 2cad359..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-073.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to a nominal value, rgb(40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-073-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(40%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(40%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-074.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-074.xht
deleted file mode 100644
index 1930873..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-074.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to a nominal value with a plus sign, rgb(+40%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-073-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(+40%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+40%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(40%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-075.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-075.xht
deleted file mode 100644
index fe12a26..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-075.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to a maximum minus one value, rgb(99%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-075-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(99%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(99%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(99%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-076.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-076.xht
deleted file mode 100644
index 7bcb581..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-076.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to a maximum value, rgb(100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(100%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(100%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-077.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-077.xht
deleted file mode 100644
index c0efd26..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-077.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to a maximum value with a plus sign, rgb(+100%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+100%, 0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+100%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-078.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-078.xht
deleted file mode 100644
index 9e67512..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-078.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with red set to a maximum plus one value, rgb(101%, 0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(101%, 0%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(101%, 0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(100%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-079.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-079.xht
deleted file mode 100644
index 13e29bb0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-079.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to the minimum minus one value, rgb(-1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(-1, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-080.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-080.xht
deleted file mode 100644
index d623aa5c..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-080.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to the minimum plus one value, rgb(1, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-009-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(1, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(1, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(1, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-081.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-081.xht
deleted file mode 100644
index 4fa97584..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-081.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to the minimum value with a minus sign, rgb(-0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(-0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(-0, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-082.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-082.xht
deleted file mode 100644
index 9e31b55d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-082.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to the minimum value with a plus sign, rgb(+0, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+0, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+0, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-083.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-083.xht
deleted file mode 100644
index ef43650..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-083.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to a nominal value, rgb(128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-083-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(128, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(128, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(128, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-084.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-084.xht
deleted file mode 100644
index 0a0ebf06..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-084.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to a nominal value with a plus sign, rgb(+128, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-083-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+128, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+128, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(128, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-085.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-085.xht
deleted file mode 100644
index a994641..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-085.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to a maximum minus one value, rgb(254, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-011-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(254, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(254, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(254, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-086.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-086.xht
deleted file mode 100644
index 8ccb35d3..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-086.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to a maximum value, rgb(255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(255, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(255, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-087.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-087.xht
deleted file mode 100644
index 64212bda..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-087.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to a maximum value with a plus sign, rgb(+255, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(+255, 0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(+255, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-088.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-088.xht
deleted file mode 100644
index d8d06a4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-088.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with red set to a maximum plus one value, rgb(256, 0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-012-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(256, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(256, 0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(255, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-089.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-089.xht
deleted file mode 100644
index 78e7a18..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-089.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to the minimum minus one value, rgb(0%, -1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, -1%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, -1%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-090.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-090.xht
deleted file mode 100644
index fe013a4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-090.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to the minimum plus one value, rgb(0%, 1%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-090-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 1%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 1%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 1%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-091.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-091.xht
deleted file mode 100644
index b590c99..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-091.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to the minimum value and minus sign, rgb(0%, -0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, -0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, -0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-092.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-092.xht
deleted file mode 100644
index 2b065a1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-092.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to the minimum value and plus sign, rgb(0%, +0%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, +0%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, +0%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-093.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-093.xht
deleted file mode 100644
index 62793e35..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-093.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to a nominal value, rgb(0%, 40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-093-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 40%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 40%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-094.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-094.xht
deleted file mode 100644
index abdaab86..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-094.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to a nominal value with a plus sign, rgb(0%, +40%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-093-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, +40%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, +40%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 40%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-095.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-095.xht
deleted file mode 100644
index 3e506b7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-095.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to a maximum minus one value, rgb(0%, 99%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-095-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 99%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 99%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 99%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-096.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-096.xht
deleted file mode 100644
index d404742..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-096.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to a maximum value, rgb(0%, 100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 100%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 100%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-097.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-097.xht
deleted file mode 100644
index c9522e10..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-097.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to a maximum value with a plus sign, rgb(0%, +100%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, +100%, 0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, +100%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-098.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-098.xht
deleted file mode 100644
index 6e338aa..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-098.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with green set to a maximum plus one value, rgb(0%, 101%, 0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 101%, 0%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 101%, 0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 100%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-099.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-099.xht
deleted file mode 100644
index 0b293b1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-099.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to the minimum minus one value, rgb(0, -1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(-1, 0, 0) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, -1, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-100.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-100.xht
deleted file mode 100644
index 15a5c0d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-100.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to the minimum plus one value, rgb(0, 1, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-100-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 1, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 1, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 1, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-101.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-101.xht
deleted file mode 100644
index 3c177a1..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-101.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to the minimum value with a minus sign, rgb(0, -0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, -0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, -0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-102.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-102.xht
deleted file mode 100644
index d47febcc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-102.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to the minimum value with a plus sign, rgb(0, +0, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, +0, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, +0, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-103.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-103.xht
deleted file mode 100644
index 0c5ca24..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-103.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to a nominal value, rgb(0, 128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-103-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 128, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 128, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 128, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-104.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-104.xht
deleted file mode 100644
index eece759..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-104.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to a nominal value with a plus sign, rgb(0, +128, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-103-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, +128, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, +128, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 128, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-105.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-105.xht
deleted file mode 100644
index 15d8940..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-105.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to a maximum minus one value, rgb(0, 254, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-016-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 254, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 254, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 254, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-106.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-106.xht
deleted file mode 100644
index a5ecaab..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-106.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to a maximum value, rgb(0, 255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 255, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 255, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-107.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-107.xht
deleted file mode 100644
index 06997f0f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-107.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to a maximum value with a plus sign, rgb(0, +255, 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, +255, 0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, +255, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-108.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-108.xht
deleted file mode 100644
index cc32b63..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-108.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with green set to a maximum plus one value, rgb(0, 256 0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-017-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 256, 0) properly truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 256, 0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 255, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-109.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-109.xht
deleted file mode 100644
index 1652b30..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-109.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to the minimum minus one value, rgb(0%, 0%, -1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, -1%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, -1%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-110.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-110.xht
deleted file mode 100644
index e9b0dc2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-110.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to the minimum plus one value, rgb(0%, 0%, 1%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-110-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, 1%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, 1%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 1%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-111.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-111.xht
deleted file mode 100644
index a0dcfe0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-111.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to the minimum value and minus sign, rgb(0%, 0%, -0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, -0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, -0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-112.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-112.xht
deleted file mode 100644
index 52702850..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-112.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to the minimum value and plus sign, rgb(0%, 0%, +0%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, +0%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, +0%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 0%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-113.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-113.xht
deleted file mode 100644
index fe70f53..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-113.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to a nominal value, rgb(0%, 0%, 40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-113-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, 40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, 40%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-114.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-114.xht
deleted file mode 100644
index 4983c20..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-114.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to a nominal value with a plus sign, rgb(0%, 0%, +40%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-05-17 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-113-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, +40%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, +40%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 40%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-115.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-115.xht
deleted file mode 100644
index a81edd4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-115.xht
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to a maximum minus one value, rgb(0%, 0%, 99%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com" /> <!-- converted to reftest 01-08-2013 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-115-ref.xht"/>
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, 99%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, 99%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 99%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-116.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-116.xht
deleted file mode 100644
index 056b3d948..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-116.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to a maximum value, rgb(0%, 0%, 100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, 100%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, 100%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-117.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-117.xht
deleted file mode 100644
index 64a0a73a8..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-117.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to a maximum value with a plus sign, rgb(0%, 0%, +100%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, +100%) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, +100%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-118.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-118.xht
deleted file mode 100644
index ac5a7c6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-118.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using percentages with blue set to a maximum plus one value, rgb(0%, 0%, 101%)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(0%, 0%, 101%) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0%, 0%, 101%);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0%, 0%, 100%);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-119.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-119.xht
deleted file mode 100644
index 301c615..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-119.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to the minimum minus one value, rgb(0, 0, -1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, -1) truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, -1);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-120.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-120.xht
deleted file mode 100644
index a39c1f0..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-120.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to the minimum plus one value, rgb(0, 0, 1)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-019-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, 1) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, 1);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 1);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-121.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-121.xht
deleted file mode 100644
index 6777c26..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-121.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to the minimum value with a minus sign, rgb(0, 0, -0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, -0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, -0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-122.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-122.xht
deleted file mode 100644
index fb58975..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-122.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to the minimum value with a plus sign, rgb(0, 0, +0)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, +0) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, +0);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 0);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-123.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-123.xht
deleted file mode 100644
index 0bc975a..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-123.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to a nominal value, rgb(0, 0, 128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-123-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, 128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, 128);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-124.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-124.xht
deleted file mode 100644
index 904193d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-124.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to a nominal value with a plus sign, rgb(0, 0, +128)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-11-21 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-123-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, +128) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, +128);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 128);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-125.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-125.xht
deleted file mode 100644
index a3d4dcd..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-125.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to a maximum minus one value, rgb(0, 0, 254)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-021-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, 254) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, 254);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 254);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-126.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-126.xht
deleted file mode 100644
index a4ce60b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-126.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to a maximum value, rgb(0, 0, 255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, 255) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, 255);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-127.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-127.xht
deleted file mode 100644
index e2962c0b..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-127.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to a maximum value with a plus sign, rgb(0, 0, +255)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, +255) renders the correct color." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, +255);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-128.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-128.xht
deleted file mode 100644
index 5c6506c9..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-128.xht
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to rgb() using integers with blue set to a maximum plus one value, rgb(0, 0, 256)</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-022-ref.xht" />
-
-        <meta name="flags" content="invalid" />
-        <meta name="assert" content="The 'border-top-color' set to rgb(0, 0, 256) properly truncates to a valid value." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: rgb(0, 0, 256);
-                height: 0;
-            }
-            #reference
-            {
-                background-color: rgb(0, 0, 255);
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-130.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-130.xht
deleted file mode 100644
index 467b411..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-130.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to black</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-001-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to black causes the border-top-color of the box to be black." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: black;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: black;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-131.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-131.xht
deleted file mode 100644
index fd43bab6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-131.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to blue</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-131-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to blue causes the border-top-color of the box to be blue." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: blue;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: blue;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-132.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-132.xht
deleted file mode 100644
index dabc5cc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-132.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to fuchsia</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-132-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to fuchsia causes the border-top-color of the box to be fuchsia." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: fuchsia;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: fuchsia;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-133.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-133.xht
deleted file mode 100644
index 3ede926..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-133.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to gray</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-133-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to gray causes the border-top-color of the box to be gray." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: gray;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: gray;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-134.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-134.xht
deleted file mode 100644
index 32586f2..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-134.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to green</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-134-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to green causes the background of the box to be green." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: green;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: green;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-135.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-135.xht
deleted file mode 100644
index 44b64f6..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-135.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to lime</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-135-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to lime causes the border-top-color of the box to be lime." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: lime;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: lime;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-136.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-136.xht
deleted file mode 100644
index 5e03740..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-136.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to maroon</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-136-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to maroon causes the border-top-color of the box to be maroon." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: maroon;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: maroon;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-137.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-137.xht
deleted file mode 100644
index 175ca69..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-137.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to navy</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-137-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to navy causes the border-top-color of the box to be navy." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: navy;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: navy;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-138.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-138.xht
deleted file mode 100644
index 853b02e..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-138.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to olive</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-138-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to olive causes the border-top-color of the box to be olive." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: olive;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: olive;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-139.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-139.xht
deleted file mode 100644
index b78baed..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-139.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to orange</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-139-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to orange causes the border-top-color of the box to be orange." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: orange;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: orange;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-140.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-140.xht
deleted file mode 100644
index d738cfc..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-140.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to purple</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-140-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to purple causes the border-top-color of the box to be purple." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: purple;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: purple;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-141.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-141.xht
deleted file mode 100644
index 6b9d033..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-141.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to red</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-141-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to red causes the border-top-color of the box to be red." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: red;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: red;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-142.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-142.xht
deleted file mode 100644
index ba90093f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-142.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to silver</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-142-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to silver causes the border-top-color of the box to be silver." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: silver;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: silver;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-143.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-143.xht
deleted file mode 100644
index a6b9a39..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-143.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to teal</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-143-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to teal causes the border-top-color of the box to be teal." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: teal;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: teal;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-144.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-144.xht
deleted file mode 100644
index 589c6c4..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-144.xht
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to white</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-144-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to white causes the border-top-color of the box to be white." />
-        <style type="text/css">
-            body
-            {
-                background-color: black;
-            }
-            p
-            {
-                color: white;
-            }
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: white;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: white;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-145.xht b/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-145.xht
deleted file mode 100644
index 04f2aea5..0000000
--- a/third_party/blink/web_tests/external/wpt/css/CSS2/borders/border-top-color-145.xht
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Border-top-color set to yellow</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-05-27 -->
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#propdef-border-top-color" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#border-color-properties" />
-        <link rel="match" href="border-bottom-color-145-ref.xht" />
-
-        <meta name="assert" content="The 'border-top-color' set to yellow causes the border-top-color of the box to be yellow." />
-        <style type="text/css">
-            div
-            {
-                height: 1in;
-                width: 1in;
-            }
-            #test
-            {
-                border-top-style: solid;
-                border-top-width: 1in;
-                border-top-color: yellow;
-                height: 0;
-            }
-            #reference
-            {
-                background-color: yellow;
-                margin-top: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if the boxes below are the same color.</p>
-        <div id="test"></div>
-        <div id="reference"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/css-anchor-position/idlharness-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-anchor-position/idlharness-expected.txt
new file mode 100644
index 0000000..2417c44
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-anchor-position/idlharness-expected.txt
@@ -0,0 +1,19 @@
+This is a testharness.js-based test.
+[FAIL] CSSPositionTryRule interface: existence and properties of interface object
+  assert_own_property: self does not have own property "CSSPositionTryRule" expected property "CSSPositionTryRule" missing
+[FAIL] CSSPositionTryRule interface object length
+  assert_own_property: self does not have own property "CSSPositionTryRule" expected property "CSSPositionTryRule" missing
+[FAIL] CSSPositionTryRule interface object name
+  assert_own_property: self does not have own property "CSSPositionTryRule" expected property "CSSPositionTryRule" missing
+[FAIL] CSSPositionTryRule interface: existence and properties of interface prototype object
+  assert_own_property: self does not have own property "CSSPositionTryRule" expected property "CSSPositionTryRule" missing
+[FAIL] CSSPositionTryRule interface: existence and properties of interface prototype object's "constructor" property
+  assert_own_property: self does not have own property "CSSPositionTryRule" expected property "CSSPositionTryRule" missing
+[FAIL] CSSPositionTryRule interface: existence and properties of interface prototype object's @@unscopables property
+  assert_own_property: self does not have own property "CSSPositionTryRule" expected property "CSSPositionTryRule" missing
+[FAIL] CSSPositionTryRule interface: attribute name
+  assert_own_property: self does not have own property "CSSPositionTryRule" expected property "CSSPositionTryRule" missing
+[FAIL] CSSPositionTryRule interface: attribute style
+  assert_own_property: self does not have own property "CSSPositionTryRule" expected property "CSSPositionTryRule" missing
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/css/css-borders/META.yml b/third_party/blink/web_tests/external/wpt/css/css-borders/META.yml
new file mode 100644
index 0000000..e1ef6851
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-borders/META.yml
@@ -0,0 +1,5 @@
+spec: https://drafts.csswg.org/css-borders/
+suggested_reviewers:
+  - dbaron
+  - fantasai
+  - SebastianZ
diff --git a/third_party/blink/web_tests/external/wpt/css/css-fonts/idlharness-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-fonts/idlharness-expected.txt
index f13cbb2c..92fd02c4 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-fonts/idlharness-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/css/css-fonts/idlharness-expected.txt
@@ -1,4 +1,5 @@
 This is a testharness.js-based test.
+Found 22 FAIL, 0 TIMEOUT, 0 NOTRUN.
 [FAIL] CSSFontFeatureValuesRule interface: existence and properties of interface object
   assert_own_property: self does not have own property "CSSFontFeatureValuesRule" expected property "CSSFontFeatureValuesRule" missing
 [FAIL] CSSFontFeatureValuesRule interface object length
@@ -25,6 +26,8 @@
   assert_own_property: self does not have own property "CSSFontFeatureValuesRule" expected property "CSSFontFeatureValuesRule" missing
 [FAIL] CSSFontFeatureValuesRule interface: attribute styleset
   assert_own_property: self does not have own property "CSSFontFeatureValuesRule" expected property "CSSFontFeatureValuesRule" missing
+[FAIL] CSSFontFeatureValuesRule interface: attribute historicalForms
+  assert_own_property: self does not have own property "CSSFontFeatureValuesRule" expected property "CSSFontFeatureValuesRule" missing
 [FAIL] CSSFontFeatureValuesMap interface: existence and properties of interface object
   assert_own_property: self does not have own property "CSSFontFeatureValuesMap" expected property "CSSFontFeatureValuesMap" missing
 [FAIL] CSSFontFeatureValuesMap interface object length
diff --git a/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-001-ref.html b/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-001-ref.html
new file mode 100644
index 0000000..a3705965
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-001-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<link rel="author" title="David Shin" href="dshin@mozilla.com">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1879731">
+<style>
+table {
+  border-collapse: collapse;
+}
+
+.group {
+  border-left: 1px solid black;
+  border-right: 3px solid black;
+}
+</style>
+<table>
+  <tbody id="table">
+    <tr><td class="group">X</td></tr>
+    <tr><td>X</td></tr>
+    <tr><td>X</td></tr>
+  </tbody>
+</table>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-001.html b/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-001.html
new file mode 100644
index 0000000..67330e4
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-001.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="author" title="David Shin" href="dshin@mozilla.com">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1879731">
+<link rel="match" href="collapsed-border-partial-invalidation-001-ref.html">
+<meta name="assert" content="Invalidating part of a border-collapsed table keeps border styling correctly.">
+<style>
+table {
+  border-collapse: collapse;
+}
+
+.group {
+  border-left: 1px solid black;
+  border-right: 3px solid black;
+}
+</style>
+<table>
+  <tbody id="table">
+    <tr><td class="group">X</td></tr>
+    <tr><td>X</td></tr>
+  </tbody>
+</table>
+
+<script>
+onload = function () {
+  // Make sure the table layout is flushed
+  table.getBoundingClientRect();
+  const tr = document.createElement('tr');
+  const td = document.createElement('td');
+  td.innerText = "X";
+  tr.appendChild(td);
+  table.appendChild(tr);
+  document.documentElement.className = "";
+}
+</script>
+</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-002-ref.html b/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-002-ref.html
new file mode 100644
index 0000000..d89389a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-002-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="David Shin" href="dshin@mozilla.com">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1879731">
+<style>
+table {
+  border-collapse: collapse;
+}
+
+.group {
+  border-top: 1px solid black;
+  border-bottom: 3px solid black;
+}
+</style>
+<table>
+  <tr id="row"><td class="group">X</td><td>X</td><td>X</td><td class="group">X</td></tr>
+</table>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-002.html b/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-002.html
new file mode 100644
index 0000000..e482719
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-tables/collapsed-border-partial-invalidation-002.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="author" title="David Shin" href="dshin@mozilla.com">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1879731">
+<link rel="match" href="collapsed-border-partial-invalidation-002-ref.html">
+<meta name="assert" content="Invalidating part of a border-collapsed table keeps border styling correctly.">
+<style>
+table {
+  border-collapse: collapse;
+}
+
+.group {
+  border-top: 1px solid black;
+  border-bottom: 3px solid black;
+}
+</style>
+<table id="table">
+  <tr id="row"><td class="group">X</td><td>X</td><td id="last" class="group">X</td></tr>
+</table>
+<script>
+onload = function () {
+  // Make sure the table layout is flushed
+  table.getBoundingClientRect();
+  let td = document.createElement('td');
+  td.innerText = "X";
+  // Requring #last is an unfortunate side effect of bug 1880560.
+  last.before(td);
+  document.documentElement.className = "";
+}
+</script>
+</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-tables/tentative/padding-percentage.html b/third_party/blink/web_tests/external/wpt/css/css-tables/tentative/padding-percentage.html
new file mode 100644
index 0000000..67f8009
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-tables/tentative/padding-percentage.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  When a table cell has a percentage in the inline axis of the table,
+  it should resolve against zero when computing the column sizes,
+  but once we know the final size of the table, it should re-resolve
+  against that size minus the leading and trailing border spacing.
+  This matches what Blink and Gecko do (WebKit is different).
+
+  Note that Blink and Gecko disagree in case there is a caption:
+  Blink still behaves as per above, while Gecko re-resolves against
+  the sum of column sizes plus the interleaved border spacings.
+  Due to the lack of interoperability, this test doesn't use captions.
+">
+
+<style>
+table {
+  border-spacing: 10px 0;
+}
+td {
+  padding: 0;
+}
+td > div {
+  width: 100px;
+  height: 25px;
+  background: red;
+}
+td > div.green {
+  position: relative;
+  background: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<!--
+There is one column, it's 100px wide. The percentage resolves against
+that amount, so the padding becomes 100px.
+There is an extra spacing of 10px before the 1st column,
+that's why the table has a -110px margin.
+-->
+<table style="margin-left: -110px">
+  <td style="padding-left: 100%">
+    <div class="green"></div>
+  </td>
+</table>
+
+<!--
+The 1st column is 110px wide, the 2nd column is 100px wide.
+And they are separated by 10px, so that's a total of 220px.
+The percentage resolves against that amount, so the padding
+becomes 0.5 * 220px + 10px = 120px.
+There is an extra spacing of 10px before the 1st column,
+that's why the table has a -130px margin.
+-->
+<table style="margin-left: -130px">
+  <td style="padding-left: calc(50% + 10px)">
+    <div class="green"></div>
+  </td>
+  <td>
+    <div></div>
+  </td>
+</table>
+
+<!--
+There are 3 columns, each one is 100px wide. They are separated by 10px,
+so that's a total of 100px * 3 + 10px * 2 = 320px.
+The percentage resolves against that amount, so the padding becomes
+320px - 100px = 220px.
+There is an extra spacing of 10px before the 1st column,
+that's why the table has a -230px margin.
+-->
+<table style="margin-left: -230px">
+  <td style="padding-left: calc(100% - 100px)">
+    <div class="green"></div>
+  </td>
+  <td>
+    <div></div>
+  </td>
+  <td>
+    <div></div>
+  </td>
+</table>
+
+<!--
+There are 4 columns, the 1st one is 330px wide, each one of the others
+is 100px wide. They are separated by 10px, so that's a total of
+330px + 100px * 3 + 10px * 3 = 660px.
+The percentage resolves against that amount, so the padding becomes
+0.5 * 660px + 230px = 560px.
+There is an extra spacing of 10px before the 1st column,
+that's why the table has a -570px margin.
+-->
+<table style="margin-left: -570px">
+  <td style="padding-left: calc(50% + 230px)">
+    <div class="green"></div>
+  </td>
+  <td>
+    <div></div>
+  </td>
+  <td>
+    <div></div>
+  </td>
+  <td>
+    <div></div>
+  </td>
+</table>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-001-ref.html b/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-001-ref.html
new file mode 100644
index 0000000..476e33750
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-001-ref.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<style>
+body {
+  background: #f3f5f6;
+}
+
+div {
+  font-size: 15px;
+  --width: 401px;
+  width: var(--width);
+  margin: 20px;
+  background: #fff;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+b {
+  height: 50px;
+  background: red;
+  width: calc((var(--width) - 4.5em) / 4); /* .5em gutters */
+}
+
+b:not(:last-child) {
+  margin-right: 1.5em;
+}
+</style>
+<div><b></b><b></b><b></b><b></b></div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-001.html b/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-001.html
index dfd03a69..46ea2eb 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-001.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-001.html
@@ -9,8 +9,7 @@
 <link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
 <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1323735">
 <link rel="help" href="https://drafts.csswg.org/css-values/#funcdef-calc">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
+<link rel="match" href="calc-rounding-001-ref.html">
 <style>
 body {
   background: #f3f5f6;
@@ -36,8 +35,3 @@
 }
 </style>
 <div><b></b><b></b><b></b><b></b></div>
-<script>
-  test(function() {
-    assert_equals(document.querySelector("div").offsetHeight, 50);
-  }, "calc() doesn't accumulate much error that makes flex items overflow");
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-002-ref.html b/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-002-ref.html
new file mode 100644
index 0000000..a2e9fd0
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-002-ref.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<style>
+* {
+  box-sizing: border-box;
+}
+:root {
+  font-family: sans-serif;
+}
+.parent {
+  display: inline-flex;
+  --addon-size: 1rem;
+}
+.child {
+  min-width: 0;
+  display: inline-flex;
+}
+.overflow {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.addon-child {
+  display: inline-flex;
+  width: var(--addon-size);
+}
+span {
+  outline: 1px dashed red;
+  outline-offset: -1px;
+}
+p > span > span {
+  padding: .5rem .25rem;
+}
+</style>
+<p><span class="parent"><span class="child"><span class="overflow">iiiiiiiiiiiii</span></span><span class="addon-child"></span></span></p>
+<p><span class="parent"><span class="child"><span class="overflow">iiiiiiiiiiiiii</span></span><span class="addon-child"></span></span></p>
+<p><span class="parent"><span class="child"><span class="overflow">iiiiiiiiiiiiiii</span></span><span class="addon-child"></span></span></p>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-002.html b/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-002.html
new file mode 100644
index 0000000..32c4a75
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-values/calc-rounding-002.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<meta charset="utf-8">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1881220">
+<link rel="help" href="https://drafts.csswg.org/css-values/#funcdef-calc">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<link rel="match" href="calc-rounding-002-ref.html">
+<style>
+* {
+  box-sizing: border-box;
+}
+:root {
+  font-family: sans-serif;
+}
+.parent {
+  display: inline-flex;
+  --addon-size: 1rem;
+}
+.child {
+  min-width: 0;
+  display: inline-flex;
+  max-width: calc(100% - var(--addon-size));
+}
+.overflow {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.addon-child {
+  display: inline-flex;
+  width: var(--addon-size);
+}
+span {
+  outline: 1px dashed red;
+  outline-offset: -1px;
+}
+p > span > span {
+  padding: .5rem .25rem;
+}
+</style>
+<p><span class="parent"><span class="child"><span class="overflow">iiiiiiiiiiiii</span></span><span class="addon-child"></span></span></p>
+<p><span class="parent"><span class="child"><span class="overflow">iiiiiiiiiiiiii</span></span><span class="addon-child"></span></span></p>
+<p><span class="parent"><span class="child"><span class="overflow">iiiiiiiiiiiiiii</span></span><span class="addon-child"></span></span></p>
diff --git a/third_party/blink/web_tests/external/wpt/css/cssom-view/smooth-scroll-in-load-event.html b/third_party/blink/web_tests/external/wpt/css/cssom-view/smooth-scroll-in-load-event.html
new file mode 100644
index 0000000..e515b06
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/cssom-view/smooth-scroll-in-load-event.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<title>A smooth scroll operation in load event handler isn't omitted</title>
+<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#concept-smooth-scroll">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/scroll-behavior.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+  html {
+    overflow: auto;
+  }
+</style>
+<div id="pageContent" style="position: absolute; left: 0; top: 0;"></div>
+<script>
+  window.addEventListener("load", () => {
+    // Expand the page content to make the root scroll container overflowed.
+    pageContent.style.width = (window.innerWidth) * 5 + "px";
+    pageContent.style.height = (window.innerHeight) * 6 + "px";
+
+    promise_test(async () => {
+      document.scrollingElement.scrollTo({
+        left: window.innerWidth,
+        top: window.innerHeight,
+        behavior: "smooth"
+      });
+
+      assert_equals(document.scrollingElement.scrollLeft, 0, "Should not set scrollLeft immediately");
+      assert_equals(document.scrollingElement.scrollTop, 0, "Should not set scrollTop immediately");
+
+      // In the next frame, change something to trigger a paint which might
+      // clobber the smooth scroll operation.
+      await new Promise(resolve => requestAnimationFrame(resolve));
+      pageContent.style.color = "green";
+
+      await waitForScrollEnd(document.scrollingElement);
+
+      assert_equals(document.scrollingElement.scrollLeft, window.innerWidth, "Final value of scrollLeft");
+      assert_equals(document.scrollingElement.scrollTop, window.innerHeight, "Final value of scrollTop");
+    }, `Smooth scroll in load event handler`);
+  });
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/cssom/CSSStyleSheet-constructable-invalidation.html b/third_party/blink/web_tests/external/wpt/css/cssom/CSSStyleSheet-constructable-invalidation.html
new file mode 100644
index 0000000..f63abaa
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/cssom/CSSStyleSheet-constructable-invalidation.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSSStyleSheet rule mutation invalidation</title>
+<link rel="author" href="mailto:wpt@keithcirkel.co.uk" title="Keith Cirkel">
+<link rel="help" href="https://drafts.csswg.org/cssom/#extensions-to-the-document-or-shadow-root-interface">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<span id="span1">Should be green.</span>
+<span id="span2">Should be green.</span>
+<script>
+promise_test(async function(t) {
+  const sheet = new CSSStyleSheet();
+  sheet.replaceSync('span {color:var(--color, red);}');
+  document.adoptedStyleSheets = [sheet];
+  t.add_cleanup(() => {
+    document.adoptedStyleSheets = [];
+  })
+  assert_equals(getComputedStyle(span1).color, "rgb(255, 0, 0)", "Sheet should apply");
+  sheet.rules[0].style.setProperty('--color', 'green');
+  assert_equals(getComputedStyle(span1).color, "rgb(0, 128, 0)", "Sheet should invalidate style");
+  document.adoptedStyleSheets = [];
+  assert_equals(getComputedStyle(span1).color, "rgb(0, 0, 0)", "Removing sheet should apply");
+}, "mutating constructed CSSStyleSheet applied to root invalidates styles");
+
+promise_test(async function() {
+  span1.attachShadow({mode:'open'})
+  span1.shadowRoot.append(document.createElement('slot'))
+  const sheet = new CSSStyleSheet();
+  sheet.replaceSync(':host {color:var(--color, red);}');
+  span1.shadowRoot.adoptedStyleSheets = [sheet];
+  assert_equals(getComputedStyle(span1).color, "rgb(255, 0, 0)", "Sheet should apply");
+  sheet.rules[0].style.setProperty('--color', 'green');
+  assert_equals(getComputedStyle(span1).color, "rgb(0, 128, 0)", "Sheet should invalidate style");
+}, "mutating constructed CSSStyleSheet applied to shadowdom invalidates styles");
+
+promise_test(async function() {
+  span2.attachShadow({mode:'open'})
+  span2.shadowRoot.append(document.createElement('slot'))
+  const sheet1 = new CSSStyleSheet();
+  const sheet2 = new CSSStyleSheet();
+  sheet1.replaceSync(':host {color:var(--color, hotpink);}');
+  sheet2.replaceSync(':host {--color: blue}');
+  const style2 = sheet2.rules[0].style;
+  span2.shadowRoot.adoptedStyleSheets = [sheet1, sheet2];
+  assert_equals(getComputedStyle(span2).color, "rgb(0, 0, 255)", "Sheet should apply");
+  style2.setProperty('--color', 'green');
+  assert_equals(getComputedStyle(span2).color, "rgb(0, 128, 0)", "Sheet should invalidate style");
+}, "mutating dependent constructed CSSStyleSheet applied to shadowdom invalidates styles");
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/blur-event.window-expected.txt b/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/blur-event.window-expected.txt
new file mode 100644
index 0000000..7c476a91
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/blur-event.window-expected.txt
@@ -0,0 +1,7 @@
+This is a testharness.js-based test.
+[FAIL] <input> element does not fire blur event upon DOM removal
+  assert_false: Blur event was not fired expected false got true
+[FAIL] <button> element does not fire blur event upon DOM removal
+  assert_false: Blur event was not fired expected false got true
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/blur-event.window.js b/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/blur-event.window.js
new file mode 100644
index 0000000..4c8cd85
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/blur-event.window.js
@@ -0,0 +1,19 @@
+test(() => {
+  const input = document.body.appendChild(document.createElement('input'));
+  input.focus();
+
+  let blurCalled = false;
+  input.onblur = e => blurCalled = true;
+  input.remove();
+  assert_false(blurCalled, "Blur event was not fired");
+}, "<input> element does not fire blur event upon DOM removal");
+
+test(() => {
+  const button = document.body.appendChild(document.createElement('button'));
+  button.focus();
+
+  let blurCalled = false;
+  button.onblur = e => blurCalled = true;
+  button.remove();
+  assert_false(blurCalled, "Blur event was not fired");
+}, "<button> element does not fire blur event upon DOM removal");
diff --git a/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/insertion-removing-steps-iframe.window-expected.txt b/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/insertion-removing-steps-iframe.window-expected.txt
new file mode 100644
index 0000000..a52434e
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/insertion-removing-steps-iframe.window-expected.txt
@@ -0,0 +1,9 @@
+This is a testharness.js-based test.
+[FAIL] Removing steps (innerHTML): script does not run synchronously during iframe destruction
+  assert_false: iframe1 pagehide did not fire expected false got true
+[FAIL] Removing steps (replaceChildren): script does not run synchronously during iframe destruction
+  assert_false: iframe1 pagehide did not fire expected false got true
+[FAIL] Removing steps (remove): script does not run synchronously during iframe destruction
+  assert_false: iframe1 pagehide did not fire expected false got true
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/insertion-removing-steps-iframe.window.js b/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/insertion-removing-steps-iframe.window.js
index a10610f..60c2bec 100644
--- a/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/insertion-removing-steps-iframe.window.js
+++ b/third_party/blink/web_tests/external/wpt/dom/nodes/insertion-removing-steps/insertion-removing-steps-iframe.window.js
@@ -109,6 +109,15 @@
     t.add_cleanup(() => removalObserver.disconnect());
 
     let iframe1UnloadFired = false, iframe2UnloadFired = false;
+    let iframe1PagehideFired = false, iframe2PagehideFired = false;
+    iframe1.contentWindow.addEventListener('pagehide', e => {
+      assert_false(iframe1UnloadFired, "iframe1 pagehide fires before unload");
+      iframe1PagehideFired = true;
+    });
+    iframe2.contentWindow.addEventListener('pagehide', e => {
+      assert_false(iframe2UnloadFired, "iframe2 pagehide fires before unload");
+      iframe2PagehideFired = true;
+    });
     iframe1.contentWindow.addEventListener('unload', e => iframe1UnloadFired = true);
     iframe2.contentWindow.addEventListener('unload', e => iframe2UnloadFired = true);
 
@@ -126,6 +135,8 @@
       div.innerHTML = '';
     }
 
+    assert_false(iframe1PagehideFired, "iframe1 pagehide did not fire");
+    assert_false(iframe2PagehideFired, "iframe2 pagehide did not fire");
     assert_false(iframe1UnloadFired, "iframe1 unload did not fire");
     assert_false(iframe2UnloadFired, "iframe2 unload did not fire");
 
diff --git a/third_party/blink/web_tests/external/wpt/editing/other/delete-in-inline-editing-host-under-shadow-root.html b/third_party/blink/web_tests/external/wpt/editing/other/delete-in-inline-editing-host-under-shadow-root.html
new file mode 100644
index 0000000..c1a825a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/editing/other/delete-in-inline-editing-host-under-shadow-root.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Backspace/Delete in inline editing host which is a shadow root</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="../include/editor-test-utils.js"></script>
+<script>
+"use strict";
+
+addEventListener("load", () => {
+  const shadowRoot = document.body.firstChild.attachShadow({mode: "open"});
+  const editingHost = document.createElement("span");
+  editingHost.setAttribute("contenteditable", "");
+  shadowRoot.appendChild(editingHost);
+  const utils = new EditorTestUtils(editingHost);
+
+  promise_test(async t => {
+    utils.setupEditingHost("ab[]c");
+    await utils.sendBackspaceKey();
+    assert_equals(
+      editingHost.textContent,
+      "ac"
+    );
+  }, "Backspace at <span contenteditable>ab[]c</span>");
+
+  promise_test(async t => {
+    utils.setupEditingHost("a[]bc");
+    await utils.sendDeleteKey();
+    assert_equals(
+      editingHost.textContent,
+      "ac"
+    );
+  }, "Delete at <span contenteditable>a[]bc</span>");
+
+  promise_test(async t => {
+    utils.setupEditingHost("a[b]c");
+    await utils.sendBackspaceKey();
+    assert_equals(
+      editingHost.textContent,
+      "ac"
+    );
+  }, "Backspace at <span contenteditable>a[b]c</span>");
+
+  promise_test(async t => {
+    utils.setupEditingHost("a[b]c");
+    await utils.sendDeleteKey();
+    assert_equals(
+      editingHost.textContent,
+      "ac"
+    );
+  }, "Delete at <span contenteditable>a[b]c</span>");
+}, {once: true});
+</script>
+</head>
+<body><div></div></body>
+</html>
diff --git a/third_party/blink/web_tests/external/wpt/html/syntax/speculative-parsing/tools/generate.py b/third_party/blink/web_tests/external/wpt/html/syntax/speculative-parsing/tools/generate.py
index 3457f94..f0db885 100755
--- a/third_party/blink/web_tests/external/wpt/html/syntax/speculative-parsing/tools/generate.py
+++ b/third_party/blink/web_tests/external/wpt/html/syntax/speculative-parsing/tools/generate.py
@@ -680,7 +680,7 @@
 
     html_testcase_markup = template_testcase_markup.format(url_wptserve_sub)
     html_nonspeculative_testcase_markup = template_nonspeculative_testcase_markup.format(url_wptserve_sub)
-    js_testcase_markup = template_testcase_markup.format(url_js_sub).replace(u"</script>", u"<\/script>").replace(u"<meta charset", u"<meta\ charset")
+    js_testcase_markup = template_testcase_markup.format(url_js_sub).replace(u"</script>", u"<\\/script>").replace(u"<meta charset", u"<meta\\ charset")
 
     if test_nonspeculative == u'true':
         nonspeculative = template_nonspeculative.format(preamble=preamble, encoding_decl=encoding_decl, title=title, nonspeculative_testcase_markup=html_nonspeculative_testcase_markup, delay=delay)
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/CSP.idl b/third_party/blink/web_tests/external/wpt/interfaces/CSP.idl
index ac0a6ff5..d4a6377 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/CSP.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/CSP.idl
@@ -41,16 +41,16 @@
 };
 
 dictionary SecurityPolicyViolationEventInit : EventInit {
-    required USVString      documentURI;
-             USVString      referrer = "";
-             USVString      blockedURI = "";
-    required DOMString      violatedDirective;
-    required DOMString      effectiveDirective;
-    required DOMString      originalPolicy;
-             USVString      sourceFile = "";
-             DOMString      sample = "";
-    required SecurityPolicyViolationEventDisposition disposition;
-    required unsigned short statusCode;
-             unsigned long  lineNumber = 0;
-             unsigned long  columnNumber = 0;
+    USVString      documentURI = "";
+    USVString      referrer = "";
+    USVString      blockedURI = "";
+    DOMString      violatedDirective = "";
+    DOMString      effectiveDirective = "";
+    DOMString      originalPolicy = "";
+    USVString      sourceFile = "";
+    DOMString      sample = "";
+    SecurityPolicyViolationEventDisposition disposition = "enforce";
+    unsigned short statusCode = 0;
+    unsigned long  lineNumber = 0;
+    unsigned long  columnNumber = 0;
 };
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/contact-picker.idl b/third_party/blink/web_tests/external/wpt/interfaces/contact-picker.idl
index 0119d0e..fc589fa 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/contact-picker.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/contact-picker.idl
@@ -37,7 +37,7 @@
     boolean multiple = false;
 };
 
-[Exposed=Window,SecureContext]
+[Exposed=Window, SecureContext]
 interface ContactsManager {
     Promise<sequence<ContactProperty>> getProperties();
     Promise<sequence<ContactInfo>> select(sequence<ContactProperty> properties, optional ContactsSelectOptions options = {});
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/css-anchor-position.idl b/third_party/blink/web_tests/external/wpt/interfaces/css-anchor-position.idl
index 5d3973ef..b79e3fc 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/css-anchor-position.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/css-anchor-position.idl
@@ -4,11 +4,7 @@
 // Source: CSS Anchor Positioning (https://drafts.csswg.org/css-anchor-position-1/)
 
 [Exposed=Window]
-interface CSSPositionFallbackRule : CSSGroupingRule {
+interface CSSPositionTryRule : CSSRule {
   readonly attribute CSSOMString name;
-};
-
-[Exposed=Window]
-interface CSSTryRule : CSSRule {
   [SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
 };
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/css-fonts.idl b/third_party/blink/web_tests/external/wpt/interfaces/css-fonts.idl
index 070cbc58..7a91766 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/css-fonts.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/css-fonts.idl
@@ -19,6 +19,7 @@
   readonly attribute CSSFontFeatureValuesMap swash;
   readonly attribute CSSFontFeatureValuesMap characterVariant;
   readonly attribute CSSFontFeatureValuesMap styleset;
+  readonly attribute CSSFontFeatureValuesMap historicalForms;
 };
 
 [Exposed=Window]
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/digital-identities.idl b/third_party/blink/web_tests/external/wpt/interfaces/digital-identities.idl
new file mode 100644
index 0000000..9027ce6
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/interfaces/digital-identities.idl
@@ -0,0 +1,27 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Digital Credentials (https://wicg.github.io/digital-identities/)
+
+partial interface Navigator {
+  [SecureContext, SameObject] readonly attribute CredentialsContainer identity;
+};
+
+partial dictionary CredentialRequestOptions {
+  DigitalCredentialRequestOptions digital;
+};
+
+dictionary DigitalCredentialRequestOptions {
+  sequence<IdentityRequestProvider> providers;
+};
+
+dictionary IdentityRequestProvider {
+  required DOMString protocol;
+  required DOMString request;
+};
+
+[Exposed=Window, SecureContext]
+interface DigitalCredential : Credential {
+  readonly attribute DOMString protocol;
+  readonly attribute DOMString data;
+};
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/edit-context.idl b/third_party/blink/web_tests/external/wpt/interfaces/edit-context.idl
index eb3174e..60ddbaf 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/edit-context.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/edit-context.idl
@@ -59,7 +59,7 @@
     readonly attribute unsigned long selectionEnd;
 };
 
-enum UnderlineStyle { "none", "solid", "double", "dotted", "dashed", "wavy" };
+enum UnderlineStyle { "none", "solid", "dotted", "dashed", "wavy" };
 enum UnderlineThickness { "none", "thin", "thick" };
 
 dictionary TextFormatInit {
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/gamepad.idl b/third_party/blink/web_tests/external/wpt/interfaces/gamepad.idl
index 77a22c1d..024e5ea 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/gamepad.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/gamepad.idl
@@ -3,7 +3,7 @@
 // (https://github.com/w3c/webref)
 // Source: Gamepad (https://w3c.github.io/gamepad/)
 
-[Exposed=Window, SecureContext]
+[Exposed=Window]
 interface Gamepad {
   readonly attribute DOMString id;
   readonly attribute long index;
@@ -15,7 +15,7 @@
   [SameObject] readonly attribute GamepadHapticActuator vibrationActuator;
 };
 
-[Exposed=Window, SecureContext]
+[Exposed=Window]
 interface GamepadButton {
   readonly attribute boolean pressed;
   readonly attribute boolean touched;
@@ -59,7 +59,7 @@
   sequence<Gamepad?> getGamepads();
 };
 
-[Exposed=Window, SecureContext]
+[Exposed=Window]
 
 interface GamepadEvent: Event {
   constructor(DOMString type, GamepadEventInit eventInitDict);
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/html.idl b/third_party/blink/web_tests/external/wpt/interfaces/html.idl
index 9193a748..8992ceab 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/html.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/html.idl
@@ -1243,6 +1243,7 @@
   readonly attribute DocumentFragment content;
   [CEReactions] attribute DOMString shadowRootMode;
   [CEReactions] attribute boolean shadowRootDelegatesFocus;
+  [CEReactions] attribute boolean shadowRootClonable;
 };
 
 [Exposed=Window]
@@ -2086,6 +2087,23 @@
   attribute DOMString returnValue;
 };
 
+[Exposed=Window]
+interface NotRestoredReasonDetails {
+  readonly attribute DOMString reason;
+  [Default] object toJSON();
+};
+
+[Exposed=Window]
+interface NotRestoredReasons {
+  readonly attribute DOMString? src;
+  readonly attribute DOMString? id;
+  readonly attribute DOMString? name;
+  readonly attribute DOMString? url;
+  readonly attribute FrozenArray<NotRestoredReasonDetails>? reasons;
+  readonly attribute FrozenArray<NotRestoredReasons>? children;
+  [Default] object toJSON();
+};
+
 [Exposed=*]
 interface ErrorEvent : Event {
   constructor(DOMString type, optional ErrorEventInit eventInitDict = {});
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/longtasks.idl b/third_party/blink/web_tests/external/wpt/interfaces/longtasks.idl
index 13d4940c..e5b6ece 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/longtasks.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/longtasks.idl
@@ -70,7 +70,9 @@
     readonly attribute ScriptInvokerType invokerType;
     readonly attribute DOMString invoker;
     readonly attribute DOMHighResTimeStamp executionStart;
-    readonly attribute DOMString sourceLocation;
+    readonly attribute DOMString sourceURL;
+    readonly attribute DOMString sourceFunctionName;
+    readonly attribute long long sourceCharPosition;
     readonly attribute DOMHighResTimeStamp pauseDuration;
     readonly attribute DOMHighResTimeStamp forcedStyleAndLayoutDuration;
     readonly attribute Window? window;
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/mediasession.idl b/third_party/blink/web_tests/external/wpt/interfaces/mediasession.idl
index 57c62df..8e9a21a 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/mediasession.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/mediasession.idl
@@ -44,9 +44,9 @@
 
   undefined setPositionState(optional MediaPositionState state = {});
 
-  undefined setMicrophoneActive(boolean active);
+  Promise<undefined> setMicrophoneActive(boolean active);
 
-  undefined setCameraActive(boolean active);
+  Promise<undefined> setCameraActive(boolean active);
 };
 
 [Exposed=Window]
@@ -79,7 +79,17 @@
 
 dictionary MediaSessionActionDetails {
   required MediaSessionAction action;
+};
+
+dictionary MediaSessionSeekActionDetails : MediaSessionActionDetails {
   double seekOffset;
-  double seekTime;
+};
+
+dictionary MediaSessionSeekToActionDetails : MediaSessionActionDetails {
+  required double seekTime;
   boolean fastSeek;
 };
+
+dictionary MediaSessionCaptureActionDetails : MediaSessionActionDetails {
+  boolean isActivating;
+};
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/service-workers.idl b/third_party/blink/web_tests/external/wpt/interfaces/service-workers.idl
index 6d44d61d..c740e10 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/service-workers.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/service-workers.idl
@@ -92,7 +92,7 @@
   ByteString headerValue;
 };
 
-[Global=(Worker,ServiceWorker), Exposed=ServiceWorker]
+[Global=(Worker,ServiceWorker), Exposed=ServiceWorker, SecureContext]
 interface ServiceWorkerGlobalScope : WorkerGlobalScope {
   [SameObject] readonly attribute Clients clients;
   [SameObject] readonly attribute ServiceWorkerRegistration registration;
@@ -166,6 +166,40 @@
 };
 
 [Exposed=ServiceWorker]
+interface InstallEvent : ExtendableEvent {
+  Promise<undefined> addRoutes((RouterRule or sequence<RouterRule>) rules);
+};
+
+dictionary RouterRule {
+  required RouterCondition condition;
+  required RouterSource source;
+};
+
+dictionary RouterCondition {
+  URLPatternCompatible urlPattern;
+  ByteString requestMethod;
+  RequestMode requestMode;
+  RequestDestination requestDestination;
+  RunningStatus runningStatus;
+
+  sequence<RouterCondition> _or;
+};
+
+typedef (RouterSourceDict or RouterSourceEnum) RouterSource;
+
+dictionary RouterSourceDict {
+  DOMString cacheName;
+};
+
+enum RunningStatus { "running", "not-running" };
+enum RouterSourceEnum {
+  "cache",
+  "fetch-event",
+  "network",
+  "race-network-and-fetch-handler"
+};
+
+[Exposed=ServiceWorker]
 interface FetchEvent : ExtendableEvent {
   constructor(DOMString type, FetchEventInit eventInitDict);
   [SameObject] readonly attribute Request request;
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/trusted-types.idl b/third_party/blink/web_tests/external/wpt/interfaces/trusted-types.idl
index 6723994a..db5bd63 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/trusted-types.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/trusted-types.idl
@@ -7,21 +7,18 @@
 interface TrustedHTML {
   stringifier;
   DOMString toJSON();
-  static TrustedHTML fromLiteral(object templateStringsArray);
 };
 
 [Exposed=(Window,Worker)]
 interface TrustedScript {
   stringifier;
   DOMString toJSON();
-  static TrustedScript fromLiteral(object templateStringsArray);
 };
 
 [Exposed=(Window,Worker)]
 interface TrustedScriptURL {
   stringifier;
   USVString toJSON();
-  static TrustedScriptURL fromLiteral(object templateStringsArray);
 };
 
 [Exposed=(Window,Worker)] interface TrustedTypePolicyFactory {
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/turtledove.idl b/third_party/blink/web_tests/external/wpt/interfaces/turtledove.idl
index f5813b5..8a2d7bb5 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/turtledove.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/turtledove.idl
@@ -31,6 +31,7 @@
   USVString updateURL;
   USVString trustedBiddingSignalsURL;
   sequence<USVString> trustedBiddingSignalsKeys;
+  DOMString trustedBiddingSignalsSlotSizeMode = "none";
   any userBiddingSignals;
   sequence<AuctionAd> ads;
   sequence<AuctionAd> adComponents;
@@ -70,6 +71,7 @@
   sequence<USVString> interestGroupBuyers;
   Promise<any> auctionSignals;
   record<DOMString, DOMString> requestedSize;
+  sequence<record<DOMString, DOMString>> allSlotsRequestedSizes;
   Promise<any> sellerSignals;
   Promise<DOMString> directFromSellerSignalsHeaderAdSlot;
   unsigned long long sellerTimeout;
@@ -98,11 +100,24 @@
 interface InterestGroupScriptRunnerGlobalScope {
 };
 
+[Exposed=InterestGroupBiddingAndScoringScriptRunnerGlobalScope]
+interface ForDebuggingOnly {
+  undefined reportAdAuctionWin(USVString url);
+  undefined reportAdAuctionLoss(USVString url);
+};
+
+[Exposed=InterestGroupBiddingAndScoringScriptRunnerGlobalScope,
+ Global=InterestGroupBiddingAndScoringScriptRunnerGlobalScope]
+interface InterestGroupBiddingAndScoringScriptRunnerGlobalScope : InterestGroupScriptRunnerGlobalScope {
+
+  readonly attribute ForDebuggingOnly forDebuggingOnly;
+};
+
 [Exposed=InterestGroupBiddingScriptRunnerGlobalScope,
  Global=(InterestGroupScriptRunnerGlobalScope,
          InterestGroupBiddingScriptRunnerGlobalScope)]
 interface InterestGroupBiddingScriptRunnerGlobalScope
-        : InterestGroupScriptRunnerGlobalScope {
+        : InterestGroupBiddingAndScoringScriptRunnerGlobalScope {
   boolean setBid(optional GenerateBidOutput generateBidOutput = {});
   undefined setPriority(double priority);
   undefined setPrioritySignalsOverride(DOMString key, optional double? priority);
@@ -129,7 +144,7 @@
  Global=(InterestGroupScriptRunnerGlobalScope,
          InterestGroupScoringScriptRunnerGlobalScope)]
 interface InterestGroupScoringScriptRunnerGlobalScope
-        : InterestGroupScriptRunnerGlobalScope {
+        : InterestGroupBiddingAndScoringScriptRunnerGlobalScope {
 };
 
 [Exposed=InterestGroupReportingScriptRunnerGlobalScope,
@@ -147,6 +162,16 @@
   undefined updateAdInterestGroups();
 };
 
+[SecureContext]
+partial interface Navigator {
+  [SameObject] readonly attribute ProtectedAudience protectedAudience;
+};
+
+[SecureContext, Exposed=Window]
+interface ProtectedAudience {
+  any queryFeatureSupport(DOMString feature);
+};
+
 partial dictionary RequestInit {
   boolean adAuctionHeaders;
 };
@@ -166,11 +191,13 @@
   required long joinCount;
   required long bidCount;
   required long recency;
+  required long adComponentsLimit;
 
   USVString topLevelSeller;
   sequence<PreviousWin> prevWinsMs;
   object wasmHelper;
   unsigned long dataVersion;
+  boolean forDebuggingOnlyInCooldownOrLockout = false;
 };
 
 dictionary ScoringBrowserSignals {
@@ -182,6 +209,7 @@
 
   unsigned long dataVersion;
   sequence<USVString> adComponents;
+  boolean forDebuggingOnlyInCooldownOrLockout = false;
 };
 
 dictionary ReportingBrowserSignals {
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/uievents.idl b/third_party/blink/web_tests/external/wpt/interfaces/uievents.idl
index 21c40c3..0f9d3d3 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/uievents.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/uievents.idl
@@ -226,6 +226,35 @@
   unsigned long keyCode = 0;
 };
 
-// Removed MutationEvents manually here.
-// This really needs to be removed from the spec:
-// https://w3c.github.io/uievents/#interface-mutationevent
+[Exposed=Window]
+interface TextEvent : UIEvent {
+    readonly attribute DOMString data;
+    undefined initTextEvent(DOMString type,
+        optional boolean bubbles = false,
+        optional boolean cancelable = false,
+        optional Window? view = null,
+        optional DOMString data = "undefined");
+};
+
+[Exposed=Window]
+interface MutationEvent : Event {
+  // attrChangeType
+  const unsigned short MODIFICATION = 1;
+  const unsigned short ADDITION = 2;
+  const unsigned short REMOVAL = 3;
+
+  readonly attribute Node? relatedNode;
+  readonly attribute DOMString prevValue;
+  readonly attribute DOMString newValue;
+  readonly attribute DOMString attrName;
+  readonly attribute unsigned short attrChange;
+
+  undefined initMutationEvent(DOMString typeArg,
+    optional boolean bubblesArg = false,
+    optional boolean cancelableArg = false,
+    optional Node? relatedNodeArg = null,
+    optional DOMString prevValueArg = "",
+    optional DOMString newValueArg = "",
+    optional DOMString attrNameArg = "",
+    optional unsigned short attrChangeArg = 0);
+};
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/wai-aria.idl b/third_party/blink/web_tests/external/wpt/interfaces/wai-aria.idl
index 13e3b0f8..78083f0 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/wai-aria.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/wai-aria.idl
@@ -57,5 +57,4 @@
   [CEReactions] attribute DOMString? ariaValueNow;
   [CEReactions] attribute DOMString? ariaValueText;
 };
-
 Element includes ARIAMixin;
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/webgl1.idl b/third_party/blink/web_tests/external/wpt/interfaces/webgl1.idl
index 4552610..1b711e1 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/webgl1.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/webgl1.idl
@@ -518,6 +518,9 @@
     readonly attribute GLsizei drawingBufferWidth;
     readonly attribute GLsizei drawingBufferHeight;
     readonly attribute GLenum drawingBufferFormat;
+
+    /* Upon context creation, drawingBufferColorSpace and unpackColorSpace both
+       default to the value "srgb". */
     attribute PredefinedColorSpace drawingBufferColorSpace;
     attribute PredefinedColorSpace unpackColorSpace;
 
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/webgpu.idl b/third_party/blink/web_tests/external/wpt/interfaces/webgpu.idl
index 1507400..ef5b9c7 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/webgpu.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/webgpu.idl
@@ -11,7 +11,7 @@
     USVString label = "";
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUSupportedLimits {
     readonly attribute unsigned long maxTextureDimension1D;
     readonly attribute unsigned long maxTextureDimension2D;
@@ -47,17 +47,17 @@
     readonly attribute unsigned long maxComputeWorkgroupsPerDimension;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUSupportedFeatures {
     readonly setlike<DOMString>;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface WGSLLanguageFeatures {
     readonly setlike<DOMString>;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUAdapterInfo {
     readonly attribute DOMString vendor;
     readonly attribute DOMString architecture;
@@ -71,7 +71,7 @@
 Navigator includes NavigatorGPU;
 WorkerNavigator includes NavigatorGPU;
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPU {
     Promise<GPUAdapter?> requestAdapter(optional GPURequestAdapterOptions options = {});
     GPUTextureFormat getPreferredCanvasFormat();
@@ -88,7 +88,7 @@
     "high-performance",
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUAdapter {
     [SameObject] readonly attribute GPUSupportedFeatures features;
     [SameObject] readonly attribute GPUSupportedLimits limits;
@@ -119,7 +119,7 @@
     "float32-filterable",
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUDevice : EventTarget {
     [SameObject] readonly attribute GPUSupportedFeatures features;
     [SameObject] readonly attribute GPUSupportedLimits limits;
@@ -150,7 +150,7 @@
 };
 GPUDevice includes GPUObjectBase;
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUBuffer {
     readonly attribute GPUSize64Out size;
     readonly attribute GPUFlagsConstant usage;
@@ -179,7 +179,7 @@
 };
 
 typedef [EnforceRange] unsigned long GPUBufferUsageFlags;
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 namespace GPUBufferUsage {
     const GPUFlagsConstant MAP_READ      = 0x0001;
     const GPUFlagsConstant MAP_WRITE     = 0x0002;
@@ -194,13 +194,13 @@
 };
 
 typedef [EnforceRange] unsigned long GPUMapModeFlags;
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 namespace GPUMapMode {
     const GPUFlagsConstant READ  = 0x0001;
     const GPUFlagsConstant WRITE = 0x0002;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUTexture {
     GPUTextureView createView(optional GPUTextureViewDescriptor descriptor = {});
 
@@ -235,7 +235,7 @@
 };
 
 typedef [EnforceRange] unsigned long GPUTextureUsageFlags;
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 namespace GPUTextureUsage {
     const GPUFlagsConstant COPY_SRC          = 0x01;
     const GPUFlagsConstant COPY_DST          = 0x02;
@@ -244,7 +244,7 @@
     const GPUFlagsConstant RENDER_ATTACHMENT = 0x10;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUTextureView {
 };
 GPUTextureView includes GPUObjectBase;
@@ -396,7 +396,7 @@
     "astc-12x12-unorm-srgb",
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUExternalTexture {
 };
 GPUExternalTexture includes GPUObjectBase;
@@ -407,7 +407,7 @@
     PredefinedColorSpace colorSpace = "srgb";
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUSampler {
 };
 GPUSampler includes GPUObjectBase;
@@ -453,7 +453,7 @@
     "always",
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUBindGroupLayout {
 };
 GPUBindGroupLayout includes GPUObjectBase;
@@ -475,7 +475,7 @@
 };
 
 typedef [EnforceRange] unsigned long GPUShaderStageFlags;
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 namespace GPUShaderStage {
     const GPUFlagsConstant VERTEX   = 0x1;
     const GPUFlagsConstant FRAGMENT = 0x2;
@@ -533,7 +533,7 @@
 dictionary GPUExternalTextureBindingLayout {
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUBindGroup {
 };
 GPUBindGroup includes GPUObjectBase;
@@ -557,7 +557,7 @@
     GPUSize64 size;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUPipelineLayout {
 };
 GPUPipelineLayout includes GPUObjectBase;
@@ -567,7 +567,7 @@
     required sequence<GPUBindGroupLayout> bindGroupLayouts;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUShaderModule {
     Promise<GPUCompilationInfo> getCompilationInfo();
 };
@@ -591,7 +591,7 @@
     "info",
 };
 
-[Exposed=(Window, DedicatedWorker), Serializable, SecureContext]
+[Exposed=(Window, Worker), Serializable, SecureContext]
 interface GPUCompilationMessage {
     readonly attribute DOMString message;
     readonly attribute GPUCompilationMessageType type;
@@ -601,12 +601,12 @@
     readonly attribute unsigned long long length;
 };
 
-[Exposed=(Window, DedicatedWorker), Serializable, SecureContext]
+[Exposed=(Window, Worker), Serializable, SecureContext]
 interface GPUCompilationInfo {
     readonly attribute FrozenArray<GPUCompilationMessage> messages;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext, Serializable]
+[Exposed=(Window, Worker), SecureContext, Serializable]
 interface GPUPipelineError : DOMException {
     constructor(optional DOMString message = "", GPUPipelineErrorInit options);
     readonly attribute GPUPipelineErrorReason reason;
@@ -642,7 +642,7 @@
 
 typedef double GPUPipelineConstantValue; // May represent WGSL's bool, f32, i32, u32, and f16 if enabled.
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUComputePipeline {
 };
 GPUComputePipeline includes GPUObjectBase;
@@ -653,7 +653,7 @@
     required GPUProgrammableStage compute;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPURenderPipeline {
 };
 GPURenderPipeline includes GPUObjectBase;
@@ -721,7 +721,7 @@
 };
 
 typedef [EnforceRange] unsigned long GPUColorWriteFlags;
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 namespace GPUColorWrite {
     const GPUFlagsConstant RED   = 0x1;
     const GPUFlagsConstant GREEN = 0x2;
@@ -895,7 +895,7 @@
     boolean flipY = false;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUCommandBuffer {
 };
 GPUCommandBuffer includes GPUObjectBase;
@@ -907,7 +907,7 @@
 interface mixin GPUCommandsMixin {
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUCommandEncoder {
     GPURenderPassEncoder beginRenderPass(GPURenderPassDescriptor descriptor);
     GPUComputePassEncoder beginComputePass(optional GPUComputePassDescriptor descriptor = {});
@@ -972,7 +972,7 @@
     undefined insertDebugMarker(USVString markerLabel);
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUComputePassEncoder {
     undefined setPipeline(GPUComputePipeline pipeline);
     undefined dispatchWorkgroups(GPUSize32 workgroupCountX, optional GPUSize32 workgroupCountY = 1, optional GPUSize32 workgroupCountZ = 1);
@@ -996,7 +996,7 @@
     GPUComputePassTimestampWrites timestampWrites;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPURenderPassEncoder {
     undefined setViewport(float x, float y,
         float width, float height,
@@ -1093,7 +1093,7 @@
     undefined drawIndexedIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPURenderBundle {
 };
 GPURenderBundle includes GPUObjectBase;
@@ -1102,7 +1102,7 @@
          : GPUObjectDescriptorBase {
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPURenderBundleEncoder {
     GPURenderBundle finish(optional GPURenderBundleDescriptor descriptor = {});
 };
@@ -1122,7 +1122,7 @@
          : GPUObjectDescriptorBase {
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUQueue {
     undefined submit(sequence<GPUCommandBuffer> commandBuffers);
 
@@ -1148,7 +1148,7 @@
 };
 GPUQueue includes GPUObjectBase;
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUQuerySet {
     undefined destroy();
 
@@ -1168,7 +1168,7 @@
     "timestamp",
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUCanvasContext {
     readonly attribute (HTMLCanvasElement or OffscreenCanvas) canvas;
 
@@ -1197,7 +1197,7 @@
     "destroyed",
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUDeviceLostInfo {
     readonly attribute GPUDeviceLostReason reason;
     readonly attribute DOMString message;
@@ -1207,24 +1207,24 @@
     readonly attribute Promise<GPUDeviceLostInfo> lost;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUError {
     readonly attribute DOMString message;
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUValidationError
         : GPUError {
     constructor(DOMString message);
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUOutOfMemoryError
         : GPUError {
     constructor(DOMString message);
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUInternalError
         : GPUError {
     constructor(DOMString message);
@@ -1241,7 +1241,7 @@
     Promise<GPUError?> popErrorScope();
 };
 
-[Exposed=(Window, DedicatedWorker), SecureContext]
+[Exposed=(Window, Worker), SecureContext]
 interface GPUUncapturedErrorEvent : Event {
     constructor(
         DOMString type,
@@ -1255,7 +1255,7 @@
 };
 
 partial interface GPUDevice {
-    [Exposed=(Window, DedicatedWorker)]
+    [Exposed=(Window, Worker)]
     attribute EventHandler onuncapturederror;
 };
 
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/webnn.idl b/third_party/blink/web_tests/external/wpt/interfaces/webnn.idl
index 721ee788..cafba9d 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/webnn.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/webnn.idl
@@ -29,47 +29,17 @@
 interface ML {
   Promise<MLContext> createContext(optional MLContextOptions options = {});
   Promise<MLContext> createContext(GPUDevice gpuDevice);
-
-  [Exposed=(DedicatedWorker)]
-  MLContext createContextSync(optional MLContextOptions options = {});
-  [Exposed=(DedicatedWorker)]
-  MLContext createContextSync(GPUDevice gpuDevice);
 };
 
 [SecureContext, Exposed=(Window, DedicatedWorker)]
 interface MLActivation {
 };
 
-typedef (GPUBuffer or GPUTexture) MLGPUResource;
-
-typedef record<DOMString, MLGPUResource> MLNamedGPUResources;
-
-[SecureContext, Exposed=(Window, DedicatedWorker)]
-interface MLCommandEncoder {};
-
-partial interface MLCommandEncoder {
-  undefined initializeGraph(MLGraph graph);
-};
-
-partial interface MLCommandEncoder {
-  undefined dispatch(MLGraph graph, MLNamedGPUResources inputs, MLNamedGPUResources outputs);
-};
-
-partial interface MLCommandEncoder {
-  GPUCommandBuffer finish(optional GPUCommandBufferDescriptor descriptor = {});
-};
-
 typedef record<DOMString, ArrayBufferView> MLNamedArrayBufferViews;
 
 [SecureContext, Exposed=(Window, DedicatedWorker)]
 interface MLContext {};
 
-partial interface MLContext {
-  [Exposed=(DedicatedWorker)]
-  undefined computeSync(
-      MLGraph graph, MLNamedArrayBufferViews inputs, MLNamedArrayBufferViews outputs);
-};
-
 dictionary MLComputeResult {
   MLNamedArrayBufferViews inputs;
   MLNamedArrayBufferViews outputs;
@@ -80,23 +50,11 @@
       MLGraph graph, MLNamedArrayBufferViews inputs, MLNamedArrayBufferViews outputs);
 };
 
-partial interface MLContext {
-  MLCommandEncoder createCommandEncoder();
-};
-
 [SecureContext, Exposed=(Window, DedicatedWorker)]
 interface MLGraph {};
 
 typedef record<DOMString, MLOperand> MLNamedOperands;
 
-dictionary MLBufferResourceView {
-  required GPUBuffer resource;
-  unsigned long long offset = 0;
-  unsigned long long size;
-};
-
-typedef (ArrayBufferView or MLBufferResourceView) MLBufferView;
-
 [SecureContext, Exposed=(Window, DedicatedWorker)]
 interface MLGraphBuilder {
   // Construct the graph builder from the context.
@@ -106,21 +64,17 @@
   MLOperand input(DOMString name, MLOperandDescriptor descriptor);
 
   // Create an operand for a graph constant.
-  MLOperand constant(MLOperandDescriptor descriptor, MLBufferView bufferView);
+  MLOperand constant(MLOperandDescriptor descriptor, ArrayBufferView bufferView);
 
   // Create a single-value operand from the specified number of the specified type.
   MLOperand constant(double value, optional MLOperandDataType type = "float32");
 
   // Compile the graph up to the specified output operands asynchronously.
   Promise<MLGraph> build(MLNamedOperands outputs);
-
-  // Compile the graph up to the specified output operands synchronously.
-  [Exposed=(DedicatedWorker)]
-  MLGraph buildSync(MLNamedOperands outputs);
 };
 
 dictionary MLArgMinMaxOptions {
-  sequence<unsigned long> axes = null;
+  sequence<unsigned long> axes;
   boolean keepDimensions = false;
   boolean selectLastIndex = false;
 };
@@ -469,7 +423,7 @@
 };
 
 dictionary MLReduceOptions {
-  sequence<unsigned long> axes = null;
+  sequence<unsigned long> axes;
   boolean keepDimensions = false;
 };
 
@@ -607,5 +561,5 @@
   required MLOperandDataType dataType;
 
   // The dimensions field is only required for tensor operands.
-  sequence<unsigned long> dimensions;
+  sequence<unsigned long> dimensions = [];
 };
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/webtransport.idl b/third_party/blink/web_tests/external/wpt/interfaces/webtransport.idl
index 281c096..7421dcb 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/webtransport.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/webtransport.idl
@@ -93,8 +93,9 @@
 };
 
 dictionary WebTransportDatagramStats {
-  unsigned long long expiredOutgoing;
   unsigned long long droppedIncoming;
+  unsigned long long expiredIncoming;
+  unsigned long long expiredOutgoing;
   unsigned long long lostOutgoing;
 };
 
@@ -103,6 +104,7 @@
   attribute WebTransportSendGroup? sendGroup;
   attribute long long sendOrder;
   Promise<WebTransportSendStreamStats> getStats();
+  WebTransportWriter getWriter();
 };
 
 dictionary WebTransportSendStreamStats {
@@ -132,6 +134,11 @@
   readonly attribute WebTransportSendStream writable;
 };
 
+[Exposed=*, SecureContext]
+interface WebTransportWriter : WritableStreamDefaultWriter {
+  Promise<undefined> atomicWrite(optional any chunk);
+};
+
 [Exposed=(Window,Worker), Serializable, SecureContext]
 interface WebTransportError : DOMException {
   constructor(optional DOMString message = "", optional WebTransportErrorOptions options = {});
diff --git a/third_party/blink/web_tests/external/wpt/lint.ignore b/third_party/blink/web_tests/external/wpt/lint.ignore
index 64266fc..ebe734d 100644
--- a/third_party/blink/web_tests/external/wpt/lint.ignore
+++ b/third_party/blink/web_tests/external/wpt/lint.ignore
@@ -730,6 +730,7 @@
 SET TIMEOUT: editing/crashtests/outdent-across-svg-boundary.html
 SET TIMEOUT: editing/crashtests/textarea-will-be-blurred-by-focus-event-listener.html
 SET TIMEOUT: mathml/crashtests/mozilla/*
+SET TIMEOUT: selection/crashtests/selection-modify-line-boundary-around-empty-details.html
 PARSE-FAILED: mathml/crashtests/mozilla/289180-1.xml
 
 # Invalid HTML syntax /> on non-void elements
diff --git a/third_party/blink/web_tests/external/wpt/longtask-timing/idlharness.window-expected.txt b/third_party/blink/web_tests/external/wpt/longtask-timing/idlharness.window-expected.txt
index 1b543275..db85b36 100644
--- a/third_party/blink/web_tests/external/wpt/longtask-timing/idlharness.window-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/longtask-timing/idlharness.window-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 19 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 18 FAIL, 0 TIMEOUT, 0 NOTRUN.
 [FAIL] PerformanceLongTaskTiming interface: attribute startTime
   assert_own_property: expected property "startTime" missing
 [FAIL] PerformanceLongTaskTiming interface: attribute duration
@@ -36,7 +36,5 @@
   assert_own_property: expected property "name" missing
 [FAIL] PerformanceScriptTiming interface: attribute entryType
   assert_own_property: expected property "entryType" missing
-[FAIL] PerformanceScriptTiming interface: attribute sourceLocation
-  assert_true: The prototype object must have a property "sourceLocation" expected true got false
 Harness: the test ran to completion.
 
diff --git a/third_party/blink/web_tests/external/wpt/mediasession/idlharness.window-expected.txt b/third_party/blink/web_tests/external/wpt/mediasession/idlharness.window-expected.txt
new file mode 100644
index 0000000..c2fd813
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/mediasession/idlharness.window-expected.txt
@@ -0,0 +1,12 @@
+This is a testharness.js-based test.
+Found 4 FAIL, 0 TIMEOUT, 0 NOTRUN.
+[FAIL] MediaSession interface: operation setMicrophoneActive(boolean)
+  assert_unreached: Throws "TypeError: Illegal invocation" instead of rejecting promise Reached unreachable code
+[FAIL] MediaSession interface: operation setCameraActive(boolean)
+  assert_unreached: Throws "TypeError: Illegal invocation" instead of rejecting promise Reached unreachable code
+[FAIL] MediaSession interface: calling setMicrophoneActive(boolean) on navigator.mediaSession with too few arguments must throw TypeError
+  assert_unreached: Throws "TypeError: Failed to execute 'setMicrophoneActive' on 'MediaSession': 1 argument required, but only 0 present." instead of rejecting promise Reached unreachable code
+[FAIL] MediaSession interface: calling setCameraActive(boolean) on navigator.mediaSession with too few arguments must throw TypeError
+  assert_unreached: Throws "TypeError: Failed to execute 'setCameraActive' on 'MediaSession': 1 argument required, but only 0 present." instead of rejecting promise Reached unreachable code
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/quirks/line-height-preserved-segment-break.html b/third_party/blink/web_tests/external/wpt/quirks/line-height-preserved-segment-break.html
new file mode 100644
index 0000000..8ad2651f
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/quirks/line-height-preserved-segment-break.html
@@ -0,0 +1,24 @@
+<!-- quirks mode -->
+<link rel="author" title="Martin Robinson" href="mrobinson@igalia.com">
+<link rel="help" href="https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk">
+<link rel="help" href="https://drafts.csswg.org/css-text/#valdef-white-space-pre-line">
+<link rel="match" href="../css/reference/ref-filled-green-100px-square.xht">
+
+<style>
+    .container {
+        width: 100px;
+        background: green;
+        white-space: pre-line;
+    }
+
+    .inline-box {
+        line-height: 100px;
+    }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; background: red;">
+    <!-- The preserved segment break in the span should mean that "The line height calculation
+    quirk" does not apply. -->
+  <div class="container"><span class="inline-box">&#xA;</span></div>
+</div>
diff --git a/third_party/blink/web_tests/external/wpt/resources/testdriver.js b/third_party/blink/web_tests/external/wpt/resources/testdriver.js
index 3d3ed31..20140b2 100644
--- a/third_party/blink/web_tests/external/wpt/resources/testdriver.js
+++ b/third_party/blink/web_tests/external/wpt/resources/testdriver.js
@@ -1153,6 +1153,10 @@
             throw new Error("set_spc_transaction_mode() is not implemented by testdriver-vendor.js");
         },
 
+        set_rph_registration_mode: function(mode, context=null) {
+            return Promise.reject(new Error("unimplemented"));
+        },
+
         async cancel_fedcm_dialog(context=null) {
             throw new Error("cancel_fedcm_dialog() is not implemented by testdriver-vendor.js");
         },
diff --git a/third_party/blink/web_tests/external/wpt/selection/crashtests/selection-modify-line-boundary-around-empty-details.html b/third_party/blink/web_tests/external/wpt/selection/crashtests/selection-modify-line-boundary-around-empty-details.html
new file mode 100644
index 0000000..815a819
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/selection/crashtests/selection-modify-line-boundary-around-empty-details.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html class="test-wait">
+<head>
+<meta charset="utf-8">
+<script>
+"use strict";
+
+addEventListener("load", () => {
+  let i = 0;
+  const details = document.querySelector("details");
+  const id = setInterval(() => {
+    getSelection().modify("move", "forward", "lineboundary");
+    if (details.isConnected) {
+      details.outerHTML = undefined;
+    }
+    if (++i == 5) {
+      document.documentElement.removeAttribute("class");
+      clearInterval(id);
+    }
+  }, 0);
+  document.execCommand("selectAll");
+}, {once: true});
+</script>
+</head>
+<body>
+<details>a</details>
+<span contenteditable></span>
+</body>
+</html>
diff --git a/third_party/blink/web_tests/external/wpt/service-workers/idlharness.https.any.serviceworker-expected.txt b/third_party/blink/web_tests/external/wpt/service-workers/idlharness.https.any.serviceworker-expected.txt
index cef6795..81b187a 100644
--- a/third_party/blink/web_tests/external/wpt/service-workers/idlharness.https.any.serviceworker-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/service-workers/idlharness.https.any.serviceworker-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 32 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 33 FAIL, 0 TIMEOUT, 0 NOTRUN.
 [FAIL] ServiceWorkerContainer interface: existence and properties of interface object
   assert_own_property: self does not have own property "ServiceWorkerContainer" expected property "ServiceWorkerContainer" missing
 [FAIL] ServiceWorkerContainer interface object length
@@ -58,6 +58,8 @@
   assert_equals: wrong typeof object expected "object" but got "undefined"
 [FAIL] WindowClient interface: attribute ancestorOrigins
   assert_true: The prototype object must have a property "ancestorOrigins" expected true got false
+[FAIL] InstallEvent interface object length
+  assert_equals: wrong value for InstallEvent.length expected 0 but got 1
 [FAIL] FetchEvent interface: attribute replacesClientId
   assert_true: The prototype object must have a property "replacesClientId" expected true got false
 [FAIL] FetchEvent interface: new FetchEvent("type", { request: new Request("") }) must inherit property "replacesClientId" with the proper type
diff --git a/third_party/blink/web_tests/external/wpt/touch-events/mouseevents-after-touchend.tentative.html b/third_party/blink/web_tests/external/wpt/touch-events/mouseevents-after-touchend.tentative.html
new file mode 100644
index 0000000..3032fadf
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/touch-events/mouseevents-after-touchend.tentative.html
@@ -0,0 +1,280 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>Mouse events for compatibility after a tap</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+#parent, #child {
+  width: 300px;
+  height: 64px;
+  padding: 16px;
+}
+#parent {
+  background-color: black;
+}
+#child {
+  background-color: gray;
+}
+</style>
+<script>
+"use strict";
+
+addEventListener("load", t => {
+  let events = [];
+  for (const type of ["mousemove",
+                      "mousedown",
+                      "mouseup",
+                      "click",
+                      "dblclick",
+                      "contextmenu",
+                      "touchend"]) {
+    if (type == "touchend") {
+      addEventListener(type, event => {
+        events.push({type: type, target: event.target});
+      }, {capture: true});
+    } else {
+      addEventListener(type, event => {
+        events.push({
+          type: event.type,
+          target: event.target,
+          detail: event.detail,
+          button: event.button,
+          buttons: event.buttons,
+        });
+      }, {capture: true});
+    }
+  }
+
+  function stringifyEvents(arrayOfEvents) {
+    if (!arrayOfEvents.length) {
+      return "[]";
+    }
+    function stringifyEvent(event) {
+      return `{ type: ${event.type}, target: ${
+        event.target.id || event.target.nodeName
+      }${
+        event.detail !== undefined ? `, detail: ${event.detail}` : ""
+      }${
+        event.button !== undefined ? `, button: ${event.button}` : ""
+      }${
+        event.buttons !== undefined ? `, buttons: ${event.buttons}` : ""
+      } }`;
+    }
+    let ret = "";
+    for (const event of arrayOfEvents) {
+      if (ret === "") {
+        ret = "[ ";
+      } else {
+        ret += ", ";
+      }
+      ret += stringifyEvent(event);
+    }
+    return ret + " ]";
+  }
+  const child = document.getElementById("child");
+  const parent = child.parentNode;
+
+  function promiseInitPointer() {
+    return new test_driver.Actions()
+      .addPointer("touchPointer", "touch")
+      .pointerMove(0, 0, {origin: document.body})
+      .send();
+  }
+  promise_test(async () => {
+    await promiseInitPointer();
+    events = [];
+    await new test_driver.Actions()
+      .addPointer("touchPointer", "touch")
+      .pointerMove(5, 5, {origin: child})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_equals(
+      stringifyEvents(events),
+      stringifyEvents([
+        { type: "touchend", target: child },
+        { type: "mousemove", target: child, detail: 0, button: 0, buttons: 0 },
+        { type: "mousedown", target: child, detail: 1, button: 0, buttons: 1 },
+        { type: "mouseup", target: child, detail: 1, button: 0, buttons: 0 },
+        { type: "click", target: child, detail: 1, button: 0, buttons: 0 },
+      ])
+    );
+  }, "Single tap should cause a click");
+
+  promise_test(async () => {
+    await promiseInitPointer();
+    events = [];
+    child.addEventListener("touchstart", event => {
+      event.preventDefault();
+    }, {once: true});
+    await new test_driver.Actions()
+      .addPointer("touchPointer", "touch")
+      .pointerMove(105, 5, {origin: child})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_equals(
+      stringifyEvents(events),
+      stringifyEvents([
+        { type: "touchend", target: child },
+      ])
+    );
+  }, "Single tap whose touchstart is consumed should not cause a click");
+
+  promise_test(async () => {
+    await promiseInitPointer();
+    events = [];
+    child.addEventListener("touchend", event => {
+      event.preventDefault();
+    }, {once: true});
+    await new test_driver.Actions()
+      .addPointer("touchPointer", "touch")
+      .pointerMove(105, 5, {origin: child})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_equals(
+      stringifyEvents(events),
+      stringifyEvents([
+        { type: "touchend", target: child },
+      ])
+    );
+  }, "Single tap whose touchend is consumed should not cause a click");
+
+  promise_test(async () => {
+    await promiseInitPointer();
+    events = [];
+    await new test_driver.Actions()
+      .addPointer("touchPointer", "touch")
+      .pointerMove(5, 5, {origin: child})
+      .pointerDown()
+      .pointerUp()
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_in_array(
+      stringifyEvents(events),
+      [
+        // Currently, WebDriver does not have a strict way to synthesize a
+        // double click, therefore, it's fine either single click twice or
+        // a set of a double-click.
+        stringifyEvents([
+          { type: "touchend", target: child },
+          { type: "mousemove", target: child, detail: 0, button: 0, buttons: 0 },
+          { type: "mousedown", target: child, detail: 1, button: 0, buttons: 1 },
+          { type: "mouseup", target: child, detail: 1, button: 0, buttons: 0 },
+          { type: "click", target: child, detail: 1, button: 0, buttons: 0 },
+          { type: "touchend", target: child },
+          { type: "mousemove", target: child, detail: 0, button: 0, buttons: 0 },
+          { type: "mousedown", target: child, detail: 1, button: 0, buttons: 1 },
+          { type: "mouseup", target: child, detail: 1, button: 0, buttons: 0 },
+          { type: "click", target: child, detail: 1, button: 0, buttons: 0 },
+        ]),
+        stringifyEvents([
+          { type: "touchend", target: child },
+          { type: "mousemove", target: child, detail: 0, button: 0, buttons: 0 },
+          { type: "mousedown", target: child, detail: 1, button: 0, buttons: 1 },
+          { type: "mouseup", target: child, detail: 1, button: 0, buttons: 0 },
+          { type: "click", target: child, detail: 1, button: 0, buttons: 0 },
+          { type: "touchend", target: child },
+          { type: "mousemove", target: child, detail: 0, button: 0, buttons: 0 },
+          { type: "mousedown", target: child, detail: 2, button: 0, buttons: 1 },
+          { type: "mouseup", target: child, detail: 2, button: 0, buttons: 0 },
+          { type: "click", target: child, detail: 2, button: 0, buttons: 0 },
+          { type: "dblclick", target: child, detail: 2, button: 0, buttons: 0 },
+        ]),
+      ],
+    );
+  }, "Double tap should cause single-click twice or a double-click");
+
+  promise_test(async () => {
+    await promiseInitPointer();
+    events = [];
+    await new test_driver.Actions()
+      .addPointer("touchPointer", "touch")
+      .pointerMove(105, 5, {origin: child})
+      .pointerDown()
+      .pointerUp()
+      .pause(1000)
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_equals(
+      stringifyEvents(events),
+      stringifyEvents([
+        { type: "touchend", target: child },
+        { type: "mousemove", target: child, detail: 0, button: 0, buttons: 0 },
+        { type: "mousedown", target: child, detail: 1, button: 0, buttons: 1 },
+        { type: "mouseup", target: child, detail: 1, button: 0, buttons: 0 },
+        { type: "click", target: child, detail: 1, button: 0, buttons: 0 },
+        { type: "touchend", target: child },
+        { type: "mousemove", target: child, detail: 0, button: 0, buttons: 0 },
+        { type: "mousedown", target: child, detail: 1, button: 0, buttons: 1 },
+        { type: "mouseup", target: child, detail: 1, button: 0, buttons: 0 },
+        { type: "click", target: child, detail: 1, button: 0, buttons: 0 },
+      ])
+    );
+  }, "Tapping twice slowly should not cause a dblclick");
+
+  promise_test(async () => {
+    await promiseInitPointer();
+    events = [];
+    await new test_driver.Actions()
+      .addPointer("touchPointer", "touch")
+      .pointerMove(5, 5, {origin: child})
+      .pointerDown()
+      .pointerUp()
+      .pointerMove(100, 5, {origin: child})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_equals(
+      stringifyEvents(events),
+      stringifyEvents([
+        { type: "touchend", target: child },
+        { type: "mousemove", target: child, detail: 0, button: 0, buttons: 0 },
+        { type: "mousedown", target: child, detail: 1, button: 0, buttons: 1 },
+        { type: "mouseup", target: child, detail: 1, button: 0, buttons: 0 },
+        { type: "click", target: child, detail: 1, button: 0, buttons: 0 },
+        { type: "touchend", target: child },
+        { type: "mousemove", target: child, detail: 0, button: 0, buttons: 0 },
+        { type: "mousedown", target: child, detail: 1, button: 0, buttons: 1 },
+        { type: "mouseup", target: child, detail: 1, button: 0, buttons: 0 },
+        { type: "click", target: child, detail: 1, button: 0, buttons: 0 },
+      ])
+    );
+  }, "Tapping too far points should not cause a dblclick");
+
+  promise_test(async () => {
+    await promiseInitPointer();
+    events = [];
+    await new test_driver.Actions()
+      .addPointer("touchPointer", "touch")
+      .addPointer("touchPointer2", "touch")
+      .pointerMove(5, 5, {origin: child, sourceName: "touchPointer"})
+      .pointerMove(25, 25, {origin: child, sourceName: "touchPointer2"})
+      .pointerDown({sourceName: "touchPointer"})
+      .pointerDown({sourceName: "touchPointer2"})
+      .pointerUp({sourceName: "touchPointer"})
+      .pointerUp({sourceName: "touchPointer2"})
+      .send();
+    assert_equals(
+      stringifyEvents(events),
+      stringifyEvents([
+        { type: "touchend", target: child },
+        { type: "touchend", target: child },
+      ])
+    );
+  }, "Multi tap should not cause mouse events");
+}, {once: true});
+</script>
+</head>
+<body><div id="parent"><div id="child"></div></div></body>
+</html>
diff --git a/third_party/blink/web_tests/external/wpt/uievents/idlharness.window-expected.txt b/third_party/blink/web_tests/external/wpt/uievents/idlharness.window-expected.txt
new file mode 100644
index 0000000..9940085d
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/uievents/idlharness.window-expected.txt
@@ -0,0 +1,40 @@
+This is a testharness.js-based test.
+Found 18 FAIL, 0 TIMEOUT, 0 NOTRUN.
+[FAIL] MutationEvent interface: existence and properties of interface object
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface object length
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface object name
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: existence and properties of interface prototype object
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: existence and properties of interface prototype object's "constructor" property
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: existence and properties of interface prototype object's @@unscopables property
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: constant MODIFICATION on interface object
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: constant MODIFICATION on interface prototype object
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: constant ADDITION on interface object
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: constant ADDITION on interface prototype object
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: constant REMOVAL on interface object
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: constant REMOVAL on interface prototype object
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: attribute relatedNode
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: attribute prevValue
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: attribute newValue
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: attribute attrName
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: attribute attrChange
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+[FAIL] MutationEvent interface: operation initMutationEvent(DOMString, optional boolean, optional boolean, optional Node?, optional DOMString, optional DOMString, optional DOMString, optional unsigned short)
+  assert_own_property: self does not have own property "MutationEvent" expected property "MutationEvent" missing
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper.html b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper.html
index 8bfa009b..5e6ed24e 100644
--- a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper.html
+++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper.html
@@ -8,7 +8,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="../../resources/audit-util.js"></script>
     <script src="../../resources/audit.js"></script>
-    <script src="../../resources/buffer-loader.js"></script>
   </head>
   <body>
     <script id="layout-test-code">
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/browsing_context/context_created/context_created.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/browsing_context/context_created/context_created.py
index e8b7fc5..d772098 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/browsing_context/context_created/context_created.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/browsing_context/context_created/context_created.py
@@ -263,3 +263,22 @@
     )
 
     remove_listener()
+
+
+@pytest.mark.parametrize("type_hint", ["tab", "window"])
+async def test_existing_context(bidi_session, wait_for_event, wait_for_future_safe, subscribe_events, type_hint):
+    # See https://w3c.github.io/webdriver-bidi/#ref-for-remote-end-subscribe-steps%E2%91%A1.
+    top_level_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+
+    on_entry = wait_for_event(CONTEXT_CREATED_EVENT)
+    await subscribe_events([CONTEXT_CREATED_EVENT], contexts=[top_level_context["context"]])
+    context_info = await wait_for_future_safe(on_entry)
+
+    assert_browsing_context(
+        context_info,
+        top_level_context["context"],
+        children=None,
+        url="about:blank",
+        parent=None,
+        user_context="default"
+    )
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/add_intercept.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/add_intercept.py
index 7648eb19..c073e1cc 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/add_intercept.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/add_intercept.py
@@ -17,49 +17,6 @@
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize("phase", ["beforeRequestSent", "responseStarted"])
-async def test_other_context(
-    bidi_session,
-    url,
-    top_context,
-    add_intercept,
-    fetch,
-    setup_network_test,
-    phase,
-):
-    # Subscribe to network events only in top_context
-    await setup_network_test(
-        events=[
-            BEFORE_REQUEST_SENT_EVENT,
-            RESPONSE_STARTED_EVENT,
-            RESPONSE_COMPLETED_EVENT,
-        ],
-        contexts=[top_context["context"]],
-    )
-
-    # Create another tab, where network events are not monitored.
-    other_context = await bidi_session.browsing_context.create(type_hint="tab")
-    await bidi_session.browsing_context.navigate(
-        context=other_context["context"], url=url(PAGE_EMPTY_HTML), wait="complete"
-    )
-
-    # Add an intercept.
-    text_url = url(PAGE_EMPTY_TEXT)
-    await add_intercept(
-        phases=[phase],
-        url_patterns=[{"type": "string", "pattern": text_url}],
-    )
-
-    # Request to top_context should be blocked and throw a ScriptEvaluateResultException
-    # from the AbortController.
-    with pytest.raises(ScriptEvaluateResultException):
-        await fetch(text_url, context=top_context)
-
-    # Request to other_context should not be blocked.
-    await fetch(text_url, context=other_context)
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize("phase", ["beforeRequestSent", "responseStarted"])
 async def test_other_url(
     url,
     add_intercept,
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/contexts.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/contexts.py
new file mode 100644
index 0000000..eed4d20
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/contexts.py
@@ -0,0 +1,108 @@
+import asyncio
+
+import pytest
+from webdriver.bidi.modules.script import ScriptEvaluateResultException
+
+from .. import (
+    assert_before_request_sent_event,
+    PAGE_EMPTY_HTML,
+    PAGE_EMPTY_TEXT,
+    BEFORE_REQUEST_SENT_EVENT,
+    RESPONSE_COMPLETED_EVENT,
+    RESPONSE_STARTED_EVENT,
+)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("phase", ["beforeRequestSent", "responseStarted"])
+async def test_other_context(
+    bidi_session,
+    url,
+    top_context,
+    add_intercept,
+    fetch,
+    setup_network_test,
+    phase,
+):
+    # Subscribe to network events only in top_context
+    await setup_network_test(
+        events=[
+            BEFORE_REQUEST_SENT_EVENT,
+            RESPONSE_STARTED_EVENT,
+            RESPONSE_COMPLETED_EVENT,
+        ],
+        contexts=[top_context["context"]],
+    )
+
+    # Create another tab, where network events are not monitored.
+    other_context = await bidi_session.browsing_context.create(type_hint="tab")
+    await bidi_session.browsing_context.navigate(
+        context=other_context["context"], url=url(PAGE_EMPTY_HTML), wait="complete"
+    )
+
+    # Add an intercept.
+    text_url = url(PAGE_EMPTY_TEXT)
+    await add_intercept(
+        phases=[phase],
+        url_patterns=[{"type": "string", "pattern": text_url}],
+    )
+
+    # Request to top_context should be blocked and throw a ScriptEvaluateResultException
+    # from the AbortController.
+    with pytest.raises(ScriptEvaluateResultException):
+        await fetch(text_url, context=top_context)
+
+    # Request to other_context should not be blocked.
+    await fetch(text_url, context=other_context)
+
+
+@pytest.mark.asyncio
+async def test_other_context_with_event_subscription(
+    bidi_session,
+    url,
+    top_context,
+    add_intercept,
+    fetch,
+    setup_network_test,
+    wait_for_event,
+    wait_for_future_safe
+):
+    # Create another tab that will listen to network events without interception.
+    other_context = await bidi_session.browsing_context.create(type_hint="tab")
+    await bidi_session.browsing_context.navigate(
+        context=other_context["context"], url=url(PAGE_EMPTY_HTML), wait="complete"
+    )
+
+    # Subscribe to network events in both contexts.
+    await setup_network_test(
+        events=[
+            BEFORE_REQUEST_SENT_EVENT,
+            RESPONSE_STARTED_EVENT,
+            RESPONSE_COMPLETED_EVENT,
+        ],
+        contexts=[top_context["context"], other_context["context"]],
+    )
+
+    # Add an intercept to top_context only.
+    text_url = url(PAGE_EMPTY_TEXT)
+    await add_intercept(
+        phases=["beforeRequestSent"],
+        url_patterns=[{"type": "string", "pattern": text_url}],
+        contexts=[top_context["context"]]
+    )
+
+    # Request to the top_context should be blocked.
+    on_network_event = wait_for_event(BEFORE_REQUEST_SENT_EVENT)
+    asyncio.ensure_future(fetch(text_url, context=top_context))
+    event = await wait_for_future_safe(on_network_event)
+    assert_before_request_sent_event(
+        event, is_blocked=True
+    )
+
+    # Request to other_context should not be blocked.
+    on_network_event = wait_for_event(BEFORE_REQUEST_SENT_EVENT)
+    asyncio.ensure_future(fetch(text_url, context=other_context))
+    event = await wait_for_future_safe(on_network_event)
+    assert_before_request_sent_event(
+        event, is_blocked=False
+    )
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/invalid.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/invalid.py
index ac7b2738..187fd989 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/invalid.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/add_intercept/invalid.py
@@ -185,3 +185,32 @@
             phases=["beforeRequestSent"],
             url_patterns=[{"type": "pattern", "search": value}],
         )
+
+
+@pytest.mark.parametrize("value", [False, 42, {}, ""])
+async def test_params_contexts_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(phases=[value])
+
+
+@pytest.mark.parametrize("value", [[], ["does not exist"]])
+async def test_params_contexts_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(phases=["beforeRequestSent"], contexts=value)
+
+
+async def test_params_contexts_context_non_top_level(bidi_session, new_tab, test_page_same_origin_frame):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_page_same_origin_frame,
+        wait="complete",
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
+
+    assert len(contexts) == 1
+    assert len(contexts[0]["children"]) == 1
+    child_info = contexts[0]["children"][0]
+
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(phases=["beforeRequestSent"], contexts=[child_info['context']])
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/conftest.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/conftest.py
index 934b649..40fe20d 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/conftest.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/network/conftest.py
@@ -17,11 +17,12 @@
 
     intercepts = []
 
-    async def add_intercept(phases, url_patterns):
+    async def add_intercept(phases, url_patterns, contexts = None):
         nonlocal intercepts
         intercept = await bidi_session.network.add_intercept(
             phases=phases,
             url_patterns=url_patterns,
+            contexts=contexts,
         )
         intercepts.append(intercept)
 
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/__init__.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/__init__.py
new file mode 100644
index 0000000..4b73b0bc
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/__init__.py
@@ -0,0 +1,3 @@
+async def assert_cookies_are_not_present(bidi_session, filter=None, partition=None):
+    result = await bidi_session.storage.get_cookies(filter=filter, partition=partition)
+    assert result["cookies"] == []
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/filter.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/filter.py
new file mode 100644
index 0000000..eff2f00
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/filter.py
@@ -0,0 +1,497 @@
+import pytest
+from webdriver.bidi.modules.network import NetworkBase64Value, NetworkStringValue
+from webdriver.bidi.modules.storage import CookieFilter
+
+from . import assert_cookies_are_not_present
+from .. import (
+    assert_cookie_is_set,
+    create_cookie,
+    format_expiry_string,
+    generate_expiry_date,
+)
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize(
+    "filter",
+    [
+        ({"size": 6}),
+        ({"value": NetworkStringValue("bar")}),
+        ({"value": NetworkBase64Value("YmFy")}),
+    ],
+)
+async def test_filter(
+    bidi_session,
+    new_tab,
+    test_page,
+    domain_value,
+    add_cookie,
+    filter,
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+    # This value is going to be used to match specified filter options:
+    # 1. size == 6, both matching cookies have name length 3, the value has length 3;
+    # 2. value == "bar";
+    # 3. value == base64 value "YmFy", it will be decoded to a string "bar".
+    cookie_value_matching_filter = "bar"
+
+    cookie1_name = "baz"
+    await add_cookie(new_tab["context"], cookie1_name, cookie_value_matching_filter)
+
+    cookie2_name = "foo"
+    await add_cookie(new_tab["context"], cookie2_name, cookie_value_matching_filter)
+
+    cookie3_name = "foo_3"
+    cookie3_value = "not_bar"
+    await add_cookie(new_tab["context"], cookie3_name, cookie3_value)
+
+    result = await bidi_session.storage.delete_cookies(
+        filter=filter,
+    )
+    assert result == {"partitionKey": {}}
+
+    # Make sure that deleted cookies are not present.
+    await assert_cookies_are_not_present(bidi_session, filter)
+
+    # Make sure that non-deleted cookies are present.
+    await assert_cookie_is_set(
+        bidi_session,
+        domain=domain_value(),
+        name=cookie3_name,
+        value={"type": "string", "value": cookie3_value},
+        path="/webdriver/tests/support",
+        secure=False,
+    )
+
+
+async def test_filter_domain(
+    bidi_session,
+    top_context,
+    new_tab,
+    test_page,
+    test_page_cross_origin,
+    domain_value,
+    add_cookie,
+):
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=test_page, wait="complete"
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page_cross_origin, wait="complete"
+    )
+
+    cookie1_name = "bar"
+    cookie1_value = "foo"
+    await add_cookie(top_context["context"], cookie1_name, cookie1_value)
+
+    cookie2_name = "foo"
+    cookie2_value = "bar"
+    await add_cookie(top_context["context"], cookie2_name, cookie2_value)
+
+    cookie3_name = "foo_2"
+    cookie3_value = "bar_2"
+    cookie3_domain = domain_value(domain="alt")
+    await add_cookie(new_tab["context"], cookie3_name, cookie3_value)
+
+    filter = CookieFilter(domain=domain_value())
+    result = await bidi_session.storage.delete_cookies(
+        filter=filter,
+    )
+    assert result == {"partitionKey": {}}
+
+    # Make sure that deleted cookies are not present.
+    await assert_cookies_are_not_present(bidi_session, filter)
+
+    # Make sure that non-deleted cookies are present.
+    await assert_cookie_is_set(
+        bidi_session,
+        domain=cookie3_domain,
+        name=cookie3_name,
+        value={"type": "string", "value": cookie3_value},
+        path="/webdriver/tests/support",
+        secure=False,
+    )
+
+
+@pytest.mark.parametrize(
+    "expiry_diff_to_delete, expiry_diff_to_remain",
+    [
+        (1, 2),
+        (1, None),
+    ],
+)
+async def test_filter_expiry(
+    bidi_session,
+    new_tab,
+    test_page,
+    domain_value,
+    add_cookie,
+    expiry_diff_to_delete,
+    expiry_diff_to_remain,
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+
+    expiry_date_to_delete = generate_expiry_date(expiry_diff_to_delete)
+    expiry_to_delete = int(expiry_date_to_delete.timestamp())
+    date_string_to_delete = format_expiry_string(expiry_date_to_delete)
+
+    cookie1_name = "bar"
+    cookie1_value = "foo"
+    await add_cookie(
+        context=new_tab["context"],
+        name=cookie1_name,
+        value=cookie1_value,
+        expiry=date_string_to_delete,
+    )
+
+    cookie2_name = "foo"
+    cookie2_value = "bar"
+    await add_cookie(
+        context=new_tab["context"],
+        name=cookie2_name,
+        value=cookie2_value,
+        expiry=date_string_to_delete,
+    )
+
+    cookie3_name = "foo_3"
+    cookie3_value = "bar_3"
+    if expiry_diff_to_remain is None:
+        date_string_to_remain = None
+    else:
+        expiry_date_to_remain = generate_expiry_date(expiry_diff_to_remain)
+        date_string_to_remain = format_expiry_string(expiry_date_to_remain)
+
+    await add_cookie(
+        new_tab["context"], cookie3_name, cookie3_value, expiry=date_string_to_remain
+    )
+
+    filter = CookieFilter(expiry=expiry_to_delete)
+    result = await bidi_session.storage.delete_cookies(
+        filter=CookieFilter(expiry=expiry_to_delete),
+    )
+    assert result == {"partitionKey": {}}
+
+    # Make sure that deleted cookies are not present.
+    await assert_cookies_are_not_present(bidi_session, filter)
+
+    # Make sure that non-deleted cookies are present.
+    await assert_cookie_is_set(
+        bidi_session,
+        domain=domain_value(),
+        name=cookie3_name,
+        value={"type": "string", "value": cookie3_value},
+        path="/webdriver/tests/support",
+        secure=False,
+    )
+
+
+async def test_filter_name(bidi_session, new_tab, test_page, add_cookie, domain_value):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+
+    name_to_delete = "foo"
+
+    cookie1_value = "bar"
+    cookie1_path = "/"
+    await add_cookie(
+        new_tab["context"], name_to_delete, cookie1_value, path=cookie1_path
+    )
+
+    cookie2_value = "baz"
+    cookie2_path = "/webdriver/"
+    await add_cookie(
+        new_tab["context"], name_to_delete, cookie2_value, path=cookie2_path
+    )
+
+    name_to_remain = "foo_2"
+    cookie3_value = "bar_2"
+    cookie3_path = "/"
+    await add_cookie(new_tab["context"], name_to_remain, cookie3_value, path=cookie3_path)
+
+    filter = CookieFilter(name=name_to_delete)
+    result = await bidi_session.storage.delete_cookies(
+        filter=filter,
+    )
+    assert result == {"partitionKey": {}}
+
+    # Make sure that deleted cookies are not present.
+    await assert_cookies_are_not_present(bidi_session, filter)
+
+    # Make sure that non-deleted cookies are present.
+    await assert_cookie_is_set(
+        bidi_session,
+        domain=domain_value(),
+        name=name_to_remain,
+        value={"type": "string", "value": cookie3_value},
+        path=cookie3_path,
+        secure=False,
+    )
+
+
+@pytest.mark.parametrize(
+    "same_site_to_delete, same_site_to_remain",
+    [
+        ("none", "strict"),
+        ("lax", "none"),
+        ("strict", "none"),
+        ("lax", "strict"),
+        ("strict", "lax"),
+    ],
+)
+async def test_filter_same_site(
+    bidi_session,
+    new_tab,
+    test_page,
+    domain_value,
+    same_site_to_delete,
+    same_site_to_remain,
+    add_cookie,
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+
+    cookie1_name = "bar"
+    cookie1_value = "foo"
+    await add_cookie(
+        new_tab["context"],
+        cookie1_name,
+        cookie1_value,
+        same_site=same_site_to_delete,
+    )
+
+    cookie2_name = "foo"
+    cookie2_value = "bar"
+    await add_cookie(
+        new_tab["context"],
+        cookie2_name,
+        cookie2_value,
+        same_site=same_site_to_delete,
+    )
+
+    cookie3_name = "foo_3"
+    cookie3_value = "bar_3"
+    await add_cookie(
+        new_tab["context"], cookie3_name, cookie3_value, same_site=same_site_to_remain
+    )
+
+    filter = CookieFilter(same_site=same_site_to_delete)
+    result = await bidi_session.storage.delete_cookies(
+        filter=filter,
+    )
+    assert result == {"partitionKey": {}}
+
+    # Make sure that deleted cookies are not present.
+    await assert_cookies_are_not_present(bidi_session, filter)
+
+    # Make sure that non-deleted cookies are present
+    await assert_cookie_is_set(
+        bidi_session,
+        domain=domain_value(),
+        name=cookie3_name,
+        value={"type": "string", "value": cookie3_value},
+        path="/webdriver/tests/support",
+        same_site=same_site_to_remain,
+        secure=False,
+    )
+
+
+@pytest.mark.parametrize(
+    "secure_to_delete, secure_to_remain",
+    [(True, False), (False, True)],
+)
+async def test_filter_secure(
+    bidi_session,
+    new_tab,
+    test_page,
+    domain_value,
+    add_cookie,
+    secure_to_delete,
+    secure_to_remain,
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+
+    cookie1_name = "bar"
+    cookie1_value = "foo"
+    await add_cookie(
+        new_tab["context"],
+        cookie1_name,
+        cookie1_value,
+        secure=secure_to_delete,
+    )
+
+    cookie2_name = "foo"
+    cookie2_value = "bar"
+    await add_cookie(
+        new_tab["context"],
+        cookie2_name,
+        cookie2_value,
+        secure=secure_to_delete,
+    )
+
+    cookie3_name = "foo_3"
+    cookie3_value = "bar_3"
+    await add_cookie(
+        new_tab["context"], cookie3_name, cookie3_value, secure=secure_to_remain
+    )
+
+    filter = CookieFilter(secure=secure_to_delete)
+    result = await bidi_session.storage.delete_cookies(
+        filter=filter,
+    )
+    assert result == {"partitionKey": {}}
+
+    # Make sure that deleted cookies are not present.
+    await assert_cookies_are_not_present(bidi_session, filter)
+
+    # Make sure that non-deleted cookies are present.
+    await assert_cookie_is_set(
+        bidi_session,
+        domain=domain_value(),
+        name=cookie3_name,
+        value={"type": "string", "value": cookie3_value},
+        path="/webdriver/tests/support",
+        secure=secure_to_remain,
+    )
+
+
+@pytest.mark.parametrize(
+    "path_to_delete, path_to_remain",
+    [
+        ("/webdriver/tests/support", "/"),
+        ("/", None),
+        ("/webdriver", "/webdriver/tests"),
+    ],
+)
+async def test_filter_path(
+    bidi_session,
+    new_tab,
+    test_page,
+    domain_value,
+    add_cookie,
+    path_to_delete,
+    path_to_remain,
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+
+    cookie1_name = "bar"
+    cookie1_value = "foo"
+    await add_cookie(
+        new_tab["context"],
+        cookie1_name,
+        cookie1_value,
+        path=path_to_delete,
+    )
+
+    cookie2_name = "foo"
+    cookie2_value = "bar"
+    await add_cookie(
+        new_tab["context"],
+        cookie2_name,
+        cookie2_value,
+        path=path_to_delete,
+    )
+
+    cookie3_name = "foo_3"
+    cookie3_value = "bar_3"
+    await add_cookie(
+        new_tab["context"], cookie3_name, cookie3_value, path=path_to_remain
+    )
+
+    filter = CookieFilter(path=path_to_delete)
+    result = await bidi_session.storage.delete_cookies(
+        filter=filter,
+    )
+    assert result == {"partitionKey": {}}
+
+    # Make sure that deleted cookies are not present.
+    await assert_cookies_are_not_present(bidi_session, filter)
+
+    # Make sure that non-deleted cookies are present.
+    await assert_cookie_is_set(
+        bidi_session,
+        domain=domain_value(),
+        name=cookie3_name,
+        value={"type": "string", "value": cookie3_value},
+        path="/webdriver/tests/support" if path_to_remain is None else path_to_remain,
+        secure=False,
+    )
+
+
+@pytest.mark.parametrize(
+    "http_only_to_delete, http_only_to_remain",
+    [(True, False), (False, True)],
+)
+async def test_filter_http_only(
+    bidi_session,
+    new_tab,
+    test_page,
+    domain_value,
+    set_cookie,
+    http_only_to_delete,
+    http_only_to_remain,
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+
+    cookie1_name = "bar"
+    cookie1_value = "foo"
+    await set_cookie(
+        cookie=create_cookie(
+            domain=domain_value(),
+            name=cookie1_name,
+            value=NetworkStringValue(cookie1_value),
+            http_only=http_only_to_delete,
+        )
+    )
+
+    cookie2_name = "foo"
+    cookie2_value = "bar"
+    await set_cookie(
+        cookie=create_cookie(
+            domain=domain_value(),
+            name=cookie2_name,
+            value=NetworkStringValue(cookie2_value),
+            http_only=http_only_to_delete,
+        )
+    )
+
+    cookie3_name = "foo_2"
+    cookie3_value = "bar_2"
+    await set_cookie(
+        cookie=create_cookie(
+            domain=domain_value(),
+            name=cookie3_name,
+            value=NetworkStringValue(cookie3_value),
+            http_only=http_only_to_remain,
+        )
+    )
+
+    filter = CookieFilter(http_only=http_only_to_delete)
+    result = await bidi_session.storage.delete_cookies(
+        filter=filter,
+    )
+    assert result == {"partitionKey": {}}
+
+    # Make sure that deleted cookies are not present.
+    await assert_cookies_are_not_present(bidi_session, filter)
+
+    # Make sure that non-deleted cookies are present
+    await assert_cookie_is_set(
+        bidi_session,
+        domain=domain_value(),
+        name=cookie3_name,
+        value={"type": "string", "value": cookie3_value},
+        http_only=http_only_to_remain,
+    )
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/invalid.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/invalid.py
new file mode 100644
index 0000000..ba9c5a5d
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/invalid.py
@@ -0,0 +1,163 @@
+import pytest
+import webdriver.bidi.error as error
+
+from webdriver.bidi.modules.network import NetworkBase64Value, NetworkStringValue
+from webdriver.bidi.modules.storage import (
+    BrowsingContextPartitionDescriptor,
+    CookieFilter,
+    StorageKeyPartitionDescriptor,
+)
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize("value", [False, 42, "foo", []])
+async def test_params_filter_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=value)
+
+
+@pytest.mark.parametrize("value", [False, 42, {}, []])
+async def test_params_filter_domain_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(domain=value))
+
+
+@pytest.mark.parametrize("value", [False, "foo", {}, [], -1, 0.5])
+async def test_params_filter_expiry_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(expiry=value))
+
+
+@pytest.mark.parametrize("value", ["foo", {}, [], 42])
+async def test_params_filter_http_only_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(http_only=value))
+
+
+@pytest.mark.parametrize("value", [False, 42, {}, []])
+async def test_params_filter_name_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(name=value))
+
+
+@pytest.mark.parametrize("value", [False, 42, {}, []])
+async def test_params_filter_path_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(path=value))
+
+
+@pytest.mark.parametrize("value", [False, 42, {}, []])
+async def test_params_filter_same_site_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(same_site=value))
+
+
+@pytest.mark.parametrize("value", ["", "INVALID_SAME_SITE_STATE"])
+async def test_params_filter_same_site_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(same_site=value))
+
+
+@pytest.mark.parametrize("value", ["foo", {}, [], 42])
+async def test_params_filter_secure_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(secure=value))
+
+
+@pytest.mark.parametrize("value", [False, "foo", {}, [], -1, 0.5])
+async def test_params_filter_size_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(size=value))
+
+
+@pytest.mark.parametrize("value", [False, 42, "foo", []])
+async def test_params_filter_value_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(filter=CookieFilter(value=value))
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_filter_value_type_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(
+            filter=CookieFilter(value={"type": value})
+        )
+
+
+async def test_params_filter_value_type_invalid_value(bidi_session):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(
+            filter=CookieFilter(value={"type": "foo"})
+        )
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_filter_value_base64_type_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(
+            filter=CookieFilter(value=NetworkBase64Value(value))
+        )
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_filter_value_string_type_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(
+            filter=CookieFilter(value=NetworkStringValue(value))
+        )
+
+
+@pytest.mark.parametrize("value", [False, 42, "foo", []])
+async def test_params_partition_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(partition=value)
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_partition_type_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(partition={"type": value})
+
+
+async def test_params_partition_type_invalid_value(bidi_session):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(partition={"type": "foo"})
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_partition_context_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(
+            partition=BrowsingContextPartitionDescriptor(context=value)
+        )
+
+
+async def test_partition_invalid_context(bidi_session):
+    with pytest.raises(error.NoSuchFrameException):
+        await bidi_session.storage.delete_cookies(
+            partition=BrowsingContextPartitionDescriptor("foo")
+        )
+
+
+@pytest.mark.parametrize("value", [False, 42, {}, []])
+async def test_params_partition_source_origin_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(
+            partition=StorageKeyPartitionDescriptor(source_origin=value)
+        )
+
+
+@pytest.mark.parametrize("value", [False, 42, {}, []])
+async def test_params_partition_user_context_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.storage.delete_cookies(
+            partition=StorageKeyPartitionDescriptor(user_context=value)
+        )
+
+
+async def test_params_partition_user_context_invalid_value(bidi_session):
+    with pytest.raises(error.NoSuchUserContextException):
+        await bidi_session.storage.delete_cookies(
+            partition=StorageKeyPartitionDescriptor(user_context="foo")
+        )
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/partition.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/partition.py
new file mode 100644
index 0000000..0b37261
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/delete_cookies/partition.py
@@ -0,0 +1,300 @@
+import pytest
+
+from webdriver.bidi.modules.network import NetworkStringValue
+from webdriver.bidi.modules.storage import (
+    BrowsingContextPartitionDescriptor,
+    PartialCookie,
+    StorageKeyPartitionDescriptor,
+)
+
+from . import assert_cookies_are_not_present
+from .. import assert_cookie_is_set, create_cookie
+from ... import recursive_compare
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize(
+    "with_document_cookie",
+    [True, False],
+    ids=["with document cookie", "with set cookie"],
+)
+async def test_default_partition(
+    bidi_session,
+    top_context,
+    new_tab,
+    test_page,
+    test_page_cross_origin,
+    domain_value,
+    add_cookie,
+    set_cookie,
+    with_document_cookie,
+):
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=test_page_cross_origin, wait="complete"
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+
+    cookie1_name = "foo"
+    cookie1_value = "bar"
+
+    cookie2_name = "foo_2"
+    cookie2_value = "bar_2"
+
+    if with_document_cookie:
+        await add_cookie(new_tab["context"], cookie1_name, cookie1_value)
+        await add_cookie(top_context["context"], cookie2_name, cookie2_value)
+    else:
+        await set_cookie(
+            cookie=create_cookie(
+                domain=domain_value("alt"),
+                name=cookie1_name,
+                value=NetworkStringValue(cookie1_value),
+            )
+        )
+        await set_cookie(
+            cookie=create_cookie(
+                domain=domain_value(),
+                name=cookie2_name,
+                value=NetworkStringValue(cookie2_value),
+            )
+        )
+
+    result = await bidi_session.storage.delete_cookies()
+    assert result == {"partitionKey": {}}
+
+    await assert_cookies_are_not_present(bidi_session)
+
+
+@pytest.mark.parametrize(
+    "with_document_cookie",
+    [True, False],
+    ids=["with document cookie", "with set cookie"],
+)
+async def test_partition_context(
+    bidi_session,
+    new_tab,
+    test_page,
+    domain_value,
+    add_cookie,
+    set_cookie,
+    with_document_cookie,
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+
+    cookie_name = "foo"
+    cookie_value = "bar"
+    partition = BrowsingContextPartitionDescriptor(new_tab["context"])
+    if with_document_cookie:
+        await add_cookie(new_tab["context"], cookie_name, cookie_value)
+    else:
+        await set_cookie(
+            cookie=create_cookie(
+                domain=domain_value(),
+                name=cookie_name,
+                value=NetworkStringValue(cookie_value),
+            ),
+            partition=partition,
+        )
+
+    result = await bidi_session.storage.delete_cookies(partition=partition)
+    # `partitionKey` here might contain `sourceOrigin` for certain browser implementation,
+    # so use `recursive_compare` to allow additional fields to be present.
+    recursive_compare({"partitionKey": {}}, result)
+
+    await assert_cookies_are_not_present(bidi_session, partition)
+
+
+@pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
+async def test_partition_context_iframe(
+    bidi_session, new_tab, inline, domain_value, domain, set_cookie
+):
+    iframe_url = inline("<div id='in-iframe'>foo</div>", domain=domain)
+    page_url = inline(f"<iframe src='{iframe_url}'></iframe>")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=page_url, wait="complete"
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
+    iframe_context = contexts[0]["children"][0]
+
+    cookie_name = "foo"
+    cookie_value = "bar"
+    frame_partition = BrowsingContextPartitionDescriptor(iframe_context["context"])
+    await set_cookie(
+        cookie=create_cookie(
+            domain=domain_value(domain),
+            name=cookie_name,
+            value=NetworkStringValue(cookie_value),
+        ),
+        partition=frame_partition,
+    )
+
+    result = await bidi_session.storage.delete_cookies(partition=frame_partition)
+    # `partitionKey` here might contain `sourceOrigin` for certain browser implementation,
+    # so use `recursive_compare` to allow additional fields to be present.
+    recursive_compare({"partitionKey": {}}, result)
+
+    await assert_cookies_are_not_present(bidi_session, frame_partition)
+
+
+@pytest.mark.parametrize(
+    "protocol",
+    [
+        "http",
+        "https",
+    ],
+)
+async def test_partition_source_origin(
+    bidi_session,
+    new_tab,
+    top_context,
+    test_page,
+    inline,
+    domain_value,
+    origin,
+    set_cookie,
+    protocol,
+):
+    url = inline("<div>bar</div>", protocol=protocol, domain="alt")
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=url, wait="complete"
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_page, wait="complete"
+    )
+
+    cookie1_domain = domain_value(domain="alt")
+    cookie1_name = "foo"
+    cookie1_value = "bar"
+    cookie1_source_origin = origin(domain="alt", protocol=protocol)
+    cookie1_partition = StorageKeyPartitionDescriptor(
+        source_origin=cookie1_source_origin
+    )
+    await set_cookie(
+        cookie=create_cookie(
+            domain=cookie1_domain,
+            name=cookie1_name,
+            value=NetworkStringValue(cookie1_value),
+        ),
+        partition=cookie1_partition,
+    )
+
+    cookie2_domain = domain_value()
+    cookie2_name = "bar"
+    cookie2_value = "foo"
+    cookie2_source_origin = origin()
+    cookie2_partition = StorageKeyPartitionDescriptor(
+        source_origin=cookie2_source_origin
+    )
+    await set_cookie(
+        cookie=create_cookie(
+            domain=cookie2_domain,
+            name=cookie2_name,
+            value=NetworkStringValue(cookie2_value),
+        ),
+        partition=cookie2_partition,
+    )
+
+    result = await bidi_session.storage.delete_cookies(partition=cookie1_partition)
+    recursive_compare({"partitionKey": {"sourceOrigin": cookie1_source_origin}}, result)
+
+    await assert_cookies_are_not_present(bidi_session, partition=cookie1_partition)
+
+    # Check that the second cookie is still present on another origin.
+    await assert_cookie_is_set(
+        bidi_session=bidi_session,
+        domain=domain_value(),
+        name=cookie2_name,
+        value={"type": "string", "value": cookie2_value},
+        partition=cookie2_partition,
+    )
+
+
+@pytest.mark.parametrize(
+    "with_document_cookie",
+    [True, False],
+    ids=["with document cookie", "with set cookie"],
+)
+async def test_partition_user_context(
+    bidi_session,
+    test_page,
+    create_user_context,
+    test_page_cross_origin,
+    domain_value,
+    add_cookie,
+    set_cookie,
+    with_document_cookie,
+):
+    user_context_1 = await create_user_context()
+    new_context_1 = await bidi_session.browsing_context.create(
+        user_context=user_context_1, type_hint="tab"
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_context_1["context"], url=test_page, wait="complete"
+    )
+
+    user_context_2 = await create_user_context()
+    new_context_2 = await bidi_session.browsing_context.create(
+        user_context=user_context_2, type_hint="tab"
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_context_2["context"], url=test_page_cross_origin, wait="complete"
+    )
+
+    cookie1_domain = domain_value()
+    cookie1_name = "foo_1"
+    cookie1_value = "bar_1"
+    cookie1_partition = StorageKeyPartitionDescriptor(user_context=user_context_1)
+
+    cookie2_domain = domain_value(domain="alt")
+    cookie2_name = "foo_2"
+    cookie2_value = "bar_2"
+    cookie2_partition = StorageKeyPartitionDescriptor(user_context=user_context_2)
+
+    if with_document_cookie:
+        await add_cookie(
+            new_context_1["context"], cookie1_name, cookie1_value, path="/"
+        )
+        await add_cookie(
+            new_context_2["context"], cookie2_name, cookie2_value, path="/"
+        )
+    else:
+        await set_cookie(
+            cookie=PartialCookie(
+                domain=cookie1_domain,
+                name=cookie1_name,
+                value=NetworkStringValue(cookie1_value),
+            ),
+            partition=cookie1_partition,
+        )
+        await set_cookie(
+            cookie=PartialCookie(
+                domain=cookie2_domain,
+                name=cookie2_name,
+                value=NetworkStringValue(cookie2_value),
+            ),
+            partition=cookie2_partition,
+        )
+
+    result = await bidi_session.storage.delete_cookies(
+        partition=StorageKeyPartitionDescriptor(user_context=user_context_1)
+    )
+    recursive_compare({"partitionKey": {"userContext": user_context_1}}, result)
+
+    # Make sure that deleted cookies are not present.
+    await assert_cookies_are_not_present(bidi_session, partition=cookie1_partition)
+
+    # Check that the second cookie is still present on another origin.
+    await assert_cookie_is_set(
+        bidi_session=bidi_session,
+        domain=cookie2_domain,
+        name=cookie2_name,
+        value={"type": "string", "value": cookie2_value},
+        partition=cookie2_partition,
+        secure=False
+    )
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/get_cookies/invalid.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/get_cookies/invalid.py
index fbd5647f..93d0da2 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/get_cookies/invalid.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/get_cookies/invalid.py
@@ -153,3 +153,10 @@
         await bidi_session.storage.get_cookies(
             partition=StorageKeyPartitionDescriptor(user_context=value)
         )
+
+
+async def test_params_partition_user_context_invalid_value(bidi_session):
+    with pytest.raises(error.NoSuchUserContextException):
+        await bidi_session.storage.get_cookies(
+            partition=StorageKeyPartitionDescriptor(user_context="foo")
+        )
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/get_cookies/partition.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/get_cookies/partition.py
index a1c2650..fb17554 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/get_cookies/partition.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/get_cookies/partition.py
@@ -103,7 +103,7 @@
 
     # `partitionKey` here might contain `sourceOrigin` for certain browser implementation,
     # so use `recursive_compare` to allow additional fields to be present.
-    recursive_compare({"partitionKey": {}}, cookies)
+    recursive_compare({"partitionKey": {"userContext": "default"}}, cookies)
 
     assert len(cookies["cookies"]) == 1
     recursive_compare(
@@ -127,7 +127,7 @@
 
     # `partitionKey` here might contain `sourceOrigin` for certain browser implementation,
     # so use `recursive_compare` to allow additional fields to be present.
-    recursive_compare({"partitionKey": {}}, cookies)
+    recursive_compare({"partitionKey": {"userContext": user_context}}, cookies)
     assert len(cookies["cookies"]) == 0
 
 
@@ -174,7 +174,7 @@
                     "value": {"type": "string", "value": cookie_value},
                 }
             ],
-            "partitionKey": {},
+            "partitionKey": {"userContext": "default"},
         },
         cookies,
     )
@@ -256,3 +256,119 @@
         },
         cookies,
     )
+
+
+async def test_partition_default_user_context(
+    bidi_session,
+    test_page,
+    domain_value,
+    add_cookie,
+):
+    new_context = await bidi_session.browsing_context.create(type_hint="tab")
+    await bidi_session.browsing_context.navigate(
+        context=new_context["context"], url=test_page, wait="complete"
+    )
+
+    cookie_name = "foo"
+    cookie_value = "bar"
+    await add_cookie(new_context["context"], cookie_name, cookie_value)
+
+    # Check that added cookies are present on the right user context.
+    result = await bidi_session.storage.get_cookies(
+        partition=StorageKeyPartitionDescriptor(user_context="default")
+    )
+    expected_cookies = [
+        {
+            "domain": domain_value(),
+            "httpOnly": False,
+            "name": cookie_name,
+            "path": "/webdriver/tests/support",
+            "sameSite": "none",
+            "secure": False,
+            "size": 6,
+            "value": {"type": "string", "value": cookie_value},
+        }
+    ]
+    recursive_compare(
+        {
+            "cookies": expected_cookies,
+            "partitionKey": {"userContext": "default"},
+        },
+        result,
+    )
+
+
+async def test_partition_user_context(
+    bidi_session,
+    test_page,
+    domain_value,
+    create_user_context,
+    test_page_cross_origin,
+    add_cookie,
+):
+    user_context_1 = await create_user_context()
+    new_context_1 = await bidi_session.browsing_context.create(
+        user_context=user_context_1, type_hint="tab"
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_context_1["context"], url=test_page, wait="complete"
+    )
+
+    user_context_2 = await create_user_context()
+    new_context_2 = await bidi_session.browsing_context.create(
+        user_context=user_context_2, type_hint="tab"
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_context_2["context"], url=test_page_cross_origin, wait="complete"
+    )
+
+    cookie_name = "foo_1"
+    cookie_value = "bar_1"
+    await add_cookie(new_context_1["context"], cookie_name, cookie_value)
+
+    # Check that added cookies are present on the right user context.
+    result = await bidi_session.storage.get_cookies(
+        partition=StorageKeyPartitionDescriptor(user_context=user_context_1)
+    )
+    expected_cookies = [
+        {
+            "domain": domain_value(),
+            "httpOnly": False,
+            "name": cookie_name,
+            "path": "/webdriver/tests/support",
+            "sameSite": "none",
+            "secure": False,
+            "size": 10,
+            "value": {"type": "string", "value": cookie_value},
+        }
+    ]
+    recursive_compare(
+        {
+            "cookies": expected_cookies,
+            "partitionKey": {"userContext": user_context_1},
+        },
+        result,
+    )
+
+    # Check that added cookies are not present on the other user context.
+    result = await bidi_session.storage.get_cookies(
+        partition=StorageKeyPartitionDescriptor(user_context=user_context_2)
+    )
+
+    recursive_compare(
+        {
+            "cookies": [],
+            "partitionKey": {"userContext": user_context_2},
+        },
+        result,
+    )
+
+    # Check that added cookies will also be returned when partition is not specified.
+    result = await bidi_session.storage.get_cookies()
+    recursive_compare(
+        {
+            "cookies": expected_cookies,
+            "partitionKey": {},
+        },
+        result,
+    )
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/set_cookie/invalid.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/set_cookie/invalid.py
index 53d2573..9962d30 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/set_cookie/invalid.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/set_cookie/invalid.py
@@ -122,5 +122,9 @@
     with pytest.raises(error.InvalidArgumentException):
         await set_cookie(cookie=create_cookie(domain=domain_value()), partition=partition)
 
-# TODO: test `test_partition_storage_key_user_context_unknown`.
-# TODO: test `test_partition_storage_key_user_context_invalid_type`.
+
+async def test_partition_storage_key_user_context_invalid_value(set_cookie, domain_value):
+    partition = StorageKeyPartitionDescriptor(user_context="foo")
+
+    with pytest.raises(error.NoSuchUserContextException):
+        await set_cookie(cookie=create_cookie(domain=domain_value()), partition=partition)
diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/set_cookie/partition.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/set_cookie/partition.py
index cb0ace1..9283ee0 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/set_cookie/partition.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/bidi/storage/set_cookie/partition.py
@@ -14,7 +14,7 @@
         # Browsing context does not require a `sourceOrigin` partition key, but it can be present depending on the
         # browser implementation.
         # `recursive_compare` allows the actual result to be any extension of the expected one.
-        recursive_compare({'partitionKey': {}, }, set_cookie_result)
+        recursive_compare({'partitionKey': {"userContext": "default"}, }, set_cookie_result)
         return
     if isinstance(partition, StorageKeyPartitionDescriptor):
         expected_partition_key = {}
@@ -75,4 +75,19 @@
 
     await assert_cookie_is_set(bidi_session, domain=domain_value(), partition=partition)
 
-# TODO: test `test_partition_storage_key_user_context`.
+
+async def test_partition_user_context(
+    bidi_session,
+    domain_value,
+    create_user_context,
+    set_cookie
+):
+    user_context_1 = await create_user_context()
+
+    partition = StorageKeyPartitionDescriptor(user_context=user_context_1)
+    set_cookie_result = await set_cookie(
+        cookie=create_cookie(domain=domain_value()),
+        partition=partition)
+    assert_set_cookie_result(set_cookie_result, partition)
+
+    await assert_cookie_is_set(bidi_session, domain=domain_value(), partition=partition)
diff --git a/third_party/blink/web_tests/external/wpt/webnn/arg_min_max.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/arg_min_max.https.any.js
deleted file mode 100644
index cff1d6a..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/arg_min_max.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API argMin/Max operations
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-argminmax
-
-testWebNNOperation(['argMin', 'argMax'], buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/batch_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/batch_normalization.https.any.js
deleted file mode 100644
index 15e66a8..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/batch_normalization.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API batchNormalization operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-batchnorm
-
-testWebNNOperation('batchNormalization', buildBatchNorm);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/cast.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/cast.https.any.js
deleted file mode 100644
index c9be45a..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/cast.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API cast operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-cast
-
-testWebNNOperation('cast', buildCast);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/clamp.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/clamp.https.any.js
deleted file mode 100644
index 9818aed..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/clamp.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API clamp operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-clamp
-
-testWebNNOperation('clamp', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/concat.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/concat.https.any.js
deleted file mode 100644
index cce43e49..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/concat.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API concat operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-concat
-
-testWebNNOperation('concat', buildConcat);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/arg_min_max.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/arg_min_max.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/arg_min_max.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/arg_min_max.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/arg_min_max.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/arg_min_max.https.any.js
new file mode 100644
index 0000000..123c8b1
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/arg_min_max.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API argMin/Max operations
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-argminmax
+
+testWebNNOperation(['argMin', 'argMax'], buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/arg_min_max.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/arg_min_max.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/arg_min_max.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/arg_min_max.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/batch_normalization.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/batch_normalization.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/batch_normalization.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/batch_normalization.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/batch_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/batch_normalization.https.any.js
new file mode 100644
index 0000000..9a1c85d
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/batch_normalization.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API batchNormalization operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-batchnorm
+
+testWebNNOperation('batchNormalization', buildBatchNorm);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/batch_normalization.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/batch_normalization.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/batch_normalization.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/batch_normalization.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/cast.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/cast.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/cast.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/cast.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/cast.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/cast.https.any.js
new file mode 100644
index 0000000..bde2b9a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/cast.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API cast operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-cast
+
+testWebNNOperation('cast', buildCast);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/cast.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/cast.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/cast.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/cast.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/clamp.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/clamp.https.any.js
new file mode 100644
index 0000000..7b60c41f
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/clamp.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API clamp operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-clamp
+
+testWebNNOperation('clamp', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/concat.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/concat.https.any.js
new file mode 100644
index 0000000..254e0b6
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/concat.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API concat operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-concat
+
+testWebNNOperation('concat', buildConcat);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/constant.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/constant.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/constant.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/constant.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/constant.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/constant.https.any.js
new file mode 100644
index 0000000..4814734
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/constant.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API constant
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-constant-range
+
+testWebNNOperation('constant', buildConstantRange);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/constant.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/constant.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/constant.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/constant.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv2d.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv2d.https.any-expected.txt
new file mode 100644
index 0000000..d3118267
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv2d.https.any-expected.txt
@@ -0,0 +1,45 @@
+This is a testharness.js-based test.
+[FAIL] conv2d float32 4D input and filter(non-constant) tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D both input and filter constant tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] depthwise conv2d float32 4D input and filter tensors options.groups= input_channels
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nchw'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout oihw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='oihw'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='hwio'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ohwi'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ihwo'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='oihw'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout oihw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='hwio'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout hwio is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ihwo'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout ihwo is not supported."
+[FAIL] conv2d float32 4D input and filter tensors 1D options.bias
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.activation=relu
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.activation=sigmoid
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors all options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors, both negative input tensor and options.bias
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv2d.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv2d.https.any.js
new file mode 100644
index 0000000..0d9a621
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv2d.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API conv2d operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-conv2d
+
+testWebNNOperation('conv2d', buildConv2d);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv2d.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv2d.https.any.worker-expected.txt
new file mode 100644
index 0000000..d3118267
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv2d.https.any.worker-expected.txt
@@ -0,0 +1,45 @@
+This is a testharness.js-based test.
+[FAIL] conv2d float32 4D input and filter(non-constant) tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D both input and filter constant tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] depthwise conv2d float32 4D input and filter tensors options.groups= input_channels
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nchw'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout oihw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='oihw'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='hwio'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ohwi'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ihwo'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='oihw'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout oihw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='hwio'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout hwio is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ihwo'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout ihwo is not supported."
+[FAIL] conv2d float32 4D input and filter tensors 1D options.bias
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.activation=relu
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.activation=sigmoid
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors all options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] conv2d float32 4D input and filter tensors, both negative input tensor and options.bias
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any-expected.txt
new file mode 100644
index 0000000..d3dc543
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any-expected.txt
@@ -0,0 +1,43 @@
+This is a testharness.js-based test.
+[FAIL] convTranspose2d float32 4D input and filter(non-constant) tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D both input and filter constant tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.groups
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.groups=2 options.strides=[2, 2]
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.outputPadding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.outputSizes
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nchw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout iohw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=iohw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=hwoi
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=ohwi
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=iohw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout iohw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=hwoi
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout hwoi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.bias
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors, both negative input tensor and options.bias
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.activation=relu
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any.js
new file mode 100644
index 0000000..ee5d28c7
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API convTranspose2d operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-convtranspose2d
+
+testWebNNOperation('convTranspose2d', buildConvTranspose2d);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any.worker-expected.txt
new file mode 100644
index 0000000..d3dc543
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any.worker-expected.txt
@@ -0,0 +1,43 @@
+This is a testharness.js-based test.
+[FAIL] convTranspose2d float32 4D input and filter(non-constant) tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D both input and filter constant tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.groups
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.groups=2 options.strides=[2, 2]
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.outputPadding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.outputSizes
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nchw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout iohw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=iohw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=hwoi
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=ohwi
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=iohw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout iohw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=hwoi
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout hwoi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.bias
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors, both negative input tensor and options.bias
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.activation=relu
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elementwise_binary.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_binary.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/elementwise_binary.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_binary.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_binary.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_binary.https.any.js
new file mode 100644
index 0000000..5db14a4
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_binary.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API element-wise binary operations
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-binary
+
+testWebNNOperation(['add', 'sub', 'mul', 'div', 'max', 'min', 'pow'], buildOperationWithTwoInputs);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elementwise_binary.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_binary.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/elementwise_binary.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_binary.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elementwise_logical.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_logical.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/elementwise_logical.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_logical.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_logical.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_logical.https.any.js
new file mode 100644
index 0000000..a60c199
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_logical.https.any.js
@@ -0,0 +1,20 @@
+// META: title=test WebNN API element-wise logical operations
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-logical
+
+testWebNNOperation(
+  [
+    'equal',
+    'greater',
+    'greaterOrEqual',
+    'lesser',
+    'lesserOrEqual',
+  ],
+  buildOperationWithTwoInputs
+);
+testWebNNOperation('logicalNot', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elementwise_logical.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_logical.https.any.worker-expected.txt
similarity index 100%
copy from third_party/blink/web_tests/external/wpt/webnn/elementwise_logical.https.any-expected.txt
copy to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_logical.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elementwise_unary.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_unary.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/elementwise_unary.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_unary.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_unary.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_unary.https.any.js
new file mode 100644
index 0000000..8029539
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_unary.https.any.js
@@ -0,0 +1,13 @@
+// META: title=test WebNN API element-wise unary operations
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-unary
+
+testWebNNOperation(
+  ['abs', 'ceil', 'cos', 'erf', 'exp', 'floor', 'identity', 'log', 'neg', 'reciprocal', 'sin', 'sqrt', 'tan'],
+  buildOperationWithSingleInput
+);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elementwise_unary.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_unary.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/elementwise_unary.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elementwise_unary.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elu.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elu.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/elu.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elu.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elu.https.any.js
new file mode 100644
index 0000000..382faa9
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elu.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API elu operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-elu
+
+testWebNNOperation('elu', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elu.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elu.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/elu.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/elu.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/expand.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/expand.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/expand.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/expand.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/expand.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/expand.https.any.js
new file mode 100644
index 0000000..b1be129e
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/expand.https.any.js
@@ -0,0 +1,11 @@
+// META: title=test WebNN API expand operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-expand
+
+// reuse buildReshape method
+testWebNNOperation('expand', buildReshape);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/expand.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/expand.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/expand.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/expand.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gather.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gather.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/gather.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gather.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gather.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gather.https.any.js
new file mode 100644
index 0000000..39b1970
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gather.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API gather operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-gather
+
+testWebNNOperation('gather', buildOperationWithTwoInputs);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gather.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gather.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/gather.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gather.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gemm.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gemm.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/gemm.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gemm.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gemm.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gemm.https.any.js
new file mode 100644
index 0000000..61fd7c9
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gemm.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API gemm operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-gemm
+
+testWebNNOperation('gemm', buildGemm);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gemm.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gemm.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/gemm.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gemm.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/arg_min_max.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/arg_min_max.https.any.js
new file mode 100644
index 0000000..c700ee5
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/arg_min_max.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API argMin/Max operations
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-argminmax
+
+testWebNNOperation(['argMin', 'argMax'], buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/batch_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/batch_normalization.https.any.js
new file mode 100644
index 0000000..534cdf63
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/batch_normalization.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API batchNormalization operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-batchnorm
+
+testWebNNOperation('batchNormalization', buildBatchNorm, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/cast.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/cast.https.any.js
new file mode 100644
index 0000000..e4309ff
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/cast.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API cast operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-cast
+
+testWebNNOperation('cast', buildCast, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/clamp.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/clamp.https.any.js
new file mode 100644
index 0000000..9b3f93e
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/clamp.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API clamp operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-clamp
+
+testWebNNOperation('clamp', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/concat.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/concat.https.any.js
new file mode 100644
index 0000000..c0cfb862
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/concat.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API concat operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-concat
+
+testWebNNOperation('concat', buildConcat, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/constant.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/constant.https.any.js
new file mode 100644
index 0000000..77b4d88
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/constant.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API constant
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-constant-range
+
+testWebNNOperation('constant', buildConstantRange, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.js
new file mode 100644
index 0000000..770540a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API conv2d operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-conv2d
+
+testWebNNOperation('conv2d', buildConv2d, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.js
new file mode 100644
index 0000000..08c441b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API convTranspose2d operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-convtranspose2d
+
+testWebNNOperation('convTranspose2d', buildConvTranspose2d, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elementwise_binary.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elementwise_binary.https.any.js
new file mode 100644
index 0000000..8b9fa48
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elementwise_binary.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API element-wise binary operations
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-binary
+
+testWebNNOperation(['add', 'sub', 'mul', 'div', 'max', 'min', 'pow'], buildOperationWithTwoInputs, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elementwise_logical.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elementwise_logical.https.any.js
new file mode 100644
index 0000000..70a887a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elementwise_logical.https.any.js
@@ -0,0 +1,20 @@
+// META: title=test WebNN API element-wise logical operations
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-logical
+
+testWebNNOperation(
+  [
+    'equal',
+    'greater',
+    'greaterOrEqual',
+    'lesser',
+    'lesserOrEqual',
+  ],
+  buildOperationWithTwoInputs, 'gpu'
+);
+testWebNNOperation('logicalNot', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elementwise_unary.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elementwise_unary.https.any.js
new file mode 100644
index 0000000..8871129
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elementwise_unary.https.any.js
@@ -0,0 +1,13 @@
+// META: title=test WebNN API element-wise unary operations
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-unary
+
+testWebNNOperation(
+  ['abs', 'ceil', 'cos', 'erf', 'exp', 'floor', 'identity', 'log', 'neg', 'reciprocal', 'sin', 'sqrt', 'tan'],
+  buildOperationWithSingleInput, 'gpu'
+);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elu.https.any.js
new file mode 100644
index 0000000..db14442
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/elu.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API elu operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-elu
+
+testWebNNOperation('elu', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/expand.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/expand.https.any.js
new file mode 100644
index 0000000..f46f4637
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/expand.https.any.js
@@ -0,0 +1,11 @@
+// META: title=test WebNN API expand operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-expand
+
+// reuse buildReshape method
+testWebNNOperation('expand', buildReshape, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/gather.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/gather.https.any.js
new file mode 100644
index 0000000..8e45719
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/gather.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API gather operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-gather
+
+testWebNNOperation('gather', buildOperationWithTwoInputs, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/gemm.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/gemm.https.any.js
new file mode 100644
index 0000000..f288c31b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/gemm.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API gemm operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-gemm
+
+testWebNNOperation('gemm', buildGemm, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/hard_sigmoid.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/hard_sigmoid.https.any.js
new file mode 100644
index 0000000..d40e42a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/hard_sigmoid.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API hardSigmoid operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-hard-sigmoid
+
+testWebNNOperation('hardSigmoid', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/hard_swish.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/hard_swish.https.any.js
new file mode 100644
index 0000000..031e65ee
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/hard_swish.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API tanh operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-hard-swish
+
+testWebNNOperation('hardSwish', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/instance_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/instance_normalization.https.any.js
new file mode 100644
index 0000000..ecfaac71
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/instance_normalization.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API instanceNormalization operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-instancenorm
+
+testWebNNOperation('instanceNormalization', buildLayerNorm, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/layer_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/layer_normalization.https.any.js
new file mode 100644
index 0000000..0e4f6cae
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/layer_normalization.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API layerNormalization operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-layernorm
+
+testWebNNOperation('layerNormalization', buildLayerNorm, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/leaky_relu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/leaky_relu.https.any.js
new file mode 100644
index 0000000..9fab235
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/leaky_relu.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API leakyRelu operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-leakyrelu
+
+testWebNNOperation('leakyRelu', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/linear.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/linear.https.any.js
new file mode 100644
index 0000000..ccec2c3
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/linear.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API linear operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-linear
+
+testWebNNOperation('linear', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/matmul.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/matmul.https.any.js
new file mode 100644
index 0000000..635ce84a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/matmul.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API matmul operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-matmul
+
+testWebNNOperation('matmul', buildOperationWithTwoInputs, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/pad.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/pad.https.any.js
new file mode 100644
index 0000000..f313e2c
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/pad.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API pad operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-pad
+
+testWebNNOperation('pad', buildPad, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.js
new file mode 100644
index 0000000..837bca2c
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API pooling operations
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-pool2d
+
+testWebNNOperation(['averagePool2d', 'l2Pool2d', 'maxPool2d'], buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/prelu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/prelu.https.any.js
new file mode 100644
index 0000000..475cd9e
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/prelu.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API prelu operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-prelu
+
+testWebNNOperation('prelu', buildOperationWithTwoInputs, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/reduction.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/reduction.https.any.js
new file mode 100644
index 0000000..0f3cefa
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/reduction.https.any.js
@@ -0,0 +1,24 @@
+// META: title=test WebNN API reduction  operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-reduce
+
+testWebNNOperation(
+  [
+    'reduceL1',
+    'reduceL2',
+    'reduceLogSum',
+    'reduceLogSumExp',
+    'reduceMax',
+    'reduceMean',
+    'reduceMin',
+    'reduceProduct',
+    'reduceSum',
+    'reduceSumSquare',
+  ],
+  buildOperationWithSingleInput, 'gpu'
+);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/relu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/relu.https.any.js
new file mode 100644
index 0000000..d1a3536
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/relu.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API relu operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-relu
+
+testWebNNOperation('relu', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/reshape.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/reshape.https.any.js
new file mode 100644
index 0000000..b0217d2
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/reshape.https.any.js
@@ -0,0 +1,11 @@
+// META: title=test WebNN API reshape operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-reshape
+
+testWebNNOperation('reshape', buildReshape, 'gpu');
+
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/sigmoid.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/sigmoid.https.any.js
new file mode 100644
index 0000000..26116c0
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/sigmoid.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API sigmoid operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-sigmoid
+
+testWebNNOperation('sigmoid', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/slice.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/slice.https.any.js
new file mode 100644
index 0000000..1710c79a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/slice.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API slice operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-slice
+
+testWebNNOperation('slice', buildSlice, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/softmax.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/softmax.https.any.js
new file mode 100644
index 0000000..9eaffe2b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/softmax.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API softmax operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softmax
+
+testWebNNOperation('softmax', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/softplus.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/softplus.https.any.js
new file mode 100644
index 0000000..5f068461
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/softplus.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API softplus operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softplus
+
+testWebNNOperation('softplus', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/softsign.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/softsign.https.any.js
new file mode 100644
index 0000000..eac0b7ec4
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/softsign.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API softsign operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softsign
+
+testWebNNOperation('softsign', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/split.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/split.https.any.js
new file mode 100644
index 0000000..3b0aafd7
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/split.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API split operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-split
+
+testWebNNOperation('split', buildSplit, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/tanh.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/tanh.https.any.js
new file mode 100644
index 0000000..3029f48
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/tanh.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API tanh operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-tanh
+
+testWebNNOperation('tanh', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/transpose.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/transpose.https.any.js
new file mode 100644
index 0000000..295ef43
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/transpose.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API transpose operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-transpose
+
+testWebNNOperation('transpose', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/triangular.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/triangular.https.any.js
new file mode 100644
index 0000000..3e1b0d5
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/triangular.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API triangular operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-triangular
+
+testWebNNOperation('triangular', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/where.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/where.https.any.js
new file mode 100644
index 0000000..49c6cbd4
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/gpu/where.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API where operation
+// META: global=window,dedicatedworker
+// META: script=../../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-where
+
+testWebNNOperation('where', buildWhere, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/hard_sigmoid.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/hard_sigmoid.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any.js
new file mode 100644
index 0000000..8161a24
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API hardSigmoid operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-hard-sigmoid
+
+testWebNNOperation('hardSigmoid', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/hard_sigmoid.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/hard_sigmoid.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_swish.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_swish.https.any.js
new file mode 100644
index 0000000..b4a7c53
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/hard_swish.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API tanh operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-hard-swish
+
+testWebNNOperation('hardSwish', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/instance_normalization.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/instance_normalization.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/instance_normalization.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/instance_normalization.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/instance_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/instance_normalization.https.any.js
new file mode 100644
index 0000000..fce8791
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/instance_normalization.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API instanceNormalization operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-instancenorm
+
+testWebNNOperation('instanceNormalization', buildLayerNorm);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/instance_normalization.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/instance_normalization.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/instance_normalization.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/instance_normalization.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/layer_normalization.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/layer_normalization.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/layer_normalization.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/layer_normalization.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/layer_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/layer_normalization.https.any.js
new file mode 100644
index 0000000..ab8a50c
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/layer_normalization.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API layerNormalization operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-layernorm
+
+testWebNNOperation('layerNormalization', buildLayerNorm);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/layer_normalization.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/layer_normalization.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/layer_normalization.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/layer_normalization.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/leaky_relu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/leaky_relu.https.any.js
new file mode 100644
index 0000000..2b6f17e
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/leaky_relu.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API leakyRelu operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-leakyrelu
+
+testWebNNOperation('leakyRelu', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/linear.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/linear.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/linear.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/linear.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/linear.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/linear.https.any.js
new file mode 100644
index 0000000..465b697f
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/linear.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API linear operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-linear
+
+testWebNNOperation('linear', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/linear.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/linear.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/linear.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/linear.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/matmul.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/matmul.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/matmul.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/matmul.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/matmul.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/matmul.https.any.js
new file mode 100644
index 0000000..64eeb37f
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/matmul.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API matmul operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-matmul
+
+testWebNNOperation('matmul', buildOperationWithTwoInputs);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/matmul.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/matmul.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/matmul.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/matmul.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/pad.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pad.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/pad.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pad.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pad.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pad.https.any.js
new file mode 100644
index 0000000..f1a2400
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pad.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API pad operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-pad
+
+testWebNNOperation('pad', buildPad);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/pad.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pad.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/pad.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pad.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pooling.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pooling.https.any-expected.txt
new file mode 100644
index 0000000..c565fca9
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pooling.https.any-expected.txt
@@ -0,0 +1,77 @@
+This is a testharness.js-based test.
+[FAIL] averagePool2d float32 4D constant tensor all positive default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor all positive default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor all negative default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] l2Pool2d float32 4D constant tensor all positive default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor default all positive options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor default all negative options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.layout=nhwc
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.dilations with options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] maxPool2d float32 4D constant tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pooling.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pooling.https.any.js
new file mode 100644
index 0000000..400d5ed
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pooling.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API pooling operations
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-pool2d
+
+testWebNNOperation(['averagePool2d', 'l2Pool2d', 'maxPool2d'], buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pooling.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pooling.https.any.worker-expected.txt
new file mode 100644
index 0000000..c565fca9
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/pooling.https.any.worker-expected.txt
@@ -0,0 +1,77 @@
+This is a testharness.js-based test.
+[FAIL] averagePool2d float32 4D constant tensor all positive default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor all positive default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor all negative default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] l2Pool2d float32 4D constant tensor all positive default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor default all positive options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor default all negative options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.layout=nhwc
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] l2Pool2d float32 4D tensor options.dilations with options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
+[FAIL] maxPool2d float32 4D constant tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/webnn/prelu.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/prelu.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/prelu.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/prelu.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/prelu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/prelu.https.any.js
new file mode 100644
index 0000000..83cc9db4
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/prelu.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API prelu operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-prelu
+
+testWebNNOperation('prelu', buildOperationWithTwoInputs);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/prelu.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/prelu.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/prelu.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/prelu.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/reduction.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reduction.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/reduction.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reduction.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reduction.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reduction.https.any.js
new file mode 100644
index 0000000..30bfb4b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reduction.https.any.js
@@ -0,0 +1,24 @@
+// META: title=test WebNN API reduction  operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-reduce
+
+testWebNNOperation(
+  [
+    'reduceL1',
+    'reduceL2',
+    'reduceLogSum',
+    'reduceLogSumExp',
+    'reduceMax',
+    'reduceMean',
+    'reduceMin',
+    'reduceProduct',
+    'reduceSum',
+    'reduceSumSquare',
+  ],
+  buildOperationWithSingleInput
+);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/reduction.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reduction.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/reduction.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reduction.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/relu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/relu.https.any.js
new file mode 100644
index 0000000..51e4278
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/relu.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API relu operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-relu
+
+testWebNNOperation('relu', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reshape.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reshape.https.any.js
new file mode 100644
index 0000000..c0dafb1
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/reshape.https.any.js
@@ -0,0 +1,11 @@
+// META: title=test WebNN API reshape operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-reshape
+
+testWebNNOperation('reshape', buildReshape);
+
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/sigmoid.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/sigmoid.https.any.js
new file mode 100644
index 0000000..186f468
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/sigmoid.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API sigmoid operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-sigmoid
+
+testWebNNOperation('sigmoid', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/slice.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/slice.https.any.js
new file mode 100644
index 0000000..6441204
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/slice.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API slice operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-slice
+
+testWebNNOperation('slice', buildSlice);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softmax.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softmax.https.any.js
new file mode 100644
index 0000000..143b7d96
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softmax.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API softmax operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softmax
+
+testWebNNOperation('softmax', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/softplus.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softplus.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/softplus.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softplus.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softplus.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softplus.https.any.js
new file mode 100644
index 0000000..fcd6410b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softplus.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API softplus operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softplus
+
+testWebNNOperation('softplus', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/softplus.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softplus.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/softplus.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softplus.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/softsign.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softsign.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/softsign.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softsign.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softsign.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softsign.https.any.js
new file mode 100644
index 0000000..6e26afda
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softsign.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API softsign operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softsign
+
+testWebNNOperation('softsign', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/softsign.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softsign.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/softsign.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/softsign.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/split.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/split.https.any.js
new file mode 100644
index 0000000..0de6cb4d
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/split.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API split operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-split
+
+testWebNNOperation('split', buildSplit);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/tanh.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/tanh.https.any.js
new file mode 100644
index 0000000..c5d1f86
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/tanh.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API tanh operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-tanh
+
+testWebNNOperation('tanh', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/transpose.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/transpose.https.any.js
new file mode 100644
index 0000000..746e53d
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/transpose.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API transpose operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-transpose
+
+testWebNNOperation('transpose', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/triangular.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/triangular.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/triangular.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/triangular.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/triangular.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/triangular.https.any.js
new file mode 100644
index 0000000..503f3106
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/triangular.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API triangular operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-triangular
+
+testWebNNOperation('triangular', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/triangular.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/triangular.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/triangular.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/triangular.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/where.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/where.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/where.https.any-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/where.https.any-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/where.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/where.https.any.js
new file mode 100644
index 0000000..7926221
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/where.https.any.js
@@ -0,0 +1,10 @@
+// META: title=test WebNN API where operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-where
+
+testWebNNOperation('where', buildWhere);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/where.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conformance_tests/where.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/webnn/where.https.any.worker-expected.txt
rename to third_party/blink/web_tests/external/wpt/webnn/conformance_tests/where.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/external/wpt/webnn/constant.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/constant.https.any.js
deleted file mode 100644
index afb020d..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/constant.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API constant
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-constant-range
-
-testWebNNOperation('constant', buildConstantRange);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conv2d.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conv2d.https.any-expected.txt
deleted file mode 100644
index f2ab788fe..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/conv2d.https.any-expected.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] conv2d float32 4D input and filter(non-constant) tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D both input and filter constant tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.padding and options.autoPad='explicit'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-upper'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-upper' ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-lower'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-lower' ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] depthwise conv2d float32 4D input and filter tensors options.groups= input_channels
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nchw'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout oihw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='oihw'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='hwio'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ohwi'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ihwo'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='oihw'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout oihw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='hwio'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout hwio is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ihwo'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout ihwo is not supported."
-[FAIL] conv2d float32 4D input and filter tensors 1D options.bias
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.activation=relu
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.activation=sigmoid
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors all options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors, both negative input tensor and options.bias
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conv2d.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conv2d.https.any.js
deleted file mode 100644
index b26b35e..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/conv2d.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API conv2d operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-conv2d
-
-testWebNNOperation('conv2d', buildConv2d);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conv2d.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conv2d.https.any.worker-expected.txt
deleted file mode 100644
index f2ab788fe..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/conv2d.https.any.worker-expected.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] conv2d float32 4D input and filter(non-constant) tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D both input and filter constant tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.padding and options.autoPad='explicit'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-upper'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-upper' ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-lower'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-lower' ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] depthwise conv2d float32 4D input and filter tensors options.groups= input_channels
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nchw'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout oihw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='oihw'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='hwio'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ohwi'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ihwo'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='oihw'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout oihw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='hwio'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout hwio is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ihwo'
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout ihwo is not supported."
-[FAIL] conv2d float32 4D input and filter tensors 1D options.bias
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.activation=relu
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.activation=sigmoid
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors all options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] conv2d float32 4D input and filter tensors, both negative input tensor and options.bias
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conv_transpose2d.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conv_transpose2d.https.any-expected.txt
deleted file mode 100644
index a2516782..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/conv_transpose2d.https.any-expected.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] convTranspose2d float32 4D input and filter(non-constant) tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D both input and filter constant tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.groups
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.groups=2 options.strides=[2, 2]
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.outputPadding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.outputSizes
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=explicit options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper ignored options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower ignored options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nchw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout iohw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=iohw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=hwoi
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=ohwi
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=iohw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout iohw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=hwoi
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout hwoi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.bias
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors, both negative input tensor and options.bias
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.activation=relu
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conv_transpose2d.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/conv_transpose2d.https.any.js
deleted file mode 100644
index 99e76b8..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/conv_transpose2d.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API convTranspose2d operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-convtranspose2d
-
-testWebNNOperation('convTranspose2d', buildConvTranspose2d);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/conv_transpose2d.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/conv_transpose2d.https.any.worker-expected.txt
deleted file mode 100644
index a2516782..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/conv_transpose2d.https.any.worker-expected.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] convTranspose2d float32 4D input and filter(non-constant) tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D both input and filter constant tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.groups
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.groups=2 options.strides=[2, 2]
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.outputPadding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.outputSizes
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=explicit options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper ignored options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower ignored options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nchw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout iohw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=iohw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=hwoi
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=ohwi
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=iohw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout iohw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=hwoi
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The filter layout hwoi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.bias
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors, both negative input tensor and options.bias
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.activation=relu
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elementwise_binary.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/elementwise_binary.https.any.js
deleted file mode 100644
index 06c2404..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/elementwise_binary.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API element-wise binary operations
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-binary
-
-testWebNNOperation(['add', 'sub', 'mul', 'div', 'max', 'min', 'pow'], buildOperationWithTwoInputs);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elementwise_logical.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/elementwise_logical.https.any.js
deleted file mode 100644
index e614b94..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/elementwise_logical.https.any.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// META: title=test WebNN API element-wise logical operations
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-logical
-
-testWebNNOperation(
-  [
-    'equal',
-    'greater',
-    'greaterOrEqual',
-    'lesser',
-    'lesserOrEqual',
-  ],
-  buildOperationWithTwoInputs
-);
-testWebNNOperation('logicalNot', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elementwise_unary.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/elementwise_unary.https.any.js
deleted file mode 100644
index 4cdfee5b..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/elementwise_unary.https.any.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// META: title=test WebNN API element-wise unary operations
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-unary
-
-testWebNNOperation(
-  ['abs', 'ceil', 'cos', 'erf', 'exp', 'floor', 'identity', 'log', 'neg', 'reciprocal', 'sin', 'sqrt', 'tan'],
-  buildOperationWithSingleInput
-);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/elu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/elu.https.any.js
deleted file mode 100644
index 57b624b..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/elu.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API elu operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-elu
-
-testWebNNOperation('elu', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/expand.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/expand.https.any.js
deleted file mode 100644
index 11abb9ba..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/expand.https.any.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// META: title=test WebNN API expand operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-expand
-
-// reuse buildReshape method
-testWebNNOperation('expand', buildReshape);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gather.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gather.https.any.js
deleted file mode 100644
index 52bcece..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gather.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API gather operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-gather
-
-testWebNNOperation('gather', buildOperationWithTwoInputs);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gemm.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gemm.https.any.js
deleted file mode 100644
index e5de952..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gemm.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API gemm operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-gemm
-
-testWebNNOperation('gemm', buildGemm);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/arg_min_max.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/arg_min_max.https.any.js
deleted file mode 100644
index 76092ea9..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/arg_min_max.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API argMin/Max operations
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-argminmax
-
-testWebNNOperation(['argMin', 'argMax'], buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/batch_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/batch_normalization.https.any.js
deleted file mode 100644
index 90b6def..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/batch_normalization.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API batchNormalization operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-batchnorm
-
-testWebNNOperation('batchNormalization', buildBatchNorm, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/cast.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/cast.https.any.js
deleted file mode 100644
index 1830364..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/cast.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API cast operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-cast
-
-testWebNNOperation('cast', buildCast, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/clamp.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/clamp.https.any.js
deleted file mode 100644
index 9831386..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/clamp.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API clamp operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-clamp
-
-testWebNNOperation('clamp', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/concat.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/concat.https.any.js
deleted file mode 100644
index 0707372..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/concat.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API concat operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-concat
-
-testWebNNOperation('concat', buildConcat, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/constant.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/constant.https.any.js
deleted file mode 100644
index 7e0933f..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/constant.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API constant
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-constant-range
-
-testWebNNOperation('constant', buildConstantRange, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/conv2d.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/conv2d.https.any.js
deleted file mode 100644
index b3986b65..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/conv2d.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API conv2d operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-conv2d
-
-testWebNNOperation('conv2d', buildConv2d, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/conv_transpose2d.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/conv_transpose2d.https.any.js
deleted file mode 100644
index 020bfa9..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/conv_transpose2d.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API convTranspose2d operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-convtranspose2d
-
-testWebNNOperation('convTranspose2d', buildConvTranspose2d, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/elementwise_binary.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/elementwise_binary.https.any.js
deleted file mode 100644
index 035d0c77..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/elementwise_binary.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API element-wise binary operations
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-binary
-
-testWebNNOperation(['add', 'sub', 'mul', 'div', 'max', 'min', 'pow'], buildOperationWithTwoInputs, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/elementwise_logical.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/elementwise_logical.https.any.js
deleted file mode 100644
index f597ce8e..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/elementwise_logical.https.any.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// META: title=test WebNN API element-wise logical operations
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-logical
-
-testWebNNOperation(
-  [
-    'equal',
-    'greater',
-    'greaterOrEqual',
-    'lesser',
-    'lesserOrEqual',
-  ],
-  buildOperationWithTwoInputs, 'gpu'
-);
-testWebNNOperation('logicalNot', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/elementwise_unary.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/elementwise_unary.https.any.js
deleted file mode 100644
index 45978f91..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/elementwise_unary.https.any.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// META: title=test WebNN API element-wise unary operations
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-unary
-
-testWebNNOperation(
-  ['abs', 'ceil', 'cos', 'erf', 'exp', 'floor', 'identity', 'log', 'neg', 'reciprocal', 'sin', 'sqrt', 'tan'],
-  buildOperationWithSingleInput, 'gpu'
-);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/elu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/elu.https.any.js
deleted file mode 100644
index 965bb4d..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/elu.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API elu operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-elu
-
-testWebNNOperation('elu', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/expand.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/expand.https.any.js
deleted file mode 100644
index 82fa891a..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/expand.https.any.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// META: title=test WebNN API expand operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-expand
-
-// reuse buildReshape method
-testWebNNOperation('expand', buildReshape, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/gather.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/gather.https.any.js
deleted file mode 100644
index 7c8a685c..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/gather.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API gather operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-gather
-
-testWebNNOperation('gather', buildOperationWithTwoInputs, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/gemm.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/gemm.https.any.js
deleted file mode 100644
index a19dc39b..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/gemm.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API gemm operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-gemm
-
-testWebNNOperation('gemm', buildGemm, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/hard_sigmoid.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/hard_sigmoid.https.any.js
deleted file mode 100644
index b6f2f53b..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/hard_sigmoid.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API hardSigmoid operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-hard-sigmoid
-
-testWebNNOperation('hardSigmoid', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/hard_swish.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/hard_swish.https.any.js
deleted file mode 100644
index a173149..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/hard_swish.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API tanh operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-hard-swish
-
-testWebNNOperation('hardSwish', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/instance_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/instance_normalization.https.any.js
deleted file mode 100644
index e1d73de..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/instance_normalization.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API instanceNormalization operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-instancenorm
-
-testWebNNOperation('instanceNormalization', buildLayerNorm, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/layer_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/layer_normalization.https.any.js
deleted file mode 100644
index 1deb43b..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/layer_normalization.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API layerNormalization operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-layernorm
-
-testWebNNOperation('layerNormalization', buildLayerNorm, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/leaky_relu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/leaky_relu.https.any.js
deleted file mode 100644
index f3a7bd8b..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/leaky_relu.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API leakyRelu operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-leakyrelu
-
-testWebNNOperation('leakyRelu', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/linear.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/linear.https.any.js
deleted file mode 100644
index 48b8d82c..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/linear.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API linear operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-linear
-
-testWebNNOperation('linear', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/matmul.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/matmul.https.any.js
deleted file mode 100644
index 01fed04..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/matmul.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API matmul operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-matmul
-
-testWebNNOperation('matmul', buildOperationWithTwoInputs, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/pad.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/pad.https.any.js
deleted file mode 100644
index 26d1bf0f..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/pad.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API pad operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-pad
-
-testWebNNOperation('pad', buildPad, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/pooling.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/pooling.https.any.js
deleted file mode 100644
index e174bb51..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/pooling.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API pooling operations
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-pool2d
-
-testWebNNOperation(['averagePool2d', 'l2Pool2d', 'maxPool2d'], buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/prelu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/prelu.https.any.js
deleted file mode 100644
index 5a1580e..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/prelu.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API prelu operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-prelu
-
-testWebNNOperation('prelu', buildOperationWithTwoInputs, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/reduction.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/reduction.https.any.js
deleted file mode 100644
index 69f9b64..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/reduction.https.any.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// META: title=test WebNN API reduction  operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-reduce
-
-testWebNNOperation(
-  [
-    'reduceL1',
-    'reduceL2',
-    'reduceLogSum',
-    'reduceLogSumExp',
-    'reduceMax',
-    'reduceMean',
-    'reduceMin',
-    'reduceProduct',
-    'reduceSum',
-    'reduceSumSquare',
-  ],
-  buildOperationWithSingleInput, 'gpu'
-);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/relu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/relu.https.any.js
deleted file mode 100644
index dc09846..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/relu.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API relu operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-relu
-
-testWebNNOperation('relu', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/reshape.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/reshape.https.any.js
deleted file mode 100644
index e5145e2..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/reshape.https.any.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// META: title=test WebNN API reshape operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-reshape
-
-testWebNNOperation('reshape', buildReshape, 'gpu');
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/sigmoid.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/sigmoid.https.any.js
deleted file mode 100644
index 6c85f5b..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/sigmoid.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API sigmoid operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-sigmoid
-
-testWebNNOperation('sigmoid', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/slice.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/slice.https.any.js
deleted file mode 100644
index 98e5f422..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/slice.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API slice operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-slice
-
-testWebNNOperation('slice', buildSlice, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/softmax.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/softmax.https.any.js
deleted file mode 100644
index 9170dd0..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/softmax.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API softmax operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softmax
-
-testWebNNOperation('softmax', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/softplus.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/softplus.https.any.js
deleted file mode 100644
index a61e5be..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/softplus.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API softplus operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softplus
-
-testWebNNOperation('softplus', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/softsign.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/softsign.https.any.js
deleted file mode 100644
index f598cbf..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/softsign.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API softsign operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softsign
-
-testWebNNOperation('softsign', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/split.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/split.https.any.js
deleted file mode 100644
index 8eecd76fa..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/split.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API split operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-split
-
-testWebNNOperation('split', buildSplit, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/tanh.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/tanh.https.any.js
deleted file mode 100644
index 15a9eeb0..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/tanh.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API tanh operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-tanh
-
-testWebNNOperation('tanh', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/transpose.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/transpose.https.any.js
deleted file mode 100644
index 074e18a..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/transpose.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API transpose operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-transpose
-
-testWebNNOperation('transpose', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/triangular.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/triangular.https.any.js
deleted file mode 100644
index 3b779fa..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/triangular.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API triangular operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-triangular
-
-testWebNNOperation('triangular', buildOperationWithSingleInput, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/gpu/where.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/gpu/where.https.any.js
deleted file mode 100644
index ec0c553..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/gpu/where.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API where operation
-// META: global=window,dedicatedworker
-// META: script=../resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-where
-
-testWebNNOperation('where', buildWhere, 'gpu');
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/hard_sigmoid.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/hard_sigmoid.https.any.js
deleted file mode 100644
index 81bd512..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/hard_sigmoid.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API hardSigmoid operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-hard-sigmoid
-
-testWebNNOperation('hardSigmoid', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/hard_swish.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/hard_swish.https.any.js
deleted file mode 100644
index 052c7f2..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/hard_swish.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API tanh operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-hard-swish
-
-testWebNNOperation('hardSwish', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/idlharness.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/idlharness.https.any-expected.txt
index 33b7418..d8b5b08 100644
--- a/third_party/blink/web_tests/external/wpt/webnn/idlharness.https.any-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/webnn/idlharness.https.any-expected.txt
@@ -1,38 +1,16 @@
 This is a testharness.js-based test.
-Found 33 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 22 FAIL, 0 TIMEOUT, 0 NOTRUN.
 [FAIL] idl_test setup
   promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
 [FAIL] NavigatorML must be primary interface of navigator
   assert_own_property: self does not have own property "NavigatorML" expected property "NavigatorML" missing
 [FAIL] Stringification of navigator
   assert_class_string: class string of navigator expected "[object NavigatorML]" but got "[object Navigator]"
-[FAIL] MLCommandEncoder interface: existence and properties of interface object
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface object length
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface object name
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: existence and properties of interface prototype object
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: existence and properties of interface prototype object's "constructor" property
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: existence and properties of interface prototype object's @@unscopables property
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: operation initializeGraph(MLGraph)
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: operation dispatch(MLGraph, MLNamedGPUResources, MLNamedGPUResources)
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: operation finish(optional GPUCommandBufferDescriptor)
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLContext interface: operation createCommandEncoder()
-  assert_own_property: interface prototype object missing non-static operation expected property "createCommandEncoder" missing
-[FAIL] MLContext interface: context must inherit property "createCommandEncoder()" with the proper type
-  assert_inherits: property "createCommandEncoder" not found in prototype chain
 [FAIL] MLGraph must be primary interface of graph
   assert_equals: Unexpected exception when evaluating object expected null but got object "ReferenceError: graph is not defined"
 [FAIL] Stringification of graph
   assert_equals: Unexpected exception when evaluating object expected null but got object "ReferenceError: graph is not defined"
-[FAIL] MLGraphBuilder interface: operation constant(MLOperandDescriptor, MLBufferView)
+[FAIL] MLGraphBuilder interface: operation constant(MLOperandDescriptor, ArrayBufferView)
   assert_equals: property has wrong .length expected 1 but got 2
 [FAIL] MLGraphBuilder interface: operation constant(double, optional MLOperandDataType)
   assert_equals: property has wrong .length expected 1 but got 2
diff --git a/third_party/blink/web_tests/external/wpt/webnn/idlharness.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/idlharness.https.any.worker-expected.txt
index bb5fd6a..05cd225 100644
--- a/third_party/blink/web_tests/external/wpt/webnn/idlharness.https.any.worker-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/webnn/idlharness.https.any.worker-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 46 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 23 FAIL, 0 TIMEOUT, 0 NOTRUN.
 [FAIL] idl_test setup
   promise_test: Unhandled rejection with value: object "NotSupportedError: The input layout nchw is not supported."
 [FAIL] NavigatorML must be primary interface of navigator
@@ -8,56 +8,14 @@
   assert_class_string: class string of navigator expected "[object NavigatorML]" but got "[object WorkerNavigator]"
 [FAIL] NavigatorML interface: navigator must not have property "ml"
   assert_false: expected false got true
-[FAIL] ML interface: operation createContextSync(optional MLContextOptions)
-  assert_own_property: interface prototype object missing non-static operation expected property "createContextSync" missing
-[FAIL] ML interface: operation createContextSync(GPUDevice)
-  assert_own_property: interface prototype object missing non-static operation expected property "createContextSync" missing
-[FAIL] ML interface: navigator.ml must inherit property "createContextSync(optional MLContextOptions)" with the proper type
-  assert_inherits: property "createContextSync" not found in prototype chain
-[FAIL] ML interface: calling createContextSync(optional MLContextOptions) on navigator.ml with too few arguments must throw TypeError
-  assert_inherits: property "createContextSync" not found in prototype chain
-[FAIL] ML interface: navigator.ml must inherit property "createContextSync(GPUDevice)" with the proper type
-  assert_inherits: property "createContextSync" not found in prototype chain
-[FAIL] ML interface: calling createContextSync(GPUDevice) on navigator.ml with too few arguments must throw TypeError
-  assert_inherits: property "createContextSync" not found in prototype chain
-[FAIL] MLCommandEncoder interface: existence and properties of interface object
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface object length
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface object name
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: existence and properties of interface prototype object
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: existence and properties of interface prototype object's "constructor" property
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: existence and properties of interface prototype object's @@unscopables property
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: operation initializeGraph(MLGraph)
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: operation dispatch(MLGraph, MLNamedGPUResources, MLNamedGPUResources)
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLCommandEncoder interface: operation finish(optional GPUCommandBufferDescriptor)
-  assert_own_property: self does not have own property "MLCommandEncoder" expected property "MLCommandEncoder" missing
-[FAIL] MLContext interface: operation computeSync(MLGraph, MLNamedArrayBufferViews, MLNamedArrayBufferViews)
-  assert_own_property: interface prototype object missing non-static operation expected property "computeSync" missing
-[FAIL] MLContext interface: operation createCommandEncoder()
-  assert_own_property: interface prototype object missing non-static operation expected property "createCommandEncoder" missing
-[FAIL] MLContext interface: context must inherit property "computeSync(MLGraph, MLNamedArrayBufferViews, MLNamedArrayBufferViews)" with the proper type
-  assert_inherits: property "computeSync" not found in prototype chain
-[FAIL] MLContext interface: calling computeSync(MLGraph, MLNamedArrayBufferViews, MLNamedArrayBufferViews) on context with too few arguments must throw TypeError
-  assert_inherits: property "computeSync" not found in prototype chain
-[FAIL] MLContext interface: context must inherit property "createCommandEncoder()" with the proper type
-  assert_inherits: property "createCommandEncoder" not found in prototype chain
 [FAIL] MLGraph must be primary interface of graph
   assert_equals: Unexpected exception when evaluating object expected null but got object "ReferenceError: graph is not defined"
 [FAIL] Stringification of graph
   assert_equals: Unexpected exception when evaluating object expected null but got object "ReferenceError: graph is not defined"
-[FAIL] MLGraphBuilder interface: operation constant(MLOperandDescriptor, MLBufferView)
+[FAIL] MLGraphBuilder interface: operation constant(MLOperandDescriptor, ArrayBufferView)
   assert_equals: property has wrong .length expected 1 but got 2
 [FAIL] MLGraphBuilder interface: operation constant(double, optional MLOperandDataType)
   assert_equals: property has wrong .length expected 1 but got 2
-[FAIL] MLGraphBuilder interface: operation buildSync(MLNamedOperands)
-  assert_own_property: interface prototype object missing non-static operation expected property "buildSync" missing
 [FAIL] MLGraphBuilder interface: operation not(MLOperand)
   assert_own_property: interface prototype object missing non-static operation expected property "not" missing
 [FAIL] MLGraphBuilder interface: operation gru(MLOperand, MLOperand, MLOperand, unsigned long, unsigned long, optional MLGruOptions)
@@ -68,10 +26,6 @@
   assert_own_property: interface prototype object missing non-static operation expected property "lstmCell" missing
 [FAIL] MLGraphBuilder interface: operation triangular(MLOperand, optional MLTriangularOptions)
   assert_own_property: interface prototype object missing non-static operation expected property "triangular" missing
-[FAIL] MLGraphBuilder interface: builder must inherit property "buildSync(MLNamedOperands)" with the proper type
-  assert_inherits: property "buildSync" not found in prototype chain
-[FAIL] MLGraphBuilder interface: calling buildSync(MLNamedOperands) on builder with too few arguments must throw TypeError
-  assert_inherits: property "buildSync" not found in prototype chain
 [FAIL] MLGraphBuilder interface: builder must inherit property "not(MLOperand)" with the proper type
   assert_inherits: property "not" not found in prototype chain
 [FAIL] MLGraphBuilder interface: calling not(MLOperand) on builder with too few arguments must throw TypeError
diff --git a/third_party/blink/web_tests/external/wpt/webnn/instance_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/instance_normalization.https.any.js
deleted file mode 100644
index 0b7a7089..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/instance_normalization.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API instanceNormalization operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-instancenorm
-
-testWebNNOperation('instanceNormalization', buildLayerNorm);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/layer_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/layer_normalization.https.any.js
deleted file mode 100644
index 380db4e..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/layer_normalization.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API layerNormalization operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-layernorm
-
-testWebNNOperation('layerNormalization', buildLayerNorm);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/leaky_relu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/leaky_relu.https.any.js
deleted file mode 100644
index 61539ce..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/leaky_relu.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API leakyRelu operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-leakyrelu
-
-testWebNNOperation('leakyRelu', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/linear.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/linear.https.any.js
deleted file mode 100644
index 4b2c055..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/linear.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API linear operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-linear
-
-testWebNNOperation('linear', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/matmul.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/matmul.https.any.js
deleted file mode 100644
index 8a9882a..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/matmul.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API matmul operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-matmul
-
-testWebNNOperation('matmul', buildOperationWithTwoInputs);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/pad.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/pad.https.any.js
deleted file mode 100644
index 05eec653..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/pad.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API pad operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-pad
-
-testWebNNOperation('pad', buildPad);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/pooling.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/pooling.https.any-expected.txt
deleted file mode 100644
index 7cf96aa0..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/pooling.https.any-expected.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-This is a testharness.js-based test.
-Found 52 FAIL, 0 TIMEOUT, 0 NOTRUN.
-[FAIL] averagePool2d float32 4D constant tensor all positive default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor all positive default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor all negative default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] l2Pool2d float32 4D constant tensor all positive default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor default all positive options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor default all negative options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.layout=nhwc
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.dilations with options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] maxPool2d float32 4D constant tensor default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/pooling.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/pooling.https.any.js
deleted file mode 100644
index c34ae2bb..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/pooling.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API pooling operations
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-pool2d
-
-testWebNNOperation(['averagePool2d', 'l2Pool2d', 'maxPool2d'], buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/pooling.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/pooling.https.any.worker-expected.txt
deleted file mode 100644
index 7cf96aa0..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/pooling.https.any.worker-expected.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-This is a testharness.js-based test.
-Found 52 FAIL, 0 TIMEOUT, 0 NOTRUN.
-[FAIL] averagePool2d float32 4D constant tensor all positive default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor all positive default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor all negative default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] l2Pool2d float32 4D constant tensor all positive default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor default all positive options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor default all negative options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.layout=nhwc
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] l2Pool2d float32 4D tensor options.dilations with options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The operator (l2Pool2d) is not supported."
-[FAIL] maxPool2d float32 4D constant tensor default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor default options
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "NotSupportedError: The nchw input layout is not supported."
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/prelu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/prelu.https.any.js
deleted file mode 100644
index c1b2e9f..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/prelu.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API prelu operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-prelu
-
-testWebNNOperation('prelu', buildOperationWithTwoInputs);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/reduction.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/reduction.https.any.js
deleted file mode 100644
index 20bd74d8..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/reduction.https.any.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// META: title=test WebNN API reduction  operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-reduce
-
-testWebNNOperation(
-  [
-    'reduceL1',
-    'reduceL2',
-    'reduceLogSum',
-    'reduceLogSumExp',
-    'reduceMax',
-    'reduceMean',
-    'reduceMin',
-    'reduceProduct',
-    'reduceSum',
-    'reduceSumSquare',
-  ],
-  buildOperationWithSingleInput
-);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/relu.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/relu.https.any.js
deleted file mode 100644
index 42b64e1..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/relu.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API relu operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-relu
-
-testWebNNOperation('relu', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/reshape.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/reshape.https.any.js
deleted file mode 100644
index e073363..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/reshape.https.any.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// META: title=test WebNN API reshape operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-reshape
-
-testWebNNOperation('reshape', buildReshape);
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/average_pool2d.json b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/average_pool2d.json
index 5a9f4e2..3d0c432 100644
--- a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/average_pool2d.json
+++ b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/average_pool2d.json
@@ -534,340 +534,6 @@
       }
     },
     {
-      "name": "averagePool2d float32 4D tensor options.autoPad=explicit",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 5, 5],
-          "data": [
-            22.975555502750634,
-            78.15438048012338,
-            9.68611138116071,
-            51.29803808129347,
-            32.19308601456918,
-            87.65037289600019,
-            87.25082191311348,
-            39.49793996935087,
-            80.09963591169489,
-            10.220142557736978,
-            52.60270021646585,
-            1.4128639882603933,
-            11.954064466077474,
-            85.0007506374375,
-            64.7837446465813,
-            88.03128735720126,
-            11.333851214909307,
-            70.61659435728073,
-            84.90442561999888,
-            79.06688041781518,
-            7.328724951604215,
-            35.97796581186121,
-            10.17730631094398,
-            1.4140757517112412,
-            78.10038172113374,
-            91.59549689157087,
-            65.64701225681809,
-            55.14215004436653,
-            18.432438840756184,
-            49.34624267439973,
-            15.648024969290454,
-            68.02723372727797,
-            20.342549040418124,
-            26.72794900604616,
-            64.87446829774323,
-            46.56714896227794,
-            79.57832937136276,
-            4.338463748959498,
-            38.18383968382213,
-            45.253981324455175,
-            80.9717996657439,
-            67.58124910163149,
-            6.026499585657263,
-            29.77881349289366,
-            58.58993337807239,
-            2.2384984647495054,
-            14.505490166700486,
-            68.72449589246624,
-            76.45657404642184,
-            23.53263275794233
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "padding": [1, 0, 0, 1],
-        "autoPad": "explicit"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          52.43666076660156,
-          49.84208297729492,
-          47.26926803588867,
-          46.15715408325195,
-          46.63268280029297,
-          43.616947174072266,
-          44.72445297241211,
-          44.05451583862305
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "averagePool2d float32 4D tensor options.autoPad=same-upper",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            18.669797402066955,
-            95.74087629574039,
-            24.142204556566483,
-            51.13168108230512,
-            32.59428648032041,
-            36.33802591707573,
-            27.143744148346705,
-            61.289996123672566,
-            0.728295383811961,
-            60.81457168719891,
-            95.0135160845949,
-            65.57073366405261,
-            24.878494968304032,
-            54.664386232007665,
-            26.61406921126077,
-            52.134243150024886,
-            12.628756510724926,
-            83.86613668699508,
-            10.754655927067148,
-            14.330409913484088,
-            29.797547470611676,
-            4.38582170135331,
-            3.052249580313382,
-            22.562494369151654,
-            6.22880691096237,
-            84.28155043844244,
-            11.095604502619949,
-            43.65773966541213,
-            20.380576521492454,
-            94.70740415350079,
-            29.785210365576088,
-            49.15286022732512
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          43.46503448486328,
-          54.04864501953125,
-          43.78555679321289,
-          59.8331413269043,
-          27.34345817565918,
-          17.575525283813477,
-          41.079856872558594,
-          33.422855377197266
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "averagePool2d float32 4D tensor options.autoPad=same-lower",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            18.669797402066955,
-            95.74087629574039,
-            24.142204556566483,
-            51.13168108230512,
-            32.59428648032041,
-            36.33802591707573,
-            27.143744148346705,
-            61.289996123672566,
-            0.728295383811961,
-            60.81457168719891,
-            95.0135160845949,
-            65.57073366405261,
-            24.878494968304032,
-            54.664386232007665,
-            26.61406921126077,
-            52.134243150024886,
-            12.628756510724926,
-            83.86613668699508,
-            10.754655927067148,
-            14.330409913484088,
-            29.797547470611676,
-            4.38582170135331,
-            3.052249580313382,
-            22.562494369151654,
-            6.22880691096237,
-            84.28155043844244,
-            11.095604502619949,
-            43.65773966541213,
-            20.380576521492454,
-            94.70740415350079,
-            29.785210365576088,
-            49.15286022732512
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          45.83574676513672,
-          49.297752380371094,
-          35.00300979614258,
-          53.28703308105469,
-          32.6695671081543,
-          23.158628463745117,
-          39.963619232177734,
-          38.075660705566406
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "averagePool2d float32 4D tensor options.autoPad=same-upper ignores options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            18.669797402066955,
-            95.74087629574039,
-            24.142204556566483,
-            51.13168108230512,
-            32.59428648032041,
-            36.33802591707573,
-            27.143744148346705,
-            61.289996123672566,
-            0.728295383811961,
-            60.81457168719891,
-            95.0135160845949,
-            65.57073366405261,
-            24.878494968304032,
-            54.664386232007665,
-            26.61406921126077,
-            52.134243150024886,
-            12.628756510724926,
-            83.86613668699508,
-            10.754655927067148,
-            14.330409913484088,
-            29.797547470611676,
-            4.38582170135331,
-            3.052249580313382,
-            22.562494369151654,
-            6.22880691096237,
-            84.28155043844244,
-            11.095604502619949,
-            43.65773966541213,
-            20.380576521492454,
-            94.70740415350079,
-            29.785210365576088,
-            49.15286022732512
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "padding": [2, 2, 2, 2],
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          43.46503448486328,
-          54.04864501953125,
-          43.78555679321289,
-          59.8331413269043,
-          27.34345817565918,
-          17.575525283813477,
-          41.079856872558594,
-          33.422855377197266
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "averagePool2d float32 4D tensor options.autoPad=same-lower ignores options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            18.669797402066955,
-            95.74087629574039,
-            24.142204556566483,
-            51.13168108230512,
-            32.59428648032041,
-            36.33802591707573,
-            27.143744148346705,
-            61.289996123672566,
-            0.728295383811961,
-            60.81457168719891,
-            95.0135160845949,
-            65.57073366405261,
-            24.878494968304032,
-            54.664386232007665,
-            26.61406921126077,
-            52.134243150024886,
-            12.628756510724926,
-            83.86613668699508,
-            10.754655927067148,
-            14.330409913484088,
-            29.797547470611676,
-            4.38582170135331,
-            3.052249580313382,
-            22.562494369151654,
-            6.22880691096237,
-            84.28155043844244,
-            11.095604502619949,
-            43.65773966541213,
-            20.380576521492454,
-            94.70740415350079,
-            29.785210365576088,
-            49.15286022732512
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "padding": [2, 2, 2, 2],
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          45.83574676513672,
-          49.297752380371094,
-          35.00300979614258,
-          53.28703308105469,
-          32.6695671081543,
-          23.158628463745117,
-          39.963619232177734,
-          38.075660705566406
-        ],
-        "type": "float32"
-      }
-    },
-    {
       "name": "averagePool2d float32 4D tensor options.layout=nchw",
       "inputs": {
         "input": {
@@ -1650,7 +1316,6 @@
       "options": {
         "windowDimensions": [3, 3],
         "padding": [1, 0, 0, 1],
-        "autoPad": "explicit",
         "strides": [2, 2],
         "layout": "nhwc"
       },
diff --git a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/conv2d.json b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/conv2d.json
index 5f8cd81..13e6b172 100644
--- a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/conv2d.json
+++ b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/conv2d.json
@@ -421,356 +421,6 @@
       }
     },
     {
-      "name": "conv2d float32 4D input and filter tensors options.padding and options.autoPad='explicit'",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 5, 5],
-          "data": [
-            0.6124474607869732,
-            0.8857858599952035,
-            0.13667134799354397,
-            0.564529098909835,
-            0.8965171985225997,
-            0.36792828664768873,
-            0.6811466319147079,
-            0.04795110047019757,
-            0.33355462154327986,
-            0.19882695924603588,
-            0.4116714070095846,
-            0.07934240242135737,
-            0.42724633975875426,
-            0.5358005687699703,
-            0.5910805999797129,
-            0.2841543363273238,
-            0.414725865128835,
-            0.026906268886554896,
-            0.3621256577250671,
-            0.9945681862504354,
-            0.07184549434969778,
-            0.1220437231354885,
-            0.8422137325421886,
-            0.4537501021068471,
-            0.2152944303497728
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 1, 3, 3],
-          "data": [
-            0.3804761331189006,
-            0.5280312082437455,
-            0.2194703660873738,
-            0.3668976886827289,
-            0.33974137307686836,
-            0.42000596251782674,
-            0.38050310131155185,
-            0.19443586243810795,
-            0.5686976617292392
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "padding": [1, 1, 1, 1],
-        "autoPad": "explicit"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 1, 5, 5],
-        "data": [
-          1.0390141010284424,
-          0.882753312587738,
-          1.0667248964309692,
-          0.8146538734436035,
-          0.6772860884666443,
-          1.0540467500686646,
-          1.5323282480239868,
-          1.3573521375656128,
-          1.3641656637191772,
-          1.1969101428985596,
-          0.8080586791038513,
-          1.071682333946228,
-          1.1259644031524658,
-          1.4713115692138672,
-          0.960464596748352,
-          0.5888903141021729,
-          1.078782320022583,
-          1.155018925666809,
-          1.656954288482666,
-          1.2012416124343872,
-          0.3167303800582886,
-          0.7545653581619263,
-          0.7729666829109192,
-          0.9733180403709412,
-          0.9025675058364868
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "conv2d float32 4D input and filter tensors options.autoPad='same-upper'",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 4, 4],
-          "data": [
-            0.9371488026117993,
-            0.4742464662522563,
-            0.6571340852996714,
-            0.8399660616881559,
-            0.3286228380482863,
-            0.09911389391233816,
-            0.008774675079729732,
-            0.49592297038960576,
-            0.6906991955372042,
-            0.40363236211387643,
-            0.08385655421112803,
-            0.7818648489403492,
-            0.7862677667715321,
-            0.8178903833064657,
-            0.9872956148300345,
-            0.1289262831549154
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 1, 3, 3],
-          "data": [
-            0.3804761331189006,
-            0.5280312082437455,
-            0.2194703660873738,
-            0.3668976886827289,
-            0.33974137307686836,
-            0.42000596251782674,
-            0.38050310131155185,
-            0.19443586243810795,
-            0.5686976617292392
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 1, 2, 2],
-        "data": [
-          1.298113465309143,
-          1.0491873025894165,
-          1.475350260734558,
-          0.8507925271987915
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "conv2d float32 4D input and filter tensors options.autoPad='same-upper' ignores options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 4, 4],
-          "data": [
-            0.9371488026117993,
-            0.4742464662522563,
-            0.6571340852996714,
-            0.8399660616881559,
-            0.3286228380482863,
-            0.09911389391233816,
-            0.008774675079729732,
-            0.49592297038960576,
-            0.6906991955372042,
-            0.40363236211387643,
-            0.08385655421112803,
-            0.7818648489403492,
-            0.7862677667715321,
-            0.8178903833064657,
-            0.9872956148300345,
-            0.1289262831549154
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 1, 3, 3],
-          "data": [
-            0.3804761331189006,
-            0.5280312082437455,
-            0.2194703660873738,
-            0.3668976886827289,
-            0.33974137307686836,
-            0.42000596251782674,
-            0.38050310131155185,
-            0.19443586243810795,
-            0.5686976617292392
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "padding": [1, 2, 1, 2],
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 1, 2, 2],
-        "data": [
-          1.298113465309143,
-          1.0491873025894165,
-          1.475350260734558,
-          0.8507925271987915
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "conv2d float32 4D input and filter tensors options.autoPad='same-lower'",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 5, 5],
-          "data": [
-            0.6124474607869732,
-            0.8857858599952035,
-            0.13667134799354397,
-            0.564529098909835,
-            0.8965171985225997,
-            0.36792828664768873,
-            0.6811466319147079,
-            0.04795110047019757,
-            0.33355462154327986,
-            0.19882695924603588,
-            0.4116714070095846,
-            0.07934240242135737,
-            0.42724633975875426,
-            0.5358005687699703,
-            0.5910805999797129,
-            0.2841543363273238,
-            0.414725865128835,
-            0.026906268886554896,
-            0.3621256577250671,
-            0.9945681862504354,
-            0.07184549434969778,
-            0.1220437231354885,
-            0.8422137325421886,
-            0.4537501021068471,
-            0.2152944303497728
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 1, 3, 3],
-          "data": [
-            0.3804761331189006,
-            0.5280312082437455,
-            0.2194703660873738,
-            0.3668976886827289,
-            0.33974137307686836,
-            0.42000596251782674,
-            0.38050310131155185,
-            0.19443586243810795,
-            0.5686976617292392
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 1, 3, 3],
-        "data": [
-          1.0390141010284424,
-          1.0667248964309692,
-          0.6772860884666443,
-          0.8080586791038513,
-          1.1259644031524658,
-          0.960464596748352,
-          0.3167303800582886,
-          0.7729666829109192,
-          0.9025675058364868
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "conv2d float32 4D input and filter tensors options.autoPad='same-lower' ignores options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 5, 5],
-          "data": [
-            0.6124474607869732,
-            0.8857858599952035,
-            0.13667134799354397,
-            0.564529098909835,
-            0.8965171985225997,
-            0.36792828664768873,
-            0.6811466319147079,
-            0.04795110047019757,
-            0.33355462154327986,
-            0.19882695924603588,
-            0.4116714070095846,
-            0.07934240242135737,
-            0.42724633975875426,
-            0.5358005687699703,
-            0.5910805999797129,
-            0.2841543363273238,
-            0.414725865128835,
-            0.026906268886554896,
-            0.3621256577250671,
-            0.9945681862504354,
-            0.07184549434969778,
-            0.1220437231354885,
-            0.8422137325421886,
-            0.4537501021068471,
-            0.2152944303497728
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 1, 3, 3],
-          "data": [
-            0.3804761331189006,
-            0.5280312082437455,
-            0.2194703660873738,
-            0.3668976886827289,
-            0.33974137307686836,
-            0.42000596251782674,
-            0.38050310131155185,
-            0.19443586243810795,
-            0.5686976617292392
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "padding": [1, 2, 1, 2],
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 1, 3, 3],
-        "data": [
-          1.0390141010284424,
-          1.0667248964309692,
-          0.6772860884666443,
-          0.8080586791038513,
-          1.1259644031524658,
-          0.960464596748352,
-          0.3167303800582886,
-          0.7729666829109192,
-          0.9025675058364868
-        ],
-        "type": "float32"
-      }
-    },
-    {
       "name": "depthwise conv2d float32 4D input and filter tensors options.groups= input_channels",
       "inputs": {
         "input": {
@@ -1990,7 +1640,6 @@
       "options": {
         "padding": [1, 0, 0, 1],
         "strides": [1, 1],
-        "autoPad": "explicit",
         "dilations": [1, 1],
         "groups": 2,
         "inputLayout": "nchw",
diff --git a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/conv_transpose2d.json b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/conv_transpose2d.json
index 42274e6fa..742752fd 100644
--- a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/conv_transpose2d.json
+++ b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/conv_transpose2d.json
@@ -972,553 +972,6 @@
       }
     },
     {
-      "name": "convTranspose2d float32 4D input and filter tensors options.autoPad=explicit options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 2, 2],
-          "data": [
-            0.5872158177067033,
-            0.6077792328258038,
-            0.01728916618181975,
-            0.26146076483771563
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 1, 2, 2],
-          "data": [
-            0.32927132527587477,
-            0.5866857173772775,
-            0.29701370673751004,
-            0.0033378428248385106
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "padding": [1, 1, 1, 1],
-        "autoPad": "explicit"
-      },
-      "expected": {
-        "shape": [1, 1, 1, 1],
-        "data": [
-          0.2787136137485504
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 3, 3],
-          "data": [
-            0.05605664967552748,
-            0.7114230061939892,
-            0.6529743817798401,
-            0.3862290922141163,
-            0.38708372734474095,
-            0.9461629334832131,
-            0.0957319185290193,
-            0.9234652551205444,
-            0.6362779541136516
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 2, 3, 3],
-          "data": [
-            0.861442276299335,
-            0.6267672619279181,
-            0.6366489967621862,
-            0.8382642064548715,
-            0.11884837321114183,
-            0.9921330460504791,
-            0.3285411258903119,
-            0.8742373539889388,
-            0.7205492498486465,
-            0.9801966684571415,
-            0.06169835353027997,
-            0.3220160786486479,
-            0.7498031716529909,
-            0.39307147694602995,
-            0.1381193362338462,
-            0.283850915413119,
-            0.4235861336377129,
-            0.14485120857485168
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "shape": [1, 2, 6, 6],
-        "data": [
-          0.04828956723213196,
-          0.03513447195291519,
-          0.6485382318496704,
-          0.4458966553211212,
-          1.015426516532898,
-          0.4092629551887512,
-          0.0469902828335762,
-          0.0066622416488826275,
-          0.6519761085510254,
-          0.08455146849155426,
-          1.2531912326812744,
-          0.07760494202375412,
-          0.35113099217414856,
-          0.29108259081840515,
-          0.8534659743309021,
-          0.8645639419555664,
-          1.7886453866958618,
-          1.1638785600662231,
-          0.32376202940940857,
-          0.04590269923210144,
-          0.7076690793037415,
-          0.0460042729973793,
-          1.177173137664795,
-          0.11244992911815643,
-          0.20935966074466705,
-          0.3976575434207916,
-          1.2619296312332153,
-          0.9172008633613586,
-          1.7258063554763794,
-          1.2259691953659058,
-          0.0802486464381218,
-          0.011377583257853985,
-          0.8690866827964783,
-          0.1097523421049118,
-          1.4495694637298584,
-          0.0756206065416336,
-          0.05494653806090355,
-          0.0034586030524224043,
-          0.7153855562210083,
-          0.04389362782239914,
-          0.869132936000824,
-          0.04028744250535965,
-          0.04203145205974579,
-          0.02203426882624626,
-          0.5411697030067444,
-          0.2796400785446167,
-          0.5878635048866272,
-          0.25666558742523193,
-          0.3944922089576721,
-          0.047574520111083984,
-          0.7138481140136719,
-          0.3252313435077667,
-          1.340470790863037,
-          0.33496758341789246,
-          0.2895958125591278,
-          0.15181563794612885,
-          0.3435823321342468,
-          0.15215156972408295,
-          0.7628997564315796,
-          0.37190964818000793,
-          0.20346759259700775,
-          0.16950778663158417,
-          1.1018246412277222,
-          0.22093959152698517,
-          1.2456870079040527,
-          0.440038800239563,
-          0.07178010046482086,
-          0.03762948885560036,
-          0.7056396007537842,
-          0.36298784613609314,
-          0.6046316623687744,
-          0.2501027286052704
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper ignored options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 3, 3],
-          "data": [
-            0.05605664967552748,
-            0.7114230061939892,
-            0.6529743817798401,
-            0.3862290922141163,
-            0.38708372734474095,
-            0.9461629334832131,
-            0.0957319185290193,
-            0.9234652551205444,
-            0.6362779541136516
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 2, 3, 3],
-          "data": [
-            0.861442276299335,
-            0.6267672619279181,
-            0.6366489967621862,
-            0.8382642064548715,
-            0.11884837321114183,
-            0.9921330460504791,
-            0.3285411258903119,
-            0.8742373539889388,
-            0.7205492498486465,
-            0.9801966684571415,
-            0.06169835353027997,
-            0.3220160786486479,
-            0.7498031716529909,
-            0.39307147694602995,
-            0.1381193362338462,
-            0.283850915413119,
-            0.4235861336377129,
-            0.14485120857485168
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "padding": [1, 1, 1, 1],
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "shape": [1, 2, 6, 6],
-        "data": [
-          0.04828956723213196,
-          0.03513447195291519,
-          0.6485382318496704,
-          0.4458966553211212,
-          1.015426516532898,
-          0.4092629551887512,
-          0.0469902828335762,
-          0.0066622416488826275,
-          0.6519761085510254,
-          0.08455146849155426,
-          1.2531912326812744,
-          0.07760494202375412,
-          0.35113099217414856,
-          0.29108259081840515,
-          0.8534659743309021,
-          0.8645639419555664,
-          1.7886453866958618,
-          1.1638785600662231,
-          0.32376202940940857,
-          0.04590269923210144,
-          0.7076690793037415,
-          0.0460042729973793,
-          1.177173137664795,
-          0.11244992911815643,
-          0.20935966074466705,
-          0.3976575434207916,
-          1.2619296312332153,
-          0.9172008633613586,
-          1.7258063554763794,
-          1.2259691953659058,
-          0.0802486464381218,
-          0.011377583257853985,
-          0.8690866827964783,
-          0.1097523421049118,
-          1.4495694637298584,
-          0.0756206065416336,
-          0.05494653806090355,
-          0.0034586030524224043,
-          0.7153855562210083,
-          0.04389362782239914,
-          0.869132936000824,
-          0.04028744250535965,
-          0.04203145205974579,
-          0.02203426882624626,
-          0.5411697030067444,
-          0.2796400785446167,
-          0.5878635048866272,
-          0.25666558742523193,
-          0.3944922089576721,
-          0.047574520111083984,
-          0.7138481140136719,
-          0.3252313435077667,
-          1.340470790863037,
-          0.33496758341789246,
-          0.2895958125591278,
-          0.15181563794612885,
-          0.3435823321342468,
-          0.15215156972408295,
-          0.7628997564315796,
-          0.37190964818000793,
-          0.20346759259700775,
-          0.16950778663158417,
-          1.1018246412277222,
-          0.22093959152698517,
-          1.2456870079040527,
-          0.440038800239563,
-          0.07178010046482086,
-          0.03762948885560036,
-          0.7056396007537842,
-          0.36298784613609314,
-          0.6046316623687744,
-          0.2501027286052704
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 3, 3],
-          "data": [
-            0.05605664967552748,
-            0.7114230061939892,
-            0.6529743817798401,
-            0.3862290922141163,
-            0.38708372734474095,
-            0.9461629334832131,
-            0.0957319185290193,
-            0.9234652551205444,
-            0.6362779541136516
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 2, 3, 3],
-          "data": [
-            0.861442276299335,
-            0.6267672619279181,
-            0.6366489967621862,
-            0.8382642064548715,
-            0.11884837321114183,
-            0.9921330460504791,
-            0.3285411258903119,
-            0.8742373539889388,
-            0.7205492498486465,
-            0.9801966684571415,
-            0.06169835353027997,
-            0.3220160786486479,
-            0.7498031716529909,
-            0.39307147694602995,
-            0.1381193362338462,
-            0.283850915413119,
-            0.4235861336377129,
-            0.14485120857485168
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "shape": [1, 2, 6, 6],
-        "data": [
-          0.0066622416488826275,
-          0.6519761085510254,
-          0.08455146849155426,
-          1.2531912326812744,
-          0.07760494202375412,
-          0.6478374600410461,
-          0.29108259081840515,
-          0.8534659743309021,
-          0.8645639419555664,
-          1.7886453866958618,
-          1.1638785600662231,
-          1.072873830795288,
-          0.04590269923210144,
-          0.7076690793037415,
-          0.0460042729973793,
-          1.177173137664795,
-          0.11244992911815643,
-          0.9387195110321045,
-          0.3976575434207916,
-          1.2619296312332153,
-          0.9172008633613586,
-          1.7258063554763794,
-          1.2259691953659058,
-          1.0868427753448486,
-          0.011377583257853985,
-          0.8690866827964783,
-          0.1097523421049118,
-          1.4495694637298584,
-          0.0756206065416336,
-          0.6312723755836487,
-          0.08369242399930954,
-          0.37237587571144104,
-          0.8073278069496155,
-          0.8744456768035889,
-          0.556257963180542,
-          0.45846959948539734,
-          0.02203426882624626,
-          0.5411697030067444,
-          0.2796400785446167,
-          0.5878635048866272,
-          0.25666558742523193,
-          0.0901883915066719,
-          0.047574520111083984,
-          0.7138481140136719,
-          0.3252313435077667,
-          1.340470790863037,
-          0.33496758341789246,
-          0.39926382899284363,
-          0.15181563794612885,
-          0.3435823321342468,
-          0.15215156972408295,
-          0.7628997564315796,
-          0.37190964818000793,
-          0.13068340718746185,
-          0.16950778663158417,
-          1.1018246412277222,
-          0.22093959152698517,
-          1.2456870079040527,
-          0.440038800239563,
-          0.3419445753097534,
-          0.03762948885560036,
-          0.7056396007537842,
-          0.36298784613609314,
-          0.6046316623687744,
-          0.2501027286052704,
-          0.08788229525089264,
-          0.04055071249604225,
-          0.27599334716796875,
-          0.3911670744419098,
-          0.3143731355667114,
-          0.26951852440834045,
-          0.09216563403606415
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower ignored options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 1, 3, 3],
-          "data": [
-            0.05605664967552748,
-            0.7114230061939892,
-            0.6529743817798401,
-            0.3862290922141163,
-            0.38708372734474095,
-            0.9461629334832131,
-            0.0957319185290193,
-            0.9234652551205444,
-            0.6362779541136516
-          ],
-          "type": "float32"
-        },
-        "filter": {
-          "shape": [1, 2, 3, 3],
-          "data": [
-            0.861442276299335,
-            0.6267672619279181,
-            0.6366489967621862,
-            0.8382642064548715,
-            0.11884837321114183,
-            0.9921330460504791,
-            0.3285411258903119,
-            0.8742373539889388,
-            0.7205492498486465,
-            0.9801966684571415,
-            0.06169835353027997,
-            0.3220160786486479,
-            0.7498031716529909,
-            0.39307147694602995,
-            0.1381193362338462,
-            0.283850915413119,
-            0.4235861336377129,
-            0.14485120857485168
-          ],
-          "type": "float32",
-          "constant": true
-        }
-      },
-      "options": {
-        "padding": [1, 1, 1, 1],
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "shape": [1, 2, 6, 6],
-        "data": [
-          0.0066622416488826275,
-          0.6519761085510254,
-          0.08455146849155426,
-          1.2531912326812744,
-          0.07760494202375412,
-          0.6478374600410461,
-          0.29108259081840515,
-          0.8534659743309021,
-          0.8645639419555664,
-          1.7886453866958618,
-          1.1638785600662231,
-          1.072873830795288,
-          0.04590269923210144,
-          0.7076690793037415,
-          0.0460042729973793,
-          1.177173137664795,
-          0.11244992911815643,
-          0.9387195110321045,
-          0.3976575434207916,
-          1.2619296312332153,
-          0.9172008633613586,
-          1.7258063554763794,
-          1.2259691953659058,
-          1.0868427753448486,
-          0.011377583257853985,
-          0.8690866827964783,
-          0.1097523421049118,
-          1.4495694637298584,
-          0.0756206065416336,
-          0.6312723755836487,
-          0.08369242399930954,
-          0.37237587571144104,
-          0.8073278069496155,
-          0.8744456768035889,
-          0.556257963180542,
-          0.45846959948539734,
-          0.02203426882624626,
-          0.5411697030067444,
-          0.2796400785446167,
-          0.5878635048866272,
-          0.25666558742523193,
-          0.0901883915066719,
-          0.047574520111083984,
-          0.7138481140136719,
-          0.3252313435077667,
-          1.340470790863037,
-          0.33496758341789246,
-          0.39926382899284363,
-          0.15181563794612885,
-          0.3435823321342468,
-          0.15215156972408295,
-          0.7628997564315796,
-          0.37190964818000793,
-          0.13068340718746185,
-          0.16950778663158417,
-          1.1018246412277222,
-          0.22093959152698517,
-          1.2456870079040527,
-          0.440038800239563,
-          0.3419445753097534,
-          0.03762948885560036,
-          0.7056396007537842,
-          0.36298784613609314,
-          0.6046316623687744,
-          0.2501027286052704,
-          0.08788229525089264,
-          0.04055071249604225,
-          0.27599334716796875,
-          0.3911670744419098,
-          0.3143731355667114,
-          0.26951852440834045,
-          0.09216563403606415
-        ],
-        "type": "float32"
-      }
-    },
-    {
       "name": "convTranspose2d float32 4D input and filter tensors options.inputLayout=nchw",
       "inputs": {
         "input": {
diff --git a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/l2_pool2d.json b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/l2_pool2d.json
index bab89e0..a656877 100644
--- a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/l2_pool2d.json
+++ b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/l2_pool2d.json
@@ -534,340 +534,6 @@
       }
     },
     {
-      "name": "l2Pool2d float32 4D tensor options.autoPad=explicit",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 5, 5],
-          "data": [
-            94.07447814941406,
-            76.55464172363281,
-            62.71847152709961,
-            83.8726577758789,
-            73.10235595703125,
-            41.52470779418945,
-            39.3339729309082,
-            86.59486389160156,
-            23.09039306640625,
-            53.650146484375,
-            0.00902052316814661,
-            42.78899383544922,
-            81.03960418701172,
-            33.48585510253906,
-            33.67196273803711,
-            0.42822372913360596,
-            80.07991790771484,
-            5.929991722106934,
-            48.89164733886719,
-            15.282920837402344,
-            13.335721969604492,
-            39.06557846069336,
-            97.06050109863281,
-            83.68133544921875,
-            21.79571533203125,
-            52.027313232421875,
-            6.397815227508545,
-            84.54785919189453,
-            18.622516632080078,
-            34.10626220703125,
-            73.96932220458984,
-            36.1437873840332,
-            60.73781967163086,
-            55.09187316894531,
-            63.8924446105957,
-            59.36124038696289,
-            50.91202926635742,
-            50.339813232421875,
-            59.31963348388672,
-            70.78031921386719,
-            35.56179428100586,
-            82.53382873535156,
-            7.572360038757324,
-            61.90089416503906,
-            14.084012985229492,
-            90.86540985107422,
-            39.56248474121094,
-            67.77167510986328,
-            69.69512176513672,
-            89.54518127441406
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "padding": [1, 0, 0, 1],
-        "autoPad": "explicit"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          254.81358337402344,
-          233.14259338378906,
-          289.01953125,
-          269.777587890625,
-          241.52200317382812,
-          212.99337768554688,
-          292.6146545410156,
-          253.77178955078125
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "l2Pool2d float32 4D tensor options.autoPad=same-upper",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            89.69132995605469,
-            49.80897521972656,
-            84.17794036865234,
-            98.6054458618164,
-            25.800601959228516,
-            71.89942932128906,
-            95.26441192626953,
-            26.428104400634766,
-            44.16105270385742,
-            24.04642105102539,
-            30.115402221679688,
-            54.41345977783203,
-            47.779483795166016,
-            22.942420959472656,
-            24.280946731567383,
-            81.68242645263672,
-            84.46887969970703,
-            84.59886932373047,
-            12.081207275390625,
-            37.8386344909668,
-            57.85399627685547,
-            28.702816009521484,
-            74.17911529541016,
-            67.8487319946289,
-            0.811935305595398,
-            79.18359375,
-            83.0001449584961,
-            82.172119140625,
-            92.50651550292969,
-            8.42988395690918,
-            93.89906311035156,
-            58.69465255737305
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          189.6240234375,
-          174.50064086914062,
-          82.66900634765625,
-          105.49571228027344,
-          193.0572967529297,
-          159.13827514648438,
-          174.94363403320312,
-          160.9452667236328
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "l2Pool2d float32 4D tensor options.autoPad=same-lower",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            89.69132995605469,
-            49.80897521972656,
-            84.17794036865234,
-            98.6054458618164,
-            25.800601959228516,
-            71.89942932128906,
-            95.26441192626953,
-            26.428104400634766,
-            44.16105270385742,
-            24.04642105102539,
-            30.115402221679688,
-            54.41345977783203,
-            47.779483795166016,
-            22.942420959472656,
-            24.280946731567383,
-            81.68242645263672,
-            84.46887969970703,
-            84.59886932373047,
-            12.081207275390625,
-            37.8386344909668,
-            57.85399627685547,
-            28.702816009521484,
-            74.17911529541016,
-            67.8487319946289,
-            0.811935305595398,
-            79.18359375,
-            83.0001449584961,
-            82.172119140625,
-            92.50651550292969,
-            8.42988395690918,
-            93.89906311035156,
-            58.69465255737305
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          127.90882873535156,
-          185.0220947265625,
-          105.7017593383789,
-          164.85511779785156,
-          135.8782501220703,
-          140.2302703857422,
-          138.09474182128906,
-          207.78431701660156
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "l2Pool2d float32 4D tensor options.autoPad=same-upper ignores options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            89.69132995605469,
-            49.80897521972656,
-            84.17794036865234,
-            98.6054458618164,
-            25.800601959228516,
-            71.89942932128906,
-            95.26441192626953,
-            26.428104400634766,
-            44.16105270385742,
-            24.04642105102539,
-            30.115402221679688,
-            54.41345977783203,
-            47.779483795166016,
-            22.942420959472656,
-            24.280946731567383,
-            81.68242645263672,
-            84.46887969970703,
-            84.59886932373047,
-            12.081207275390625,
-            37.8386344909668,
-            57.85399627685547,
-            28.702816009521484,
-            74.17911529541016,
-            67.8487319946289,
-            0.811935305595398,
-            79.18359375,
-            83.0001449584961,
-            82.172119140625,
-            92.50651550292969,
-            8.42988395690918,
-            93.89906311035156,
-            58.69465255737305
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "padding": [2, 2, 2, 2],
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          189.6240234375,
-          174.50064086914062,
-          82.66900634765625,
-          105.49571228027344,
-          193.0572967529297,
-          159.13827514648438,
-          174.94363403320312,
-          160.9452667236328
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "l2Pool2d float32 4D tensor options.autoPad=same-lower ignores options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            89.69132995605469,
-            49.80897521972656,
-            84.17794036865234,
-            98.6054458618164,
-            25.800601959228516,
-            71.89942932128906,
-            95.26441192626953,
-            26.428104400634766,
-            44.16105270385742,
-            24.04642105102539,
-            30.115402221679688,
-            54.41345977783203,
-            47.779483795166016,
-            22.942420959472656,
-            24.280946731567383,
-            81.68242645263672,
-            84.46887969970703,
-            84.59886932373047,
-            12.081207275390625,
-            37.8386344909668,
-            57.85399627685547,
-            28.702816009521484,
-            74.17911529541016,
-            67.8487319946289,
-            0.811935305595398,
-            79.18359375,
-            83.0001449584961,
-            82.172119140625,
-            92.50651550292969,
-            8.42988395690918,
-            93.89906311035156,
-            58.69465255737305
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "padding": [2, 2, 2, 2],
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          127.90882873535156,
-          185.0220947265625,
-          105.7017593383789,
-          164.85511779785156,
-          135.8782501220703,
-          140.2302703857422,
-          138.09474182128906,
-          207.78431701660156
-        ],
-        "type": "float32"
-      }
-    },
-    {
       "name": "l2Pool2d float32 4D tensor options.layout=nchw",
       "inputs": {
         "input": {
@@ -1474,7 +1140,6 @@
       "options": {
         "windowDimensions": [3, 3],
         "padding": [1, 0, 0, 1],
-        "autoPad": "explicit",
         "strides": [2, 2],
         "dilations": [1, 1],
         "layout": "nhwc"
diff --git a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/max_pool2d.json b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/max_pool2d.json
index 4532843..216b4c5 100644
--- a/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/max_pool2d.json
+++ b/third_party/blink/web_tests/external/wpt/webnn/resources/test_data/max_pool2d.json
@@ -464,340 +464,6 @@
       }
     },
     {
-      "name": "maxPool2d float32 4D tensor options.autoPad=explicit",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 5, 5],
-          "data": [
-            89.00830216793153,
-            -45.720390400208274,
-            -61.3061304134967,
-            -4.014514560596496,
-            -94.54893342858352,
-            46.28090328619564,
-            99.28312923953135,
-            -10.057873368956962,
-            9.742474583994337,
-            -39.03501766575275,
-            75.08192382950091,
-            12.819415189421207,
-            -33.01505690327188,
-            38.691340789603316,
-            66.09259104681504,
-            97.903480409299,
-            -8.737769993284147,
-            -53.4216238072017,
-            72.10852084777076,
-            -40.42309116918719,
-            -35.68864442661396,
-            -87.64779401381033,
-            38.87424286093716,
-            39.38360329656629,
-            7.429088108317444,
-            -76.72171237621149,
-            50.21706410294061,
-            -52.89547724835329,
-            -44.64233565670091,
-            -97.86752535352848,
-            81.73119248706783,
-            5.428491238061412,
-            -29.227728678237995,
-            72.44899280781078,
-            -59.34124718116585,
-            39.19959912145927,
-            -65.99438957588619,
-            -4.204323589500888,
-            -60.5458643662661,
-            55.89052583821697,
-            80.30483906634527,
-            72.88830243502153,
-            -46.59610987974246,
-            20.503878887964206,
-            -31.126462826158445,
-            -57.29456052682171,
-            -26.62357805164706,
-            15.93575469730375,
-            -78.77953474824318,
-            72.33577555559427
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "padding": [1, 0, 0, 1],
-        "autoPad": "explicit"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          99.28312683105469,
-          99.28312683105469,
-          99.28312683105469,
-          99.28312683105469,
-          81.73119354248047,
-          72.8883056640625,
-          81.73119354248047,
-          72.8883056640625
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "maxPool2d float32 4D tensor options.autoPad=same-upper",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            90.19580379109371,
-            3.100482753598527,
-            25.328822520960074,
-            95.79016799138552,
-            -28.66704447898583,
-            -95.44752500898142,
-            -4.985161962403197,
-            -8.48460109616957,
-            -80.97691341362152,
-            -17.005109111308727,
-            -6.038760193142295,
-            38.40922446364979,
-            -7.992178512477196,
-            81.2006267730795,
-            20.61885063772428,
-            -33.95224998477518,
-            -96.69404524982971,
-            -80.66036026545542,
-            14.05812623156973,
-            71.19384576769727,
-            90.27735528668126,
-            -98.09758264975711,
-            79.82735855507025,
-            51.29492635990994,
-            97.67522462775861,
-            -28.093948900517333,
-            6.811551163368804,
-            62.81929061329504,
-            -74.77656671772914,
-            81.95471994368236,
-            79.12276218750796,
-            -79.67557686936195
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          90.19580078125,
-          95.79016876220703,
-          81.20063018798828,
-          38.40922546386719,
-          97.67522430419922,
-          79.82736206054688,
-          97.67522430419922,
-          79.12276458740234
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "maxPool2d float32 4D tensor options.autoPad=same-lower",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            90.19580379109371,
-            3.100482753598527,
-            25.328822520960074,
-            95.79016799138552,
-            -28.66704447898583,
-            -95.44752500898142,
-            -4.985161962403197,
-            -8.48460109616957,
-            -80.97691341362152,
-            -17.005109111308727,
-            -6.038760193142295,
-            38.40922446364979,
-            -7.992178512477196,
-            81.2006267730795,
-            20.61885063772428,
-            -33.95224998477518,
-            -96.69404524982971,
-            -80.66036026545542,
-            14.05812623156973,
-            71.19384576769727,
-            90.27735528668126,
-            -98.09758264975711,
-            79.82735855507025,
-            51.29492635990994,
-            97.67522462775861,
-            -28.093948900517333,
-            6.811551163368804,
-            62.81929061329504,
-            -74.77656671772914,
-            81.95471994368236,
-            79.12276218750796,
-            -79.67557686936195
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          90.19580078125,
-          95.79016876220703,
-          81.20063018798828,
-          81.20063018798828,
-          90.27735900878906,
-          79.82736206054688,
-          97.67522430419922,
-          81.95471954345703
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "maxPool2d float32 4D tensor options.autoPad=same-upper ignores options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            90.19580379109371,
-            3.100482753598527,
-            25.328822520960074,
-            95.79016799138552,
-            -28.66704447898583,
-            -95.44752500898142,
-            -4.985161962403197,
-            -8.48460109616957,
-            -80.97691341362152,
-            -17.005109111308727,
-            -6.038760193142295,
-            38.40922446364979,
-            -7.992178512477196,
-            81.2006267730795,
-            20.61885063772428,
-            -33.95224998477518,
-            -96.69404524982971,
-            -80.66036026545542,
-            14.05812623156973,
-            71.19384576769727,
-            90.27735528668126,
-            -98.09758264975711,
-            79.82735855507025,
-            51.29492635990994,
-            97.67522462775861,
-            -28.093948900517333,
-            6.811551163368804,
-            62.81929061329504,
-            -74.77656671772914,
-            81.95471994368236,
-            79.12276218750796,
-            -79.67557686936195
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "padding": [2, 2, 2, 2],
-        "strides": [2, 2],
-        "autoPad": "same-upper"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          90.19580078125,
-          95.79016876220703,
-          81.20063018798828,
-          38.40922546386719,
-          97.67522430419922,
-          79.82736206054688,
-          97.67522430419922,
-          79.12276458740234
-        ],
-        "type": "float32"
-      }
-    },
-    {
-      "name": "maxPool2d float32 4D tensor options.autoPad=same-lower ignores options.padding",
-      "inputs": {
-        "input": {
-          "shape": [1, 2, 4, 4],
-          "data": [
-            90.19580379109371,
-            3.100482753598527,
-            25.328822520960074,
-            95.79016799138552,
-            -28.66704447898583,
-            -95.44752500898142,
-            -4.985161962403197,
-            -8.48460109616957,
-            -80.97691341362152,
-            -17.005109111308727,
-            -6.038760193142295,
-            38.40922446364979,
-            -7.992178512477196,
-            81.2006267730795,
-            20.61885063772428,
-            -33.95224998477518,
-            -96.69404524982971,
-            -80.66036026545542,
-            14.05812623156973,
-            71.19384576769727,
-            90.27735528668126,
-            -98.09758264975711,
-            79.82735855507025,
-            51.29492635990994,
-            97.67522462775861,
-            -28.093948900517333,
-            6.811551163368804,
-            62.81929061329504,
-            -74.77656671772914,
-            81.95471994368236,
-            79.12276218750796,
-            -79.67557686936195
-          ],
-          "type": "float32"
-        }
-      },
-      "options": {
-        "windowDimensions": [3, 3],
-        "padding": [2, 2, 2, 2],
-        "strides": [2, 2],
-        "autoPad": "same-lower"
-      },
-      "expected": {
-        "name": "output",
-        "shape": [1, 2, 2, 2],
-        "data": [
-          90.19580078125,
-          95.79016876220703,
-          81.20063018798828,
-          81.20063018798828,
-          90.27735900878906,
-          79.82736206054688,
-          97.67522430419922,
-          81.95471954345703
-        ],
-        "type": "float32"
-      }
-    },
-    {
       "name": "maxPool2d float32 4D tensor options.layout=nchw",
       "inputs": {
         "input": {
@@ -1404,7 +1070,6 @@
       "options": {
         "windowDimensions": [3, 3],
         "padding": [1, 0, 0, 1],
-        "autoPad": "explicit",
         "strides": [2, 2],
         "dilations": [1, 1],
         "layout": "nhwc"
diff --git a/third_party/blink/web_tests/external/wpt/webnn/resources/utils_validation.js b/third_party/blink/web_tests/external/wpt/webnn/resources/utils_validation.js
new file mode 100644
index 0000000..10c7043
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/resources/utils_validation.js
@@ -0,0 +1,345 @@
+'use strict';
+
+// https://webmachinelearning.github.io/webnn/#enumdef-mloperanddatatype
+const allWebNNOperandDataTypes = [
+  'float32',
+  'float16',
+  'int32',
+  'uint32',
+  'int64',
+  'uint64',
+  'int8',
+  'uint8'
+];
+
+const unsignedLongType = 'unsigned long';
+
+const dimensions0D = [];
+const dimensions1D = [2];
+const dimensions2D = [2, 3];
+const dimensions3D = [2, 3, 4];
+const dimensions4D = [2, 3, 4, 5];
+const dimensions5D = [2, 3, 4, 5, 6];
+
+const adjustOffsetsArray = [
+  // Decrease 1
+  -1,
+  // Increase 1
+  1
+];
+
+// TODO
+// Add more 5+ dimensions
+const allWebNNDimensionsArray = [
+  dimensions0D,
+  dimensions1D,
+  dimensions2D,
+  dimensions3D,
+  dimensions4D,
+  dimensions5D
+];
+
+const notUnsignedLongAxisArray = [
+  // String
+  'abc',
+  // BigInt
+  BigInt(100),
+  // Object
+  {
+    value: 1
+  },
+  // Array Object
+  [0, 1],
+  // Date Object
+  new Date("2024-01-01"),
+];
+
+function getRank(inputDimensions) {
+  return inputDimensions.length;
+}
+
+function getAxisArray(inputDimensions) {
+  return Array.from({length: inputDimensions.length}, (_, i) => i);
+}
+
+function getAxesArrayContainSameValues(inputDimensions) {
+  // TODO
+  // Currently this function returns an array containing each element which all have the same value.
+  // For example axes: [0, 1, 2] for 3D input tensor
+  // this function returns
+  // [
+  //   // two values are same
+  //   [0, 0],
+  //   [1, 1],
+  //   [2, 2],
+  //   // three values are same
+  //   [0, 0, 0],
+  //   [1, 1, 1]
+  //   [2, 2, 2]
+  // ]
+  // while it should return
+  // [
+  //   // two values are same
+  //   [0, 0],
+  //   [1, 1],
+  //   [2, 2],
+  //   [0, 0, 1],
+  //   [0, 0, 2],
+  //   [0, 1, 0],
+  //   [0, 2, 0],
+  //   [1, 0, 0],
+  //   [2, 0, 0],
+  //   [1, 1, 0],
+  //   [1, 1, 2],
+  //   [1, 0, 1],
+  //   [1, 2, 1],
+  //   [0, 1, 1],
+  //   [2, 1, 1],
+  //   [2, 2, 0],
+  //   [2, 2, 1],
+  //   [2, 0, 2],
+  //   [2, 1, 2],
+  //   [0, 2, 2],
+  //   [1, 2, 2],
+  //   // three (all) values are same
+  //   [0, 0, 0],
+  //   [1, 1, 1]
+  //   [2, 2, 2]
+  // ]
+  const axesArrayContainSameValues = [];
+  const length = inputDimensions.length;
+  if (length >= 2) {
+    const validAxesArrayFull = getAxisArray(inputDimensions);
+    for (let index = 0; index < length; index++) {
+      axesArrayContainSameValues.push(new Array(2).fill(validAxesArrayFull[index]));
+      if (length > 2) {
+        axesArrayContainSameValues.push(new Array(3).fill(validAxesArrayFull[index]));
+      }
+    }
+  }
+  return axesArrayContainSameValues;
+}
+
+function generateUnbroadcastableDimensionsArray(dimensions) {
+  // Currently this function returns an array of some unbroadcastable dimensions.
+  // for example given dimensions [2, 3, 4]
+  // this function returns
+  // [
+  //   [3, 3, 4],
+  //   [2, 2, 4],
+  //   [2, 4, 4],
+  //   [2, 3, 3],
+  //   [2, 3, 5],
+  //   [3],
+  //   [5],
+  //   [1, 3],
+  //   [1, 5],
+  //   [1, 1, 3],
+  //   [1, 1, 5],
+  //   [1, 1, 1, 3],
+  //   [1, 1, 1, 5],
+  // ]
+  if (dimensions.every(v => v === 1)) {
+    throw new Error(`[${dimensions}] always can be broadcasted`);
+  }
+  const resultDimensions = [];
+  const length = dimensions.length;
+  if (!dimensions.slice(0, length - 1).every(v => v === 1)) {
+    for (let i = 0; i < length; i++) {
+      if (dimensions[i] !== 1) {
+        for (let offset of [-1, 1]) {
+          const dimensionsB = dimensions.slice();
+          dimensionsB[i] += offset;
+          if (dimensionsB[i] !== 1) {
+            resultDimensions.push(dimensionsB);
+          }
+        }
+      }
+    }
+  }
+  const lastDimensionSize = dimensions[length - 1];
+  if (lastDimensionSize !== 1) {
+    for (let j = 0; j <= length; j++) {
+      if (lastDimensionSize > 2) {
+        resultDimensions.push(Array(j).fill(1).concat([lastDimensionSize - 1]));
+      }
+      resultDimensions.push(Array(j).fill(1).concat([lastDimensionSize + 1]));
+    }
+  }
+  return resultDimensions;
+}
+
+function generateOutOfRangeValuesArray(type) {
+  let range, outsideValueArray;
+  switch (type) {
+    case 'unsigned long':
+      // https://webidl.spec.whatwg.org/#idl-unsigned-long
+      // The unsigned long type is an unsigned integer type that has values in the range [0, 4294967295].
+      range = [0, 4294967295];
+      break;
+    default:
+      throw new Error(`Unsupport ${type}`);
+  }
+  outsideValueArray = [range[0] - 1, range[1] + 1];
+  return outsideValueArray;
+}
+
+let inputIndex = 0;
+let inputAIndex = 0;
+let inputBIndex = 0;
+let context, builder;
+
+promise_setup(async () => {
+  context = await navigator.ml.createContext();
+  builder = new MLGraphBuilder(context);
+}, {explicit_timeout: true});
+
+function validateTwoInputsBroadcastable(operationName) {
+  promise_test(async t => {
+    for (let dataType of allWebNNOperandDataTypes) {
+      for (let dimensions of allWebNNDimensionsArray) {
+        if (dimensions.length > 0) {
+          const inputA = builder.input(`inputA${++inputAIndex}`, {dataType, dimensions});
+          const unbroadcastableDimensionsArray = generateUnbroadcastableDimensionsArray(dimensions);
+          for (let unbroadcastableDimensions of unbroadcastableDimensionsArray) {
+            const inputB = builder.input(`inputB${++inputBIndex}`, {dataType, dimensions: unbroadcastableDimensions});
+            assert_throws_dom('DataError', () => builder[operationName](inputA, inputB));
+            assert_throws_dom('DataError', () => builder[operationName](inputB, inputA));
+          }
+        }
+      }
+    }
+  }, `[${operationName}] DataError is expected if two inputs aren't broadcastable`);
+}
+
+function validateTwoInputsOfSameDataType(operationName) {
+  let operationNameArray;
+  if (typeof operationName === 'string') {
+    operationNameArray = [operationName];
+  } else if (Array.isArray(operationName)) {
+    operationNameArray = operationName;
+  } else {
+    throw new Error(`${operationName} should be an operation name string or an operation name string array`);
+  }
+  for (let subOperationName of operationNameArray) {
+    promise_test(async t => {
+      for (let dataType of allWebNNOperandDataTypes) {
+        for (let dimensions of allWebNNDimensionsArray) {
+          const inputA = builder.input(`inputA${++inputAIndex}`, {dataType, dimensions});
+          for (let dataTypeB of allWebNNOperandDataTypes) {
+            if (dataType !== dataTypeB) {
+              const inputB = builder.input(`inputB${++inputBIndex}`, {dataType: dataTypeB, dimensions});
+              assert_throws_dom('DataError', () => builder[subOperationName](inputA, inputB));
+            }
+          }
+        }
+      }
+    }, `[${subOperationName}] DataError is expected if two inputs aren't of same data type`);
+  }
+}
+
+/**
+ * Validate options.axes by given operation and input rank for
+ * argMin/Max / layerNormalization / Reduction operations / resample2d operations
+ * @param {(String[]|String)} operationName - An operation name array or an operation name
+ * @param {Number} [inputRank]
+ */
+function validateOptionsAxes(operationName, inputRank) {
+  let operationNameArray;
+  if (typeof operationName === 'string') {
+    operationNameArray = [operationName];
+  } else if (Array.isArray(operationName)) {
+    operationNameArray = operationName;
+  } else {
+    throw new Error(`${operationName} should be an operation name string or an operation name string array`);
+  }
+  const invalidAxisArray = generateOutOfRangeValuesArray(unsignedLongType);
+  for (let subOperationName of operationNameArray) {
+    // TypeError is expected if any of options.axes elements is not an unsigned long interger
+    promise_test(async t => {
+      if (inputRank === undefined) {
+        // argMin/Max / layerNormalization / Reduction operations
+        for (let dataType of allWebNNOperandDataTypes) {
+          for (let dimensions of allWebNNDimensionsArray) {
+            const rank = getRank(dimensions);
+            if (rank >= 1) {
+              const input = builder.input(`input${++inputIndex}`, {dataType, dimensions});
+              for (let invalidAxis of invalidAxisArray) {
+                assert_throws_js(TypeError, () => builder[subOperationName](input, {axes: invalidAxis}));
+              }
+              for (let axis of notUnsignedLongAxisArray) {
+                assert_false(typeof axis === 'number' && Number.isInteger(axis), `[${subOperationName}] any of options.axes elements should be of 'unsigned long'`);
+                assert_throws_js(TypeError, () => builder[subOperationName](input, {axes: [axis]}));
+              }
+            }
+          }
+        }
+      } else {
+        // resample2d
+        for (let dataType of allWebNNOperandDataTypes) {
+          const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: allWebNNDimensionsArray[inputRank]});
+          for (let invalidAxis of invalidAxisArray) {
+            assert_throws_js(TypeError, () => builder[subOperationName](input, {axes: invalidAxis}));
+          }
+          for (let axis of notUnsignedLongAxisArray) {
+            assert_false(typeof axis === 'number' && Number.isInteger(axis), `[${subOperationName}]  any of options.axes elements should be of 'unsigned long'`);
+            assert_throws_js(TypeError, () => builder[subOperationName](input, {axes: [axis]}));
+          }
+        }
+      }
+    }, `[${subOperationName}] TypeError is expected if any of options.axes elements is not an unsigned long interger`);
+
+    // DataError is expected if any of options.axes elements is greater or equal to the size of input
+    promise_test(async t => {
+      if (inputRank === undefined) {
+        // argMin/Max / layerNormalization / Reduction operations
+        for (let dataType of allWebNNOperandDataTypes) {
+          for (let dimensions of allWebNNDimensionsArray) {
+            const rank = getRank(dimensions);
+            if (rank >= 1) {
+              const input = builder.input(`input${++inputIndex}`, {dataType, dimensions});
+              assert_throws_dom('DataError', () => builder[subOperationName](input, {axes: [rank]}));
+              assert_throws_dom('DataError', () => builder[subOperationName](input, {axes: [rank + 1]}));
+            }
+          }
+        }
+      } else {
+        // resample2d
+        for (let dataType of allWebNNOperandDataTypes) {
+          const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: allWebNNDimensionsArray[inputRank]});
+          assert_throws_dom('DataError', () => builder[subOperationName](input, {axes: [inputRank]}));
+          assert_throws_dom('DataError', () => builder[subOperationName](input, {axes: [inputRank + 1]}));
+        }
+      }
+    }, `[${subOperationName}] DataError is expected if any of options.axes elements is greater or equal to the size of input`);
+
+    // DataError is expected if two or more values are same in the axes sequence
+    promise_test(async t => {
+      if (inputRank === undefined) {
+        // argMin/Max / layerNormalization / Reduction operations
+        for (let dataType of allWebNNOperandDataTypes) {
+          for (let dimensions of allWebNNDimensionsArray) {
+            const rank = getRank(dimensions);
+            if (rank >= 2) {
+              const input = builder.input(`input${++inputIndex}`, {dataType, dimensions});
+              const axesArrayContainSameValues = getAxesArrayContainSameValues(dimensions);
+              for (let axes of axesArrayContainSameValues) {
+                assert_throws_dom('DataError', () => builder[subOperationName](input, {axes}));
+              }
+            }
+          }
+        }
+      } else {
+        // resample2d
+        for (let dataType of allWebNNOperandDataTypes) {
+          const dimensions = allWebNNDimensionsArray[inputRank];
+          const input = builder.input(`input${++inputIndex}`, {dataType, dimensions});
+          const axesArrayContainSameValues = getAxesArrayContainSameValues(dimensions);
+          for (let axes of axesArrayContainSameValues) {
+            assert_throws_dom('DataError', () => builder[subOperationName](input, {axes}));
+          }
+        }
+      }
+    }, `[${subOperationName}] DataError is expected if two or more values are same in the axes sequence`);
+  }
+}
diff --git a/third_party/blink/web_tests/external/wpt/webnn/sigmoid.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/sigmoid.https.any.js
deleted file mode 100644
index e904d8d..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/sigmoid.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API sigmoid operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-sigmoid
-
-testWebNNOperation('sigmoid', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/slice.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/slice.https.any.js
deleted file mode 100644
index cb7acef..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/slice.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API slice operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-slice
-
-testWebNNOperation('slice', buildSlice);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/softmax.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/softmax.https.any.js
deleted file mode 100644
index 8e5342b..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/softmax.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API softmax operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softmax
-
-testWebNNOperation('softmax', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/softplus.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/softplus.https.any.js
deleted file mode 100644
index 7096f64..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/softplus.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API softplus operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softplus
-
-testWebNNOperation('softplus', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/softsign.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/softsign.https.any.js
deleted file mode 100644
index 61a7d53..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/softsign.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API softsign operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-softsign
-
-testWebNNOperation('softsign', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/split.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/split.https.any.js
deleted file mode 100644
index b6fc5b4..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/split.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API split operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-split
-
-testWebNNOperation('split', buildSplit);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/squeeze.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/squeeze.https.any-expected.txt
deleted file mode 100644
index e1a2e67..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/squeeze.https.any-expected.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] squeeze float32 2D tensor by eliminating one dimension default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 3D tensor by eliminating one dimension default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 3D tensor by eliminating two dimensions default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 4D tensor by eliminating two dimensions default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 4D tensor by eliminating all dimensions default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 5D tensor by eliminating four dimensions default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 2D tensor by eliminating one dimension options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 3D tensor by eliminating two dimensions options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 4D tensor by eliminating two dimensions options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 5D tensor by eliminating two dimensions options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 5D tensor by eliminating four dimensions options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/squeeze.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webnn/squeeze.https.any.worker-expected.txt
deleted file mode 100644
index e1a2e67..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/squeeze.https.any.worker-expected.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] squeeze float32 2D tensor by eliminating one dimension default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 3D tensor by eliminating one dimension default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 3D tensor by eliminating two dimensions default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 4D tensor by eliminating two dimensions default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 4D tensor by eliminating all dimensions default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 5D tensor by eliminating four dimensions default options
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 2D tensor by eliminating one dimension options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 3D tensor by eliminating two dimensions options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 4D tensor by eliminating two dimensions options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 5D tensor by eliminating two dimensions options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-[FAIL] squeeze float32 5D tensor by eliminating four dimensions options.axes
-  promise_test: Unhandled rejection with value: object "TypeError: builder[operationName] is not a function"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/webnn/tanh.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/tanh.https.any.js
deleted file mode 100644
index d0d45e75..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/tanh.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API tanh operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-tanh
-
-testWebNNOperation('tanh', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/transpose.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/transpose.https.any.js
deleted file mode 100644
index 63a123342..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/transpose.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API transpose operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-transpose
-
-testWebNNOperation('transpose', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/triangular.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/triangular.https.any.js
deleted file mode 100644
index 1f1af6d..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/triangular.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API triangular operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-triangular
-
-testWebNNOperation('triangular', buildOperationWithSingleInput);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webnn/validation_tests/arg_min_max.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/arg_min_max.https.any.js
new file mode 100644
index 0000000..700be83b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/arg_min_max.https.any.js
@@ -0,0 +1,8 @@
+// META: title=validation tests for WebNN API argMin/Max operations
+// META: global=window,dedicatedworker
+// META: script=../resources/utils_validation.js
+// META: timeout=long
+
+'use strict';
+
+validateOptionsAxes(['argMin', 'argMax']);
diff --git a/third_party/blink/web_tests/external/wpt/webnn/validation_tests/batch_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/batch_normalization.https.any.js
new file mode 100644
index 0000000..25b542d3
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/batch_normalization.https.any.js
@@ -0,0 +1,190 @@
+// META: title=validation tests for WebNN API batchNormalization operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils_validation.js
+// META: timeout=long
+
+'use strict';
+
+let meanIndex = 0;
+let varianceIndex = 0;
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    const invalidAxisArray = generateOutOfRangeValuesArray(unsignedLongType);
+    for (let axis of validAxisArray) {
+      let size = dimensions2D[axis];
+      const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [size]});
+      const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [size]});
+      for (let invalidAxis of invalidAxisArray) {
+        assert_throws_js(TypeError, () => builder.batchNormalization(input, mean, variance, {axis: invalidAxis}));
+      }
+    }
+  }
+}, "[batchNormalization] TypeError is expected if options.axis is outside the 'unsigned long' value range");
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      let size = dimensions2D[axis];
+      const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [size]});
+      const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [size]});
+      assert_throws_dom('DataError', () => builder.batchNormalization(input, mean, variance, {axis: getRank(dimensions2D)}));
+    }
+  }
+}, "[batchNormalization] DataError is expected if options.axis is 'unsigned long' and it's not in the range 0 to the rank of input, exclusive");
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      let size = dimensions2D[axis];
+      const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [size]});
+      const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [size]});
+      for (let axis of notUnsignedLongAxisArray) {
+        assert_false(typeof axis === 'number' && Number.isInteger(axis), "[batchNormalization] options.axis should be of 'unsigned long'");
+        assert_throws_js(TypeError, () => builder.batchNormalization(input, mean, variance, {axis}));
+      }
+    }
+  }
+}, '[batchNormalization] TypeError is expected if options.axis is not an unsigned long interger');
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [dimensions2D[axis]]});
+      for (let dimensions of allWebNNDimensionsArray) {
+        if (dimensions.length !== 1) {
+          // set mean not be 1D tensor
+          const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions});
+          assert_throws_dom('DataError', () => builder.batchNormalization(input, mean, variance));
+        }
+      }
+    }
+  }
+}, "[batchNormalization] DataError is expected if the size of mean.dimensions is not 1");
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      let size = dimensions2D[axis];
+      const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [size]});
+      for (let offset of adjustOffsetsArray) {
+        const adjustedSize = size + offset;
+        const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [adjustedSize]});
+        assert_throws_dom('DataError', () => builder.batchNormalization(input, mean, variance, {axis}));
+      }
+    }
+  }
+}, "[batchNormalization] DataError is expected if mean.dimensions[0] is not equal to input.dimensions[options.axis]");
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [dimensions2D[axis]]});
+      for (let dimensions of allWebNNDimensionsArray) {
+        if (dimensions.length !== 1) {
+          // set variance not be 1D tensor
+          const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions});
+          assert_throws_dom('DataError', () => builder.batchNormalization(input, mean, variance));
+        }
+      }
+    }
+  }
+}, "[batchNormalization] DataError is expected if the size of variance.dimensions is not 1");
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      let size = dimensions2D[axis];
+      const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [size]});
+      for (let offset of adjustOffsetsArray) {
+        const adjustedSize = size + offset;
+        const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [adjustedSize]});
+        assert_throws_dom('DataError', () => builder.batchNormalization(input, mean, variance, {axis}));
+      }
+    }
+  }
+}, "[batchNormalization] DataError is expected if variance.dimensions[0] is not equal to input.dimensions[options.axis]");
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [dimensions2D[axis]]});
+      const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [dimensions2D[axis]]});
+      for (let dimensions of allWebNNDimensionsArray) {
+        if (dimensions.length !== 1) {
+          // set scale not be 1D tensor
+          const scale = builder.input('scale', {dataType, dimensions});
+          assert_throws_dom('DataError', () => builder.batchNormalization(input, mean, variance, {axis, scale}));
+        }
+      }
+    }
+  }
+}, "[batchNormalization] DataError is expected if the size of scale.dimensions is not 1");
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      let size = dimensions2D[axis];
+      const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [size]});
+      const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [size]});
+      for (let offset of adjustOffsetsArray) {
+        const adjustedSize = size + offset;
+        const scale = builder.input('scale', {dataType, dimensions: [adjustedSize]});
+        assert_throws_dom('DataError', () => builder.batchNormalization(input, mean, variance, {axis, scale}));
+      }
+    }
+  }
+}, "[batchNormalization] DataError is expected if scale.dimensions[0] is not equal to input.dimensions[options.axis]");
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [dimensions2D[axis]]});
+      const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [dimensions2D[axis]]});
+      for (let dimensions of allWebNNDimensionsArray) {
+        if (dimensions.length !== 1) {
+          // set bias not be 1D tensor
+          const bias = builder.input('bias', {dataType, dimensions});
+          assert_throws_dom('DataError', () => builder.batchNormalization(input, mean, variance, {axis, bias}));
+        }
+      }
+    }
+  }
+}, "[batchNormalization] DataError is expected if the size of bias.dimensions is not 1");
+
+promise_test(async t => {
+  for (let dataType of allWebNNOperandDataTypes) {
+    const input = builder.input(`input${++inputIndex}`, {dataType, dimensions: dimensions2D});
+    const validAxisArray = getAxisArray(dimensions2D);
+    for (let axis of validAxisArray) {
+      let size = dimensions2D[axis];
+      const mean = builder.input(`mean${++meanIndex}`, {dataType, dimensions: [size]});
+      const variance = builder.input(`variance${++varianceIndex}`, {dataType, dimensions: [size]});
+      for (let offset of adjustOffsetsArray) {
+        const adjustedSize = size + offset;
+        const bias = builder.input('bias', {dataType, dimensions: [adjustedSize]});
+        assert_throws_dom('DataError', () => builder.batchNormalization(input, mean, variance, {axis, bias}));
+      }
+    }
+  }
+}, "[batchNormalization] DataError is expected if bias.dimensions[0] is not equal to input.dimensions[options.axis]");
diff --git a/third_party/blink/web_tests/external/wpt/webnn/validation_tests/elementwise_binary.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/elementwise_binary.https.any.js
new file mode 100644
index 0000000..97a1a2b9
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/elementwise_binary.https.any.js
@@ -0,0 +1,11 @@
+// META: title=validation tests for WebNN API element-wise binary operations
+// META: global=window,dedicatedworker
+// META: script=../resources/utils_validation.js
+// META: timeout=long
+
+'use strict';
+
+['add', 'sub', 'mul', 'div', 'max', 'min', 'pow'].forEach((operationName) => {
+  validateTwoInputsOfSameDataType(operationName);
+  validateTwoInputsBroadcastable(operationName);
+});
diff --git a/third_party/blink/web_tests/external/wpt/webnn/validation_tests/layer_normalization.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/layer_normalization.https.any.js
new file mode 100644
index 0000000..7dbcf5c74
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/layer_normalization.https.any.js
@@ -0,0 +1,8 @@
+// META: title=validation tests for WebNN API
+// META: global=window,dedicatedworker
+// META: script=../resources/utils_validation.js
+// META: timeout=long
+
+'use strict';
+
+validateOptionsAxes('layerNormalization', 4);
diff --git a/third_party/blink/web_tests/external/wpt/webnn/validation_tests/reduction.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/reduction.https.any.js
new file mode 100644
index 0000000..65b71239
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/reduction.https.any.js
@@ -0,0 +1,21 @@
+// META: title=validation tests for WebNN API reduction  operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils_validation.js
+// META: timeout=long
+
+'use strict';
+
+[
+  'reduceL1',
+  'reduceL2',
+  'reduceLogSum',
+  'reduceLogSumExp',
+  'reduceMax',
+  'reduceMean',
+  'reduceMin',
+  'reduceProduct',
+  'reduceSum',
+  'reduceSumSquare',
+].forEach((operationName) => {
+  validateOptionsAxes(operationName);
+});
diff --git a/third_party/blink/web_tests/external/wpt/webnn/validation_tests/resample2d.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/resample2d.https.any.js
new file mode 100644
index 0000000..2e00cf2
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webnn/validation_tests/resample2d.https.any.js
@@ -0,0 +1,8 @@
+// META: title=validation tests for WebNN API resample2d operation
+// META: global=window,dedicatedworker
+// META: script=../resources/utils_validation.js
+// META: timeout=long
+
+'use strict';
+
+validateOptionsAxes('resample2d', 4);
diff --git a/third_party/blink/web_tests/external/wpt/webnn/where.https.any.js b/third_party/blink/web_tests/external/wpt/webnn/where.https.any.js
deleted file mode 100644
index 306128a..0000000
--- a/third_party/blink/web_tests/external/wpt/webnn/where.https.any.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// META: title=test WebNN API where operation
-// META: global=window,dedicatedworker
-// META: script=./resources/utils.js
-// META: timeout=long
-
-'use strict';
-
-// https://webmachinelearning.github.io/webnn/#api-mlgraphbuilder-where
-
-testWebNNOperation('where', buildWhere);
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webrtc/RTCPeerConnection-createDataChannel.html b/third_party/blink/web_tests/external/wpt/webrtc/RTCPeerConnection-createDataChannel.html
index cddbd02..373630f 100644
--- a/third_party/blink/web_tests/external/wpt/webrtc/RTCPeerConnection-createDataChannel.html
+++ b/third_party/blink/web_tests/external/wpt/webrtc/RTCPeerConnection-createDataChannel.html
@@ -707,6 +707,19 @@
     await createDataChannelPair(t, options, pc1);
   }, `addTrack, then creating ${mode}, should negotiate properly when max-bundle is used`);
 
+  promise_test(async t => {
+    const pc1 = new RTCPeerConnection();
+    const pc2 = new RTCPeerConnection();
+    const stream = await getNoiseStream({audio: true, video: true});
+    stream.getTracks().forEach((track) => pc1.addTrack(track, stream));
+    await createDataChannelPair(t, options, pc1, pc2);
+
+    await pc1.setLocalDescription();
+    await pc2.setRemoteDescription(pc1.localDescription);
+    await pc2.setLocalDescription();
+    await pc1.setRemoteDescription(pc2.localDescription);
+  }, `Renegotiation with audio/video and ${mode} should work properly`);
+
 /*
 This test is disabled until https://github.com/w3c/webrtc-pc/issues/2562
 has been resolved; it presupposes that stopping the first transceiver
diff --git a/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any-expected.txt b/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any-expected.txt
index 2b4e26a..e4fc294 100644
--- a/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 32 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 40 FAIL, 0 TIMEOUT, 0 NOTRUN.
 [FAIL] WebTransport interface: attribute reliability
   assert_true: The prototype object must have a property "reliability" expected true got false
 [FAIL] WebTransport interface: attribute congestionControl
@@ -36,6 +36,8 @@
   assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
 [FAIL] WebTransportSendStream interface: operation getStats()
   assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
+[FAIL] WebTransportSendStream interface: operation getWriter()
+  assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
 [FAIL] WebTransportSendGroup interface: existence and properties of interface object
   assert_own_property: self does not have own property "WebTransportSendGroup" expected property "WebTransportSendGroup" missing
 [FAIL] WebTransportSendGroup interface object length
@@ -64,5 +66,19 @@
   assert_own_property: self does not have own property "WebTransportReceiveStream" expected property "WebTransportReceiveStream" missing
 [FAIL] WebTransportReceiveStream interface: operation getStats()
   assert_own_property: self does not have own property "WebTransportReceiveStream" expected property "WebTransportReceiveStream" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface object
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface object length
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface object name
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object's "constructor" property
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object's @@unscopables property
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: operation atomicWrite(optional any)
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
 Harness: the test ran to completion.
 
diff --git a/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.serviceworker-expected.txt b/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.serviceworker-expected.txt
index 2b4e26a..e4fc294 100644
--- a/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.serviceworker-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.serviceworker-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 32 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 40 FAIL, 0 TIMEOUT, 0 NOTRUN.
 [FAIL] WebTransport interface: attribute reliability
   assert_true: The prototype object must have a property "reliability" expected true got false
 [FAIL] WebTransport interface: attribute congestionControl
@@ -36,6 +36,8 @@
   assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
 [FAIL] WebTransportSendStream interface: operation getStats()
   assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
+[FAIL] WebTransportSendStream interface: operation getWriter()
+  assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
 [FAIL] WebTransportSendGroup interface: existence and properties of interface object
   assert_own_property: self does not have own property "WebTransportSendGroup" expected property "WebTransportSendGroup" missing
 [FAIL] WebTransportSendGroup interface object length
@@ -64,5 +66,19 @@
   assert_own_property: self does not have own property "WebTransportReceiveStream" expected property "WebTransportReceiveStream" missing
 [FAIL] WebTransportReceiveStream interface: operation getStats()
   assert_own_property: self does not have own property "WebTransportReceiveStream" expected property "WebTransportReceiveStream" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface object
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface object length
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface object name
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object's "constructor" property
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object's @@unscopables property
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: operation atomicWrite(optional any)
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
 Harness: the test ran to completion.
 
diff --git a/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.sharedworker-expected.txt b/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.sharedworker-expected.txt
index 2b4e26a..e4fc294 100644
--- a/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.sharedworker-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.sharedworker-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 32 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 40 FAIL, 0 TIMEOUT, 0 NOTRUN.
 [FAIL] WebTransport interface: attribute reliability
   assert_true: The prototype object must have a property "reliability" expected true got false
 [FAIL] WebTransport interface: attribute congestionControl
@@ -36,6 +36,8 @@
   assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
 [FAIL] WebTransportSendStream interface: operation getStats()
   assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
+[FAIL] WebTransportSendStream interface: operation getWriter()
+  assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
 [FAIL] WebTransportSendGroup interface: existence and properties of interface object
   assert_own_property: self does not have own property "WebTransportSendGroup" expected property "WebTransportSendGroup" missing
 [FAIL] WebTransportSendGroup interface object length
@@ -64,5 +66,19 @@
   assert_own_property: self does not have own property "WebTransportReceiveStream" expected property "WebTransportReceiveStream" missing
 [FAIL] WebTransportReceiveStream interface: operation getStats()
   assert_own_property: self does not have own property "WebTransportReceiveStream" expected property "WebTransportReceiveStream" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface object
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface object length
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface object name
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object's "constructor" property
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object's @@unscopables property
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: operation atomicWrite(optional any)
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
 Harness: the test ran to completion.
 
diff --git a/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.worker-expected.txt b/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.worker-expected.txt
index 2b4e26a..e4fc294 100644
--- a/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.worker-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/webtransport/idlharness.https.any.worker-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 32 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 40 FAIL, 0 TIMEOUT, 0 NOTRUN.
 [FAIL] WebTransport interface: attribute reliability
   assert_true: The prototype object must have a property "reliability" expected true got false
 [FAIL] WebTransport interface: attribute congestionControl
@@ -36,6 +36,8 @@
   assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
 [FAIL] WebTransportSendStream interface: operation getStats()
   assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
+[FAIL] WebTransportSendStream interface: operation getWriter()
+  assert_own_property: self does not have own property "WebTransportSendStream" expected property "WebTransportSendStream" missing
 [FAIL] WebTransportSendGroup interface: existence and properties of interface object
   assert_own_property: self does not have own property "WebTransportSendGroup" expected property "WebTransportSendGroup" missing
 [FAIL] WebTransportSendGroup interface object length
@@ -64,5 +66,19 @@
   assert_own_property: self does not have own property "WebTransportReceiveStream" expected property "WebTransportReceiveStream" missing
 [FAIL] WebTransportReceiveStream interface: operation getStats()
   assert_own_property: self does not have own property "WebTransportReceiveStream" expected property "WebTransportReceiveStream" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface object
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface object length
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface object name
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object's "constructor" property
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: existence and properties of interface prototype object's @@unscopables property
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
+[FAIL] WebTransportWriter interface: operation atomicWrite(optional any)
+  assert_own_property: self does not have own property "WebTransportWriter" expected property "WebTransportWriter" missing
 Harness: the test ran to completion.
 
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/browsing_context/context_created/context_created-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/browsing_context/context_created/context_created-expected.txt
new file mode 100644
index 0000000..adcdc6f31
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/browsing_context/context_created/context_created-expected.txt
@@ -0,0 +1,6 @@
+This is a wdspec test.
+[FAIL] test_existing_context[tab]
+  asyncio.exceptions.TimeoutError
+[FAIL] test_existing_context[window]
+  asyncio.exceptions.TimeoutError
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/add_intercept-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/add_intercept-expected.txt
index 13e4faf0..8555cc1 100644
--- a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/add_intercept-expected.txt
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/add_intercept-expected.txt
@@ -1,6 +1,10 @@
 This is a wdspec test.
-[FAIL] test_other_context[beforeRequestSent]
-  webdriver.bidi.modules.script.ScriptEvaluateResultException: AbortError: The user aborted a request.
-[FAIL] test_other_context[responseStarted]
-  webdriver.bidi.modules.script.ScriptEvaluateResultException: AbortError: The user aborted a request.
+[FAIL] test_other_url[beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_other_url[responseStarted]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_return_value
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_two_intercepts
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/contexts-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/contexts-expected.txt
new file mode 100644
index 0000000..b93380a
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/contexts-expected.txt
@@ -0,0 +1,8 @@
+This is a wdspec test.
+[FAIL] test_other_context[beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_other_context[responseStarted]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_other_context_with_event_subscription
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/invalid-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/invalid-expected.txt
new file mode 100644
index 0000000..c6c9d64
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/invalid-expected.txt
@@ -0,0 +1,8 @@
+This is a wdspec test.
+[FAIL] test_params_contexts_invalid_value[value0]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_contexts_invalid_value[value1]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_contexts_context_non_top_level
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/phase_auth_required-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/phase_auth_required-expected.txt
new file mode 100644
index 0000000..89605058
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/phase_auth_required-expected.txt
@@ -0,0 +1,6 @@
+This is a wdspec test.
+[FAIL] test_basic_authentication
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_no_authentication
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/phases-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/phases-expected.txt
index 8925def..904daf9 100644
--- a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/phases-expected.txt
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/phases-expected.txt
@@ -1,8 +1,16 @@
 This is a wdspec test.
+[FAIL] test_request_response_phases[phases0-beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_request_response_phases[phases1-responseStarted]
-  asyncio.exceptions.TimeoutError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_request_response_phases[phases2-beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_request_response_phases[phases3-beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_request_response_phases[phases4-beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_not_listening_to_phase_event[beforeRequestSent]
-  webdriver.bidi.modules.script.ScriptEvaluateResultException: AbortError: The user aborted a request.
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_not_listening_to_phase_event[responseStarted]
-  webdriver.bidi.modules.script.ScriptEvaluateResultException: AbortError: The user aborted a request.
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/url_patterns-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/url_patterns-expected.txt
index 6719741f..50f13815 100644
--- a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/url_patterns-expected.txt
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/add_intercept/url_patterns-expected.txt
@@ -1,82 +1,140 @@
 This is a wdspec test.
+[FAIL] test_pattern_patterns_matching[patterns0-https://{wpt_host}]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_pattern_patterns_matching[patterns1-https://{wpt_host}/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_pattern_patterns_matching[patterns2-https://{wpt_host}:1234/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_pattern_patterns_matching[patterns3-https://{wpt_host}/path]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_pattern_patterns_matching[patterns4-https://{wpt_host}/?search]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_pattern_patterns_matching[patterns5-https://{wpt_host}]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_pattern_patterns_matching[patterns6-https://{wpt_host}/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_pattern_patterns_matching[patterns7-https://{wpt_host}:1234/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_pattern_patterns_matching[patterns8-https://{wpt_host}/path]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_pattern_patterns_matching[patterns9-https://{wpt_host}/?search]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns10-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns11-https://{wpt_host}:1234/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns12-https://{wpt_host}/path]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns13-https://{wpt_host}/?search]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns14-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns15-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns16-https://{wpt_host}:1234/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns17-https://{wpt_host}/path]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns18-https://{wpt_host}/?search]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns19-https://{wpt_host_upper}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns20-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns21-https://{wpt_host}:1234/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns22-https://{wpt_host}]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns23-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns24-https://{wpt_host}/path]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns25-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns26-https://{wpt_host}/?]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_matching[patterns27-https://{wpt_host}/?search]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern0-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern1-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern2-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern3-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern4-https://{wpt_host}:1234/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern5-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern6-https://{wpt_host}/path]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern7-https://{wpt_host}/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern8-https://{wpt_host}/path/]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern9-https://{wpt_host}/other/path]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern10-https://{wpt_host}/path/continued]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern11-https://{wpt_host}/?search]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_pattern_patterns_not_matching[pattern12-https://{wpt_host}/?other]
-  webdriver.bidi.error.InvalidArgumentException: invalid argument (TypeError: Failed to construct 'URL': Invalid URL)
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_matching[https://{wpt_host}/-https://{wpt_host}/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_string_patterns_matching[https://{wpt_host}-https://{wpt_host}/]
-  AssertionError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_matching[https://{wpt_host}/-https://{wpt_host}]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_string_patterns_matching[HTTPS://{wpt_host}/-https://{wpt_host}/]
-  AssertionError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_matching[https://{wpt_host}/-HTTPS://{wpt_host}/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_string_patterns_matching[https://{wpt_host_upper}/-https://{wpt_host}/]
-  AssertionError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_matching[https://{wpt_host}/-https://{wpt_host_upper}/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_string_patterns_matching[https://user:password@{wpt_host}/-https://{wpt_host}/]
-  AssertionError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_matching[https://{wpt_host}/-https://{wpt_host}:443/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_string_patterns_matching[https://{wpt_host}:443/-https://{wpt_host}/]
-  AssertionError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_string_patterns_matching[https://{wpt_host}:443/-https://{wpt_host}:443/]
-  AssertionError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_matching[https://{wpt_host}:1234/-https://{wpt_host}:1234/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_matching[https://{wpt_host}/path-https://{wpt_host}/path]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_matching[https://{wpt_host}/?search-https://{wpt_host}/?search]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_string_patterns_matching[https://{wpt_host}/#ref-https://{wpt_host}/]
-  AssertionError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_matching[https://{wpt_host}/-https://{wpt_host}/#ref]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_string_patterns_matching[https://{wpt_host}/#ref1-https://{wpt_host}/#ref2]
-  AssertionError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}/-https://some.other.host/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}:1234/-https://{wpt_host}:5678/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}/-https://{wpt_host}:5678/]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}/path-https://{wpt_host}/other/path]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}/path-https://{wpt_host}/path/continued]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}/pathcase-https://{wpt_host}/PATHCASE]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}/?searchcase-https://{wpt_host}/?SEARCHCASE]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}/?key-https://{wpt_host}/?otherkey]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}/?key-https://{wpt_host}/?key=value]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_string_patterns_not_matching[https://{wpt_host}/?a=b&c=d-https://{wpt_host}/?c=d&a=b]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_string_patterns_not_matching[https://{wpt_host}/??-https://{wpt_host}/?]
-  AssertionError
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_request/invalid-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_request/invalid-expected.txt
new file mode 100644
index 0000000..dcabf9b4
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_request/invalid-expected.txt
@@ -0,0 +1,200 @@
+This is a wdspec test.
+[FAIL] test_params_body_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_invalid_value[value0]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_invalid_value[value1]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_invalid_value[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_type_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_type_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_type_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_type_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_type_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_type_invalid_value[]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_type_invalid_value[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_value_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_value_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_value_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_value_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_body_value_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_value[value0]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_value[value1]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_value[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_value[]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_value[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_value[value0]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_value[value1]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_value[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_value[]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_value[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_method_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_method_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_method_invalid_type[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_method_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_url_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_url_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_url_invalid_type[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_url_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_url_invalid_value[:invalid-http]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_url_invalid_value[:invalid-https]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_url_invalid_value[#invalid-http]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_url_invalid_value[#invalid-https]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_request/request-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_request/request-expected.txt
new file mode 100644
index 0000000..502a174
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_request/request-expected.txt
@@ -0,0 +1,6 @@
+This is a wdspec test.
+[FAIL] test_continue_fetch_request
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_continue_navigation
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_response/credentials-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_response/credentials-expected.txt
new file mode 100644
index 0000000..7949799
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_response/credentials-expected.txt
@@ -0,0 +1,10 @@
+This is a wdspec test.
+[FAIL] test_wrong_credentials[fetch]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_wrong_credentials[navigate]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_correct_credentials[fetch]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_correct_credentials[navigate]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_response/invalid-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_response/invalid-expected.txt
new file mode 100644
index 0000000..9f04ea3f
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_response/invalid-expected.txt
@@ -0,0 +1,278 @@
+This is a wdspec test.
+[FAIL] test_params_cookies_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_value[empty object]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_value[missing value]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_invalid_value[missing name]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_name_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_value[value0]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_value[value1]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_invalid_value[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_value[]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_type_invalid_value[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[False-domain]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[False-expiry]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[False-path]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[False-sameSite]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[42-domain]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[42-expiry]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[42-path]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[42-sameSite]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value2-domain]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value2-expiry]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value2-path]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value2-sameSite]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value3-domain]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value3-expiry]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value3-path]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value3-sameSite]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_same_site_invalid_value[]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_same_site_invalid_value[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[42-httpOnly]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[42-secure]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[foo-httpOnly]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[foo-secure]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[value2-httpOnly]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[value2-secure]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[value3-httpOnly]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[value3-secure]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_max_age_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_max_age_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_max_age_invalid_type[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_max_age_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_max_age_invalid_value[4.3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_cookies_cookie_value_value_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_invalid_value[missing username]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_invalid_value[missing password]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_invalid_value[missing username and password]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_invalid_value[missing type]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_type_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_type_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_type_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_type_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_type_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_type_invalid_value[]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_type_invalid_value[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_username_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_username_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_username_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_username_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_username_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_password_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_password_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_password_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_password_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_credentials_password_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_name_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_value[value0]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_value[value1]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_invalid_value[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_value[]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_type_invalid_value[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_headers_header_value_value_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_request_invalid_phase
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_reason_phrase_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_reason_phrase_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_reason_phrase_invalid_type[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_reason_phrase_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_type[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_value[-1]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_value[4.3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_response/request-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_response/request-expected.txt
new file mode 100644
index 0000000..97f31300
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_response/request-expected.txt
@@ -0,0 +1,10 @@
+This is a wdspec test.
+[FAIL] test_continue_auth_required[fetch]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_continue_auth_required[navigate]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_continue_response_started[fetch]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_continue_response_started[navigate]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_with_auth/action-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_with_auth/action-expected.txt
index 6f424da7..eab156b5 100644
--- a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_with_auth/action-expected.txt
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_with_auth/action-expected.txt
@@ -1,3 +1,10 @@
 This is a wdspec test.
-Harness Error. harness_status.status = 2 , harness_status.message = 
+[FAIL] test_cancel
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_default
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_provideCredentials
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_provideCredentials_wrong_credentials
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_with_auth/invalid-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_with_auth/invalid-expected.txt
new file mode 100644
index 0000000..4ecb27c
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/continue_with_auth/invalid-expected.txt
@@ -0,0 +1,68 @@
+This is a wdspec test.
+[FAIL] test_params_request_invalid_phase[beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_request_invalid_phase[responseStarted]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_request_no_such_request_after_cancel
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_request_no_such_request_after_provideCredentials
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_invalid_value[]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_invalid_value[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_invalid_credentials[missing username]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_invalid_credentials[missing password]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_invalid_credentials[missing username and password]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_invalid_credentials[missing type]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_invalid_credentials[missing credentials]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_type_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_type_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_type_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_type_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_type_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_type_invalid_value[]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_type_invalid_value[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_username_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_username_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_username_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_username_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_username_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_password_invalid_type[None]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_password_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_password_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_password_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_action_provideCredentials_credentials_password_invalid_type[value4]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/fail_request/invalid-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/fail_request/invalid-expected.txt
new file mode 100644
index 0000000..a694f69e
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/fail_request/invalid-expected.txt
@@ -0,0 +1,4 @@
+This is a wdspec test.
+[FAIL] test_params_request_invalid_phase
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/fail_request/request-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/fail_request/request-expected.txt
new file mode 100644
index 0000000..e8a8d6cf
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/fail_request/request-expected.txt
@@ -0,0 +1,6 @@
+This is a wdspec test.
+[FAIL] test_phases[beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_phases[responseStarted]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/provide_response/invalid-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/provide_response/invalid-expected.txt
index a859e7bb..196b459 100644
--- a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/provide_response/invalid-expected.txt
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/provide_response/invalid-expected.txt
@@ -1,244 +1,264 @@
 This is a wdspec test.
 [FAIL] test_params_body_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_invalid_type[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_invalid_value[value0]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_invalid_value[value1]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_invalid_value[value2]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_type_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_type_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_type_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_type_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_type_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_type_invalid_value[]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_type_invalid_value[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_value_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_value_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_value_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_value_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_body_value_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'body'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_invalid_type[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_invalid_type[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_invalid_value[empty object]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_invalid_value[missing value]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_invalid_value[missing name]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_name_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_name_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_name_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_name_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_name_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_invalid_type[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_invalid_value[value0]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_invalid_value[value1]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_invalid_value[value2]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_type_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_type_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_type_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_type_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_type_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_type_invalid_value[]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_type_invalid_value[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[False-domain]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[False-expiry]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[False-path]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[False-sameSite]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[42-domain]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[42-expiry]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[42-path]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[42-sameSite]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value2-domain]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value2-expiry]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value2-path]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value2-sameSite]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value3-domain]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value3-expiry]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value3-path]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_string_properties_invalid_type[value3-sameSite]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_same_site_invalid_value[]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_same_site_invalid_value[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[42-httpOnly]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[42-secure]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[foo-httpOnly]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[foo-secure]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[value2-httpOnly]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[value2-secure]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[value3-httpOnly]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_bool_properties_invalid_type[value3-secure]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_max_age_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_max_age_invalid_type[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_max_age_invalid_type[value2]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_max_age_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_max_age_invalid_value[4.3]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_value_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_value_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_value_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_value_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_cookies_cookie_value_value_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'cookies'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_invalid_type[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_invalid_type[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_name_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_name_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_name_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_name_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_name_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_invalid_type[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_invalid_value[value0]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_invalid_value[value1]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_invalid_value[value2]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_type_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_type_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_type_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_type_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_type_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_type_invalid_value[]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_type_invalid_value[foo]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_value_invalid_type[None]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_value_invalid_type[False]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_value_invalid_type[42]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_value_invalid_type[value3]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 [FAIL] test_params_headers_header_value_value_invalid_type[value4]
-  TypeError: provide_response() got an unexpected keyword argument 'headers'
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_reason_phrase_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_reason_phrase_invalid_type[42]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_reason_phrase_invalid_type[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_reason_phrase_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_type[False]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_type[foo]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_type[value2]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_type[value3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_value[-1]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_params_status_code_invalid_value[4.3]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
 Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/provide_response/request-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/provide_response/request-expected.txt
new file mode 100644
index 0000000..323683ad
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/provide_response/request-expected.txt
@@ -0,0 +1,14 @@
+This is a wdspec test.
+[FAIL] test_provide_response_auth_required[fetch]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_provide_response_auth_required[navigate]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_provide_response_phase[fetch-beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_provide_response_phase[fetch-responseStarted]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_provide_response_phase[navigate-beforeRequestSent]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+[FAIL] test_provide_response_phase[navigate-responseStarted]
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/remove_intercept/invalid-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/remove_intercept/invalid-expected.txt
new file mode 100644
index 0000000..f9f24dd
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/network/remove_intercept/invalid-expected.txt
@@ -0,0 +1,4 @@
+This is a wdspec test.
+[FAIL] test_params_intercept_removed_intercept
+  TypeError: add_intercept() got an unexpected keyword argument 'contexts'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/delete_cookies/filter-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/delete_cookies/filter-expected.txt
new file mode 100644
index 0000000..f372305
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/delete_cookies/filter-expected.txt
@@ -0,0 +1,3 @@
+This is a wdspec test.
+Harness Error. harness_status.status = 1 , harness_status.message = 
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/delete_cookies/invalid-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/delete_cookies/invalid-expected.txt
new file mode 100644
index 0000000..f372305
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/delete_cookies/invalid-expected.txt
@@ -0,0 +1,3 @@
+This is a wdspec test.
+Harness Error. harness_status.status = 1 , harness_status.message = 
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/delete_cookies/partition-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/delete_cookies/partition-expected.txt
new file mode 100644
index 0000000..338eb86d
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/delete_cookies/partition-expected.txt
@@ -0,0 +1,22 @@
+This is a wdspec test.
+[FAIL] test_default_partition[with document cookie]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+[FAIL] test_default_partition[with set cookie]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+[FAIL] test_partition_context[with document cookie]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+[FAIL] test_partition_context[with set cookie]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+[FAIL] test_partition_context_iframe[same_origin]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+[FAIL] test_partition_context_iframe[cross_origin]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+[FAIL] test_partition_source_origin[http]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+[FAIL] test_partition_source_origin[https]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+[FAIL] test_partition_user_context[with document cookie]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+[FAIL] test_partition_user_context[with set cookie]
+  AttributeError: 'Storage' object has no attribute 'delete_cookies'
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/get_cookies/partition-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/get_cookies/partition-expected.txt
new file mode 100644
index 0000000..29baa99
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/get_cookies/partition-expected.txt
@@ -0,0 +1,12 @@
+This is a wdspec test.
+[FAIL] test_partition_context
+  AssertionError: Key set should be present: {'userContext'}
+[FAIL] test_partition_context_iframe[same_origin]
+  AssertionError: Key set should be present: {'userContext'}
+[FAIL] test_partition_context_iframe[cross_origin]
+  AssertionError: Key set should be present: {'userContext'}
+[FAIL] test_partition_default_user_context
+  AssertionError: Key set should be present: {'userContext'}
+[FAIL] test_partition_user_context
+  AssertionError
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/set_cookie/invalid-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/set_cookie/invalid-expected.txt
new file mode 100644
index 0000000..cb99bcb0
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/set_cookie/invalid-expected.txt
@@ -0,0 +1,4 @@
+This is a wdspec test.
+[FAIL] test_partition_storage_key_user_context_invalid_value
+  webdriver.bidi.error.UnableToSetCookieException: unable to set cookie ([object Object])
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/set_cookie/partition-expected.txt b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/set_cookie/partition-expected.txt
new file mode 100644
index 0000000..e3ebc796
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux-chrome/external/wpt/webdriver/tests/bidi/storage/set_cookie/partition-expected.txt
@@ -0,0 +1,6 @@
+This is a wdspec test.
+[FAIL] test_partition_context
+  AssertionError: Key set should be present: {'userContext'}
+[FAIL] test_partition_context_frame
+  AssertionError: Key set should be present: {'userContext'}
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/arg_min_max.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/arg_min_max.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/arg_min_max.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/arg_min_max.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/batch_normalization.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/batch_normalization.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/batch_normalization.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/batch_normalization.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/batch_normalization.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/batch_normalization.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/batch_normalization.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/batch_normalization.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/cast.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/cast.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/cast.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/cast.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/cast.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/cast.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/cast.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/cast.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/clamp.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/clamp.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/clamp.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/clamp.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/clamp.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/clamp.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/clamp.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/clamp.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/concat.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/concat.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/concat.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/concat.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/concat.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/concat.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/concat.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/concat.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any-expected.txt
new file mode 100644
index 0000000..650c222
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any-expected.txt
@@ -0,0 +1,47 @@
+This is a testharness.js-based test.
+[FAIL] conv2d float32 4D input and filter(non-constant) tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D both input and filter constant tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] depthwise conv2d float32 4D input and filter tensors options.groups= input_channels
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nchw'
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc'
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='oihw'
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='hwio'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ohwi'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ihwo'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ihwo is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='oihw'
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='hwio'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ohwi'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ihwo'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ihwo is not supported."
+[FAIL] conv2d float32 4D input and filter tensors 1D options.bias
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.activation=relu
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.activation=sigmoid
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors all options
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
+[FAIL] conv2d float32 4D input and filter tensors, both negative input tensor and options.bias
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.worker-expected.txt
new file mode 100644
index 0000000..650c222
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.worker-expected.txt
@@ -0,0 +1,47 @@
+This is a testharness.js-based test.
+[FAIL] conv2d float32 4D input and filter(non-constant) tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D both input and filter constant tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] depthwise conv2d float32 4D input and filter tensors options.groups= input_channels
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nchw'
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc'
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='oihw'
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='hwio'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ohwi'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ihwo'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ihwo is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='oihw'
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='hwio'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ohwi'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
+[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ihwo'
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ihwo is not supported."
+[FAIL] conv2d float32 4D input and filter tensors 1D options.bias
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.activation=relu
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors options.activation=sigmoid
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] conv2d float32 4D input and filter tensors all options
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
+[FAIL] conv2d float32 4D input and filter tensors, both negative input tensor and options.bias
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any-expected.txt
new file mode 100644
index 0000000..4db52016
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any-expected.txt
@@ -0,0 +1,45 @@
+This is a testharness.js-based test.
+[FAIL] convTranspose2d float32 4D input and filter(non-constant) tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D both input and filter constant tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.groups
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.groups=2 options.strides=[2, 2]
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.outputPadding
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.outputSizes
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nchw
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=iohw
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=hwoi
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwoi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=ohwi
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=iohw
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=hwoi
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwoi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=ohwi
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.bias
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors, both negative input tensor and options.bias
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.activation=relu
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.worker-expected.txt
new file mode 100644
index 0000000..4db52016
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.worker-expected.txt
@@ -0,0 +1,45 @@
+This is a testharness.js-based test.
+[FAIL] convTranspose2d float32 4D input and filter(non-constant) tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D both input and filter constant tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors default options
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.groups
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.groups=2 options.strides=[2, 2]
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.outputPadding
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.outputSizes
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nchw
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=iohw
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=hwoi
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwoi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=ohwi
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=iohw
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=hwoi
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwoi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=ohwi
+  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
+[FAIL] convTranspose2d float32 4D input and filter tensors options.bias
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors, both negative input tensor and options.bias
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+[FAIL] convTranspose2d float32 4D input and filter tensors options.activation=relu
+  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elementwise_logical.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elementwise_logical.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elementwise_logical.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elementwise_logical.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elementwise_unary.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elementwise_unary.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elementwise_unary.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elementwise_unary.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elementwise_unary.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elementwise_unary.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elementwise_unary.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elementwise_unary.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elu.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elu.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elu.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elu.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elu.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elu.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elu.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elu.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/expand.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/expand.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/expand.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/expand.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/expand.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/expand.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/expand.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/expand.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/gather.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gather.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/gather.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gather.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/gather.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gather.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/gather.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gather.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/gemm.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gemm.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/gemm.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gemm.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/gemm.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gemm.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/gemm.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/gemm.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/hard_sigmoid.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/hard_sigmoid.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/hard_sigmoid.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/hard_sigmoid.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/hard_sigmoid.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/hard_sigmoid.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/hard_sigmoid.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/hard_sigmoid.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/hard_swish.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/hard_swish.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/hard_swish.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/hard_swish.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/hard_swish.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/hard_swish.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/hard_swish.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/hard_swish.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/instance_normalization.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/instance_normalization.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/instance_normalization.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/instance_normalization.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/instance_normalization.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/instance_normalization.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/instance_normalization.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/instance_normalization.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/layer_normalization.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/layer_normalization.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/layer_normalization.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/layer_normalization.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/layer_normalization.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/layer_normalization.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/layer_normalization.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/layer_normalization.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/leaky_relu.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/leaky_relu.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/leaky_relu.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/leaky_relu.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/leaky_relu.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/leaky_relu.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/leaky_relu.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/leaky_relu.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/linear.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/linear.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/linear.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/linear.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/linear.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/linear.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/linear.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/linear.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pad.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pad.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pad.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pad.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pad.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pad.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pad.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pad.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any-expected.txt
new file mode 100644
index 0000000..0b12ff8
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any-expected.txt
@@ -0,0 +1,89 @@
+This is a testharness.js-based test.
+[FAIL] averagePool2d float32 4D constant tensor all positive default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor all positive default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor all negative default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.layout=nhwc
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.layout=nhwc and options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.layout=nhwc and options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.dilations with options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D constant tensor all positive default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor default all positive options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor default all negative options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.layout=nhwc
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.dilations with options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D constant tensor default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.layout=nhwc
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.dilations with options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker-expected.txt
new file mode 100644
index 0000000..0b12ff8
--- /dev/null
+++ b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker-expected.txt
@@ -0,0 +1,89 @@
+This is a testharness.js-based test.
+[FAIL] averagePool2d float32 4D constant tensor all positive default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor all positive default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor all negative default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.layout=nhwc
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.layout=nhwc and options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.layout=nhwc and options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] averagePool2d float32 4D tensor options.dilations with options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D constant tensor all positive default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor default all positive options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor default all negative options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.layout=nhwc
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] l2Pool2d float32 4D tensor options.dilations with options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D constant tensor default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor default options
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.windowDimensions
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.padding
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.layout=nchw
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.layout=nhwc
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+[FAIL] maxPool2d float32 4D tensor options.dilations with options.strides
+  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/prelu.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/prelu.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/prelu.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/prelu.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/prelu.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/prelu.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/prelu.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/prelu.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/reduction.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reduction.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/reduction.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reduction.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/reduction.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reduction.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/reduction.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reduction.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/relu.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/relu.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/relu.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/relu.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/relu.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/relu.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/relu.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/relu.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/reshape.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reshape.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/reshape.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reshape.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/reshape.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reshape.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/reshape.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/reshape.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/sigmoid.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/sigmoid.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/sigmoid.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/sigmoid.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/sigmoid.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/sigmoid.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/sigmoid.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/sigmoid.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/slice.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/slice.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/slice.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/slice.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/slice.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/slice.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/slice.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/slice.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softmax.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softmax.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softmax.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softmax.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softmax.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softmax.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softmax.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softmax.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softplus.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softplus.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softplus.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softplus.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softplus.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softplus.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softplus.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softplus.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softsign.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softsign.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softsign.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softsign.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softsign.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softsign.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softsign.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softsign.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/split.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/split.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/split.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/split.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/split.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/split.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/split.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/split.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/tanh.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/tanh.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/tanh.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/tanh.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/tanh.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/tanh.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/tanh.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/tanh.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/transpose.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/transpose.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/transpose.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/transpose.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/transpose.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/transpose.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/transpose.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/transpose.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/where.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/where.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/where.https.any-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/where.https.any-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/where.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/where.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/where.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/where.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any-expected.txt
deleted file mode 100644
index d936fb5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any-expected.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] conv2d float32 4D input and filter(non-constant) tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D both input and filter constant tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.padding and options.autoPad='explicit'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-upper'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-upper' ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-lower'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-lower' ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] depthwise conv2d float32 4D input and filter tensors options.groups= input_channels
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nchw'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='oihw'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='hwio'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ohwi'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ihwo'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ihwo is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='oihw'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='hwio'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ohwi'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ihwo'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ihwo is not supported."
-[FAIL] conv2d float32 4D input and filter tensors 1D options.bias
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.activation=relu
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.activation=sigmoid
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors all options
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
-[FAIL] conv2d float32 4D input and filter tensors, both negative input tensor and options.bias
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any.worker-expected.txt
deleted file mode 100644
index d936fb5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any.worker-expected.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] conv2d float32 4D input and filter(non-constant) tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D both input and filter constant tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.padding and options.autoPad='explicit'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-upper'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-upper' ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-lower'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.autoPad='same-lower' ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] depthwise conv2d float32 4D input and filter tensors options.groups= input_channels
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nchw'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='oihw'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='hwio'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ohwi'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.filterLayout='ihwo'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ihwo is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='oihw'
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='hwio'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ohwi'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
-[FAIL] conv2d float32 4D input and filter tensors options.inputLayout='nhwc' and options.filterLayout='ihwo'
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ihwo is not supported."
-[FAIL] conv2d float32 4D input and filter tensors 1D options.bias
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.activation=relu
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors options.activation=sigmoid
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] conv2d float32 4D input and filter tensors all options
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
-[FAIL] conv2d float32 4D input and filter tensors, both negative input tensor and options.bias
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwio is not supported."
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any-expected.txt
deleted file mode 100644
index d09786d7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any-expected.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] convTranspose2d float32 4D input and filter(non-constant) tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D both input and filter constant tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.groups
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.groups=2 options.strides=[2, 2]
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.outputPadding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.outputSizes
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=explicit options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper ignored options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower ignored options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nchw
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=iohw
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=hwoi
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwoi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=ohwi
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=iohw
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=hwoi
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwoi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=ohwi
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.bias
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors, both negative input tensor and options.bias
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.activation=relu
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any.worker-expected.txt
deleted file mode 100644
index d09786d7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any.worker-expected.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-This is a testharness.js-based test.
-[FAIL] convTranspose2d float32 4D input and filter(non-constant) tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D both input and filter constant tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors default options
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.groups
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.groups=2 options.strides=[2, 2]
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.outputPadding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.outputSizes
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=explicit options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-upper ignored options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.autoPad=same-lower ignored options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nchw
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=iohw
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=hwoi
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwoi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.filterLayout=ohwi
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=iohw
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=hwoi
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout hwoi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=ohwi
-  promise_test: Unhandled rejection with value: object "DataError: Failed to build graph: The filter layout ohwi is not supported."
-[FAIL] convTranspose2d float32 4D input and filter tensors options.bias
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors, both negative input tensor and options.bias
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-[FAIL] convTranspose2d float32 4D input and filter tensors options.activation=relu
-  promise_test: Unhandled rejection with value: object "UnknownError: conv2d is not implemented"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any-expected.txt
deleted file mode 100644
index f92ceb1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any-expected.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-This is a testharness.js-based test.
-Found 58 FAIL, 0 TIMEOUT, 0 NOTRUN.
-[FAIL] averagePool2d float32 4D constant tensor all positive default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor all positive default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor all negative default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.layout=nhwc
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.layout=nhwc and options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.layout=nhwc and options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.dilations with options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D constant tensor all positive default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor default all positive options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor default all negative options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.layout=nhwc
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.dilations with options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D constant tensor default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.layout=nhwc
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.dilations with options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any.worker-expected.txt
deleted file mode 100644
index f92ceb1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any.worker-expected.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-This is a testharness.js-based test.
-Found 58 FAIL, 0 TIMEOUT, 0 NOTRUN.
-[FAIL] averagePool2d float32 4D constant tensor all positive default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor all positive default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor all negative default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.layout=nhwc
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.layout=nhwc and options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.layout=nhwc and options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] averagePool2d float32 4D tensor options.dilations with options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D constant tensor all positive default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor default all positive options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor default all negative options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.layout=nhwc
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] l2Pool2d float32 4D tensor options.dilations with options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D constant tensor default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor default options
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.windowDimensions
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.dilations
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=explicit
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-upper
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-lower
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-upper ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.autoPad=same-lower ignores options.padding
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.layout=nchw
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.layout=nhwc
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.outputSizes ignores options.roundingType=ceil
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-[FAIL] maxPool2d float32 4D tensor options.dilations with options.strides
-  promise_test: Unhandled rejection with value: object "UnknownError: pool2d is not implemented"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac/external/wpt/touch-events/mouseevents-after-touchend.tentative-expected.txt b/third_party/blink/web_tests/platform/mac/external/wpt/touch-events/mouseevents-after-touchend.tentative-expected.txt
new file mode 100644
index 0000000..95623eb3
--- /dev/null
+++ b/third_party/blink/web_tests/platform/mac/external/wpt/touch-events/mouseevents-after-touchend.tentative-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+[FAIL] Single tap whose touchstart is consumed should not cause a click
+  assert_equals: expected "[ { type: touchend, target: child } ]" but got "[ { type: touchend, target: child }, { type: mousemove, target: child, detail: 0, button: 0, buttons: 0 }, { type: mousedown, target: child, detail: 1, button: 0, buttons: 1 }, { type: mouseup, target: child, detail: 1, button: 0, buttons: 0 }, { type: click, target: child, detail: 1, button: 0, buttons: 0 } ]"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/win/external/wpt/touch-events/mouseevents-after-touchend.tentative-expected.txt b/third_party/blink/web_tests/platform/win/external/wpt/touch-events/mouseevents-after-touchend.tentative-expected.txt
new file mode 100644
index 0000000..04856f1
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win/external/wpt/touch-events/mouseevents-after-touchend.tentative-expected.txt
@@ -0,0 +1,7 @@
+This is a testharness.js-based test.
+[FAIL] Single tap whose touchstart is consumed should not cause a click
+  assert_equals: expected "[ { type: touchend, target: child } ]" but got "[ { type: touchend, target: child }, { type: mousemove, target: child, detail: 0, button: 0, buttons: 0 }, { type: mousedown, target: child, detail: 1, button: 0, buttons: 1 }, { type: mouseup, target: child, detail: 1, button: 0, buttons: 0 }, { type: click, target: child, detail: 1, button: 0, buttons: 0 } ]"
+[FAIL] Multi tap should not cause mouse events
+  assert_equals: expected "[ { type: touchend, target: child }, { type: touchend, target: child } ]" but got "[ { type: touchend, target: child }, { type: touchend, target: child }, { type: mousemove, target: child, detail: 0, button: 0, buttons: 0 }, { type: contextmenu, target: child, detail: 0, button: -1, buttons: 0 } ]"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/arg_min_max.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/arg_min_max.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/arg_min_max.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/arg_min_max.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/arg_min_max.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/arg_min_max.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/batch_normalization.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/batch_normalization.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/batch_normalization.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/batch_normalization.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/batch_normalization.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/batch_normalization.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/cast.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/cast.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/cast.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/cast.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/cast.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/cast.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/constant.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/constant.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/constant.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/constant.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/constant.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/constant.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv2d.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv2d.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv2d.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv2d.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv2d.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv2d.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/conv_transpose2d.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_binary.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_binary.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_binary.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_binary.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_binary.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_binary.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_logical.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_logical.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_logical.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_logical.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_logical.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_logical.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_unary.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_unary.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_unary.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_unary.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_unary.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elementwise_unary.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elu.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elu.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elu.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elu.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elu.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/elu.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/expand.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/expand.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/expand.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/expand.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/expand.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/expand.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gather.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gather.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gather.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gather.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gather.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gather.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gemm.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gemm.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gemm.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gemm.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gemm.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/gemm.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/hard_sigmoid.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/instance_normalization.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/instance_normalization.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/instance_normalization.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/instance_normalization.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/instance_normalization.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/instance_normalization.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/layer_normalization.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/layer_normalization.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/layer_normalization.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/layer_normalization.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/layer_normalization.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/layer_normalization.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/linear.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/linear.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/linear.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/linear.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/linear.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/linear.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/matmul.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/matmul.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/matmul.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/matmul.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/matmul.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/matmul.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pad.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pad.https.any-expected.txt
new file mode 100644
index 0000000..4589623
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pad.https.any-expected.txt
@@ -0,0 +1,25 @@
+This is a testharness.js-based test.
+[FAIL] pad float32 1D constant tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 1D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 2D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 3D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 4D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 5D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 2D tensor explicit options.mode='constant'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 2D tensor options.value default constant mode
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 4D tensor options.mode='edge'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 4D tensor options.mode='reflection'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 4D tensor options.mode='symmetric'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pad.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pad.https.any.worker-expected.txt
new file mode 100644
index 0000000..4589623
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pad.https.any.worker-expected.txt
@@ -0,0 +1,25 @@
+This is a testharness.js-based test.
+[FAIL] pad float32 1D constant tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 1D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 2D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 3D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 4D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 5D tensor default options
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 2D tensor explicit options.mode='constant'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 2D tensor options.value default constant mode
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 4D tensor options.mode='edge'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 4D tensor options.mode='reflection'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] pad float32 4D tensor options.mode='symmetric'
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pooling.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pooling.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pooling.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pooling.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pooling.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/pooling.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/prelu.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/prelu.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/prelu.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/prelu.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/prelu.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/prelu.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/reduction.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/reduction.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/reduction.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/reduction.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/reduction.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/reduction.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softmax.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softmax.https.any-expected.txt
new file mode 100644
index 0000000..56f902f
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softmax.https.any-expected.txt
@@ -0,0 +1,9 @@
+This is a testharness.js-based test.
+[FAIL] softmax float32 2D constant tensor all positive
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] softmax float32 2D tensor all positive
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] softmax float32 2D tensor all negative
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softmax.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softmax.https.any.worker-expected.txt
new file mode 100644
index 0000000..56f902f
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softmax.https.any.worker-expected.txt
@@ -0,0 +1,9 @@
+This is a testharness.js-based test.
+[FAIL] softmax float32 2D constant tensor all positive
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] softmax float32 2D tensor all positive
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+[FAIL] softmax float32 2D tensor all negative
+  promise_test: Unhandled rejection with value: object "NotSupportedError: Not implemented"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softplus.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softplus.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softplus.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softplus.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softplus.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softplus.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softsign.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softsign.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softsign.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softsign.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softsign.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/softsign.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/triangular.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/triangular.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/triangular.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/triangular.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/triangular.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/triangular.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/where.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/where.https.any-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/where.https.any-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/where.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/where.https.any.worker-expected.txt
new file mode 100644
index 0000000..5b37deb
--- /dev/null
+++ b/third_party/blink/web_tests/platform/win11-arm64/external/wpt/webnn/conformance_tests/where.https.any.worker-expected.txt
@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+All subtests passed and are omitted for brevity.
+See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Text-Test-Baselines for details.
+Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any-expected.txt
rename to third_party/blink/web_tests/platform/win11-arm64/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any.worker-expected.txt b/third_party/blink/web_tests/platform/win11-arm64/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/pooling.https.any.worker-expected.txt
rename to third_party/blink/web_tests/platform/win11-arm64/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/smooth-scroll-in-load-event-expected.txt b/third_party/blink/web_tests/virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/smooth-scroll-in-load-event-expected.txt
new file mode 100644
index 0000000..2709251
--- /dev/null
+++ b/third_party/blink/web_tests/virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/smooth-scroll-in-load-event-expected.txt
@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+[FAIL] Smooth scroll in load event handler
+  assert_equals: Final value of scrollLeft expected 800 but got 0
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/cast.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/cast.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/cast.https.any-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/cast.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/cast.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/cast.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/cast.https.any.worker-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/cast.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/constant.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/constant.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/constant.https.any-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/constant.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/constant.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/constant.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/constant.https.any.worker-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/constant.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv2d.https.any.worker-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv2d.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/conv_transpose2d.https.any.worker-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/conv_transpose2d.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elu.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elu.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elu.https.any-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elu.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elu.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elu.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/elu.https.any.worker-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/elu.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/matmul.https.any.worker-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/matmul.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any-expected.txt
new file mode 100644
index 0000000..4ca0793
--- /dev/null
+++ b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any-expected.txt
@@ -0,0 +1,11 @@
+This is a testharness.js-based test.
+[FAIL] averagePool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: DirectML: Dilations are not supported for average pooling operator."
+[FAIL] l2Pool2d float32 4D tensor options.dilations
+  assert_true: assert_array_approx_equals_ulp: test l2Pool2d float32 actual 194.45481872558594 should be close enough to expected 189.47933959960938 by the acceptable 11 ULP distance, but they have 326073 ULP distance expected true got false
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
+  assert_true: assert_array_approx_equals_ulp: test l2Pool2d float32 actual 90.6768569946289 should be close enough to expected 8222.29296875 by the acceptable 11 ULP distance, but they have 55254687 ULP distance expected true got false
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  assert_true: assert_array_approx_equals_ulp: test l2Pool2d float32 actual 90.6768569946289 should be close enough to expected 8222.29296875 by the acceptable 11 ULP distance, but they have 55254687 ULP distance expected true got false
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker-expected.txt
new file mode 100644
index 0000000..4ca0793
--- /dev/null
+++ b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/pooling.https.any.worker-expected.txt
@@ -0,0 +1,11 @@
+This is a testharness.js-based test.
+[FAIL] averagePool2d float32 4D tensor options.dilations
+  promise_test: Unhandled rejection with value: object "NotSupportedError: DirectML: Dilations are not supported for average pooling operator."
+[FAIL] l2Pool2d float32 4D tensor options.dilations
+  assert_true: assert_array_approx_equals_ulp: test l2Pool2d float32 actual 194.45481872558594 should be close enough to expected 189.47933959960938 by the acceptable 11 ULP distance, but they have 326073 ULP distance expected true got false
+[FAIL] l2Pool2d float32 4D tensor options.roundingType=ceil
+  assert_true: assert_array_approx_equals_ulp: test l2Pool2d float32 actual 90.6768569946289 should be close enough to expected 8222.29296875 by the acceptable 11 ULP distance, but they have 55254687 ULP distance expected true got false
+[FAIL] l2Pool2d float32 4D tensor options.outputSizes ignores options.roundingType=floor
+  assert_true: assert_array_approx_equals_ulp: test l2Pool2d float32 actual 90.6768569946289 should be close enough to expected 8222.29296875 by the acceptable 11 ULP distance, but they have 55254687 ULP distance expected true got false
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softplus.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softplus.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softplus.https.any-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softplus.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softplus.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softplus.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/softplus.https.any.worker-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/softplus.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/squeeze.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/squeeze.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/squeeze.https.any-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/squeeze.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/squeeze.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/squeeze.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/squeeze.https.any.worker-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/squeeze.https.any.worker-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/triangular.https.any-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/triangular.https.any-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/triangular.https.any-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/triangular.https.any-expected.txt
diff --git a/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/triangular.https.any.worker-expected.txt b/third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/triangular.https.any.worker-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/gpu/triangular.https.any.worker-expected.txt
rename to third_party/blink/web_tests/virtual/webnn-service-enabled/external/wpt/webnn/conformance_tests/gpu/triangular.https.any.worker-expected.txt
diff --git a/third_party/catapult b/third_party/catapult
index 43f9843..2ee42b4 160000
--- a/third_party/catapult
+++ b/third_party/catapult
@@ -1 +1 @@
-Subproject commit 43f9843685a94edea50b66b2ec1a41874f6cfd9f
+Subproject commit 2ee42b4fee621515571f90e0aac3098caad8e712
diff --git a/third_party/depot_tools b/third_party/depot_tools
index 50de666..1ac3eb7 160000
--- a/third_party/depot_tools
+++ b/third_party/depot_tools
@@ -1 +1 @@
-Subproject commit 50de666ba40a4808daf9791fece3d8a43228a1de
+Subproject commit 1ac3eb7b9844751478c7bdae4614f4d1e8b9b0f8
diff --git a/third_party/libavif/src b/third_party/libavif/src
index e88a753..cdb1c3df 160000
--- a/third_party/libavif/src
+++ b/third_party/libavif/src
@@ -1 +1 @@
-Subproject commit e88a7535f890c710768cea89b68a1c092da32506
+Subproject commit cdb1c3df9f3e02b2bbe2686474440a081ebb9b6a
diff --git a/third_party/rust/chromium_crates_io/Cargo.lock b/third_party/rust/chromium_crates_io/Cargo.lock
index a4f288d..8cd8656 100644
--- a/third_party/rust/chromium_crates_io/Cargo.lock
+++ b/third_party/rust/chromium_crates_io/Cargo.lock
@@ -42,11 +42,8 @@
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc",
-]
 
 [[package]]
 name = "cfg-if"
diff --git a/third_party/rust/chromium_crates_io/supply-chain/config.toml b/third_party/rust/chromium_crates_io/supply-chain/config.toml
index 97384c4..d9d4688 100644
--- a/third_party/rust/chromium_crates_io/supply-chain/config.toml
+++ b/third_party/rust/chromium_crates_io/supply-chain/config.toml
@@ -73,7 +73,7 @@
 [policy."bytes:1.5.0"]
 criteria = ["does-not-implement-crypto", "safe-to-run"]
 
-[policy."cc:1.0.83"]
+[policy."cc:1.0.88"]
 criteria = []
 
 [policy."cfg-if:1.0.0"]
diff --git a/third_party/rust/chromium_crates_io/vendor/cc-1.0.83/Cargo.toml b/third_party/rust/chromium_crates_io/vendor/cc-1.0.83/Cargo.toml
deleted file mode 100644
index 3a54d06..0000000
--- a/third_party/rust/chromium_crates_io/vendor/cc-1.0.83/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2023 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# @generated from third_party/rust/chromium_crates_io/removed_Cargo.toml
-# by tools/crates/gnrt. Do not edit!
-
-# This is an empty crate that has replaced the 'cc' crate, since
-# it was listed in `resolve.remove_crates` in gnrt_config.toml.
-
-[package]
-name = "cc"
-version = "1.0.83"
-
-[features]
-"jobserver" = []
-"parallel" = []
-
-[dependencies.libc]
-version = "*"
-default_features = false
-features = []
diff --git a/third_party/rust/chromium_crates_io/vendor/cc-1.0.83/.cargo-checksum.json b/third_party/rust/chromium_crates_io/vendor/cc-1.0.88/.cargo-checksum.json
similarity index 100%
rename from third_party/rust/chromium_crates_io/vendor/cc-1.0.83/.cargo-checksum.json
rename to third_party/rust/chromium_crates_io/vendor/cc-1.0.88/.cargo-checksum.json
diff --git a/third_party/rust/chromium_crates_io/vendor/cc-1.0.88/Cargo.toml b/third_party/rust/chromium_crates_io/vendor/cc-1.0.88/Cargo.toml
new file mode 100644
index 0000000..4c04a6a
--- /dev/null
+++ b/third_party/rust/chromium_crates_io/vendor/cc-1.0.88/Cargo.toml
@@ -0,0 +1,18 @@
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# @generated from third_party/rust/chromium_crates_io/removed_Cargo.toml
+# by tools/crates/gnrt. Do not edit!
+
+# This is an empty crate that has replaced the 'cc' crate, since
+# it was listed in `resolve.remove_crates` in gnrt_config.toml.
+
+[package]
+name = "cc"
+version = "1.0.88"
+
+[features]
+"libc" = []
+"parallel" = []
+
diff --git a/third_party/rust/chromium_crates_io/vendor/cc-1.0.83/src/lib.rs b/third_party/rust/chromium_crates_io/vendor/cc-1.0.88/src/lib.rs
similarity index 100%
rename from third_party/rust/chromium_crates_io/vendor/cc-1.0.83/src/lib.rs
rename to third_party/rust/chromium_crates_io/vendor/cc-1.0.88/src/lib.rs
diff --git a/third_party/skia b/third_party/skia
index e3c3a52..ef2511b 160000
--- a/third_party/skia
+++ b/third_party/skia
@@ -1 +1 @@
-Subproject commit e3c3a52730f0994f6b3e81d87ad0f0d4aab38bf8
+Subproject commit ef2511b0a6f21b4bb43414ac0571d755791ae22a
diff --git a/third_party/webrtc b/third_party/webrtc
index 3afa1b2..c935bb2 160000
--- a/third_party/webrtc
+++ b/third_party/webrtc
@@ -1 +1 @@
-Subproject commit 3afa1b2ce8295e11d4f18b52050c01434772fb26
+Subproject commit c935bb2141e2e616e1f9e1df4568d976ad1828c0
diff --git a/tools/codeql/OWNERS b/tools/codeql/OWNERS
index 859c2c6..5dc4bf0 100644
--- a/tools/codeql/OWNERS
+++ b/tools/codeql/OWNERS
@@ -1 +1,2 @@
 dcheng@chromium.org
+flowerhack@google.com
diff --git a/tools/metrics/histograms/metadata/apps/histograms.xml b/tools/metrics/histograms/metadata/apps/histograms.xml
index ee4a44e6..d2fadfa 100644
--- a/tools/metrics/histograms/metadata/apps/histograms.xml
+++ b/tools/metrics/histograms/metadata/apps/histograms.xml
@@ -651,7 +651,7 @@
 </histogram>
 
 <histogram name="Apps.AppList.GameResult.IconLoadStatus" enum="DiscoveryError"
-    expires_after="2024-02-28">
+    expires_after="2025-02-28">
   <owner>chenjih@chromium.org</owner>
   <owner>dgrebenyuk@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/metadata/file/histograms.xml b/tools/metrics/histograms/metadata/file/histograms.xml
index e30d9d9..8d6dbd9 100644
--- a/tools/metrics/histograms/metadata/file/histograms.xml
+++ b/tools/metrics/histograms/metadata/file/histograms.xml
@@ -54,6 +54,12 @@
                365"/>
 </variants>
 
+<variants name="FilesAppMode">
+  <variant name="FilePicker"/>
+  <variant name="Other"/>
+  <variant name="Standalone"/>
+</variants>
+
 <variants name="GraphApiGetDeltaCallType">
   <variant name="GetDeltaIncremental" summary="incremental delta HTTP call"/>
   <variant name="GetDeltaInitial" summary="initial delta HTTP call"/>
@@ -1639,6 +1645,19 @@
   </summary>
 </histogram>
 
+<histogram name="FileBrowser.ViewingVolumeType.{FilesAppMode}"
+    enum="FileManagerVolumeType" expires_after="2025-06-30">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
+  <summary>
+    Chrome OS Files app: The volume type where the file lives at the time that
+    the user opened the file. One record per file opened. NOTE: User might have
+    navigated to the file via different UI Surfaces, see the ViewingSurfaceType
+    metric for those.
+  </summary>
+  <token key="FilesAppMode" variants="FilesAppMode"/>
+</histogram>
+
 <histogram name="FileBrowser.VolumeType" enum="FileManagerVolumeType"
     expires_after="2024-06-30">
   <owner>simmonsjosh@google.com</owner>
diff --git a/tools/traffic_annotation/summary/annotations.xml b/tools/traffic_annotation/summary/annotations.xml
index 5c916d1..aa1493b6 100644
--- a/tools/traffic_annotation/summary/annotations.xml
+++ b/tools/traffic_annotation/summary/annotations.xml
@@ -213,8 +213,8 @@
  <item id="signed_in_profile_avatar" added_in_milestone="62" content_hash_code="064a36f4" os_list="linux,windows,chromeos,android" file_path="chrome/browser/profiles/profile_downloader.cc" />
  <item id="socket_bio_adapter" added_in_milestone="66" content_hash_code="014a4058" os_list="linux,windows,chromeos,android" file_path="net/socket/socket_bio_adapter.cc" />
  <item id="spdy_session_control" added_in_milestone="66" content_hash_code="01c6f3f0" os_list="linux,windows,chromeos,android" file_path="net/spdy/spdy_session.cc" />
- <item id="speech_recognition_downstream" added_in_milestone="62" content_hash_code="07323e31" os_list="linux,windows,chromeos" file_path="content/browser/speech/speech_recognition_engine.cc" />
- <item id="speech_recognition_upstream" added_in_milestone="62" content_hash_code="0075966b" os_list="linux,windows,chromeos" file_path="content/browser/speech/speech_recognition_engine.cc" />
+ <item id="speech_recognition_downstream" added_in_milestone="123" content_hash_code="07a72205" os_list="linux,windows,chromeos" file_path="content/browser/speech/network_speech_recognition_engine_impl.cc" />
+ <item id="speech_recognition_upstream" added_in_milestone="123" content_hash_code="0798290a" os_list="linux,windows,chromeos" file_path="content/browser/speech/network_speech_recognition_engine_impl.cc" />
  <item id="spellcheck_hunspell_dictionary" added_in_milestone="62" content_hash_code="02b8bb18" os_list="linux,windows,chromeos,android" file_path="chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc" />
  <item id="spellcheck_lookup" added_in_milestone="62" content_hash_code="072d1525" os_list="linux,windows,chromeos" file_path="components/spellcheck/browser/spelling_service_client.cc" />
  <item id="ssl_hmac_channel_authenticator" added_in_milestone="66" content_hash_code="0695685d" os_list="linux,windows,chromeos,android" file_path="remoting/protocol/ssl_hmac_channel_authenticator.cc" />
diff --git a/tools/utr/builders.py b/tools/utr/builders.py
index e7043d6..d20d511 100644
--- a/tools/utr/builders.py
+++ b/tools/utr/builders.py
@@ -22,7 +22,8 @@
     builder_name: Builder name of the builder
 
   Returns:
-    Dict of the builder's input props, or None if the props weren't found
+    Tuple of (Dict of the builder's input props, Swarming server the builder
+      runs on). Both elements will be None if the builder wasn't found.
   """
   # TODO(crbug.com/41492688): Allow bucket_name to be optional?
   possible_matches = []
@@ -42,16 +43,20 @@
 
   if not possible_matches:
     logging.error('No prop file found for %s', builder_name)
-    return None
+    return None, None
   elif len(possible_matches) > 1:
     logging.error('Found multiple prop files for builder %s:', builder_name)
     for m in possible_matches:
       logging.error(m)
-    return None
+    return None, None
 
   prop_file = possible_matches[0]
   logging.debug('Found prop file %s', prop_file)
   with open(possible_matches[0]) as f:
     props = json.load(f)
 
-  return props
+  # TODO(crbug.com/41492688): Support src-internal configs too. Fow now, assume
+  # chromium builders correlate to "chromium-swarm".
+  swarming_server = 'chromium-swarm'
+
+  return props, swarming_server
diff --git a/tools/utr/recipe.py b/tools/utr/recipe.py
index 34c412e..04141a4 100644
--- a/tools/utr/recipe.py
+++ b/tools/utr/recipe.py
@@ -5,6 +5,7 @@
 
 import json
 import logging
+import os
 import pathlib
 import subprocess
 import tempfile
@@ -28,6 +29,7 @@
                builder_props,
                bucket,
                builder,
+               swarming_server,
                tests,
                skip_compile,
                skip_test,
@@ -39,6 +41,7 @@
       builder_props: Dict containing the props for the builder to run as.
       bucket: Bucket name of the builder to run as.
       builder: Builder name of the builder to run as.
+      swarming_server: Swarming server the builder runs on.
       tests: List of tests to run.
       skip_compile: If True, the UTR will only run the tests.
       skip_test: If True, the UTR will only compile.
@@ -46,6 +49,7 @@
           default otherwise if needed.
     """
     self._recipes_py = bundle_root_path.joinpath('recipes')
+    self._swarming_server = swarming_server
     assert self._recipes_py.exists()
 
     # Add UTR recipe props. Its schema is located at:
@@ -96,7 +100,11 @@
           '-',  # '-' means read from stdin
           self.UTR_RECIPE_NAME,
       ]
-      p = subprocess.Popen(cmd, stdin=subprocess.PIPE, text=True)
+      env = os.environ.copy()
+      # This env var is read by both the cas and swarming recipe modules to
+      # determine where to upload/run things.
+      env['SWARMING_SERVER'] = f'https://{self._swarming_server}.appspot.com'
+      p = subprocess.Popen(cmd, stdin=subprocess.PIPE, env=env, text=True)
       p.communicate(input=json.dumps(self._input_props))
 
       # Try to pull out the summary markdown from the recipe run.
diff --git a/tools/utr/run.py b/tools/utr/run.py
index 11020bb..b7629c92 100755
--- a/tools/utr/run.py
+++ b/tools/utr/run.py
@@ -85,7 +85,8 @@
   logging.basicConfig(level=logging.DEBUG if args.verbose else logging.WARN)
 
   bundle_root = cipd.fetch_recipe_bundle(args.verbose)
-  builder_props = builders.find_builder_props(args.bucket, args.builder)
+  builder_props, swarming_server = builders.find_builder_props(
+      args.bucket, args.builder)
   if not builder_props:
     return 1
 
@@ -96,6 +97,7 @@
       builder_props,
       args.bucket,
       args.builder,
+      swarming_server,
       args.test,
       skip_compile,
       skip_test,
diff --git a/ui/compositor/callback_layer_animation_observer_unittest.cc b/ui/compositor/callback_layer_animation_observer_unittest.cc
index 08511a2..180bc81d 100644
--- a/ui/compositor/callback_layer_animation_observer_unittest.cc
+++ b/ui/compositor/callback_layer_animation_observer_unittest.cc
@@ -109,14 +109,22 @@
   TestCallbacksThatExplicitlyDeletesObserver& operator=(
       const TestCallbacksThatExplicitlyDeletesObserver&) = delete;
 
-  void set_observer_to_delete_in_animation_started(
-      CallbackLayerAnimationObserver* observer) {
-    observer_to_delete_in_animation_started_ = observer;
+  void set_observer_to_delete_in_animation_ended(
+      std::unique_ptr<CallbackLayerAnimationObserver> observer) {
+    observer_to_delete_in_animation_ended_ = std::move(observer);
   }
 
-  void set_observer_to_delete_in_animation_ended(
-      CallbackLayerAnimationObserver* observer) {
-    observer_to_delete_in_animation_ended_ = observer;
+  void set_observer_to_delete_in_animation_started(
+      std::unique_ptr<CallbackLayerAnimationObserver> observer) {
+    observer_to_delete_in_animation_started_ = std::move(observer);
+  }
+
+  CallbackLayerAnimationObserver* observer_to_delete_in_animation_started() {
+    return observer_to_delete_in_animation_started_.get();
+  }
+
+  CallbackLayerAnimationObserver* observer_to_delete_in_animation_ended() {
+    return observer_to_delete_in_animation_ended_.get();
   }
 
   // TestCallbacks:
@@ -126,12 +134,12 @@
 
  private:
   // The observer to delete, if non-NULL, in AnimationsStarted().
-  raw_ptr<CallbackLayerAnimationObserver, DanglingUntriaged>
-      observer_to_delete_in_animation_started_ = nullptr;
+  std::unique_ptr<CallbackLayerAnimationObserver>
+      observer_to_delete_in_animation_started_;
 
   // The observer to delete, if non-NULL, in AnimationsEnded().
-  raw_ptr<CallbackLayerAnimationObserver, DanglingUntriaged>
-      observer_to_delete_in_animation_ended_ = nullptr;
+  std::unique_ptr<CallbackLayerAnimationObserver>
+      observer_to_delete_in_animation_ended_;
 };
 
 TestCallbacksThatExplicitlyDeletesObserver::
@@ -139,15 +147,13 @@
 
 void TestCallbacksThatExplicitlyDeletesObserver::AnimationsStarted(
     const CallbackLayerAnimationObserver& observer) {
-  if (observer_to_delete_in_animation_started_)
-    delete observer_to_delete_in_animation_started_;
+  observer_to_delete_in_animation_started_.reset();
   TestCallbacks::AnimationsStarted(observer);
 }
 
 bool TestCallbacksThatExplicitlyDeletesObserver::AnimationsEnded(
     const CallbackLayerAnimationObserver& observer) {
-  if (observer_to_delete_in_animation_ended_)
-    delete observer_to_delete_in_animation_ended_;
+  observer_to_delete_in_animation_ended_.reset();
   return TestCallbacks::AnimationsEnded(observer);
 }
 
@@ -419,17 +425,17 @@
 
   bool is_destroyed = false;
 
-  TestCallbackLayerAnimationObserver* observer =
-      new TestCallbackLayerAnimationObserver(
+  std::unique_ptr<TestCallbackLayerAnimationObserver> observer =
+      std::make_unique<TestCallbackLayerAnimationObserver>(
           base::BindRepeating(&TestCallbacks::AnimationsStarted,
                               base::Unretained(&callbacks)),
           base::BindRepeating(&TestCallbacks::AnimationsEnded,
                               base::Unretained(&callbacks)),
           &is_destroyed);
 
-  callbacks.set_observer_to_delete_in_animation_started(observer);
+  callbacks.set_observer_to_delete_in_animation_started(std::move(observer));
 
-  observer->SetActive();
+  callbacks.observer_to_delete_in_animation_started()->SetActive();
 
   EXPECT_TRUE(is_destroyed);
 }
@@ -449,8 +455,8 @@
 
   bool is_destroyed = false;
 
-  TestCallbackLayerAnimationObserver* observer =
-      new TestCallbackLayerAnimationObserver(
+  std::unique_ptr<TestCallbackLayerAnimationObserver> observer =
+      std::make_unique<TestCallbackLayerAnimationObserver>(
           base::BindRepeating(&TestCallbacks::AnimationsStarted,
                               base::Unretained(&callbacks)),
           base::BindRepeating(&TestCallbacks::AnimationsEnded,
@@ -462,9 +468,9 @@
   observer_->OnLayerAnimationStarted(sequence_1);
   observer_->OnLayerAnimationStarted(sequence_2);
 
-  callbacks.set_observer_to_delete_in_animation_started(observer);
+  callbacks.set_observer_to_delete_in_animation_started(std::move(observer));
 
-  observer->SetActive();
+  callbacks.observer_to_delete_in_animation_started()->SetActive();
 
   EXPECT_TRUE(is_destroyed);
 }
@@ -480,17 +486,17 @@
 
   bool is_destroyed = false;
 
-  TestCallbackLayerAnimationObserver* observer =
-      new TestCallbackLayerAnimationObserver(
+  std::unique_ptr<TestCallbackLayerAnimationObserver> observer =
+      std::make_unique<TestCallbackLayerAnimationObserver>(
           base::BindRepeating(&TestCallbacks::AnimationsStarted,
                               base::Unretained(&callbacks)),
           base::BindRepeating(&TestCallbacks::AnimationsEnded,
                               base::Unretained(&callbacks)),
           &is_destroyed);
 
-  callbacks.set_observer_to_delete_in_animation_ended(observer);
+  callbacks.set_observer_to_delete_in_animation_ended(std::move(observer));
 
-  observer->SetActive();
+  callbacks.observer_to_delete_in_animation_ended()->SetActive();
 
   EXPECT_TRUE(is_destroyed);
 }
diff --git a/ui/file_manager/file_manager/common/js/uma.ts b/ui/file_manager/file_manager/common/js/uma.ts
new file mode 100644
index 0000000..be2a6df
--- /dev/null
+++ b/ui/file_manager/file_manager/common/js/uma.ts
@@ -0,0 +1,64 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import type {FileKey} from '../../state/state.js';
+import {DialogType, type State} from '../../state/state.js';
+import {getFileData} from '../../state/store.js';
+
+import {recordEnum} from './metrics.js';
+import {VolumeType} from './shared_types.js';
+
+/**
+ * Keep the order of this in sync with FileManagerVolumeType in
+ * tools/metrics/histograms/enums.xml.
+ */
+export const UMA_VOLUME_TYPES = [
+  VolumeType.DRIVE,
+  VolumeType.DOWNLOADS,
+  VolumeType.REMOVABLE,
+  VolumeType.ARCHIVE,
+  VolumeType.PROVIDED,
+  VolumeType.MTP,
+  VolumeType.MEDIA_VIEW,
+  VolumeType.CROSTINI,
+  VolumeType.ANDROID_FILES,
+  VolumeType.DOCUMENTS_PROVIDER,
+  VolumeType.SMB,
+  VolumeType.SYSTEM_INTERNAL,
+  VolumeType.GUEST_OS,
+];
+
+/**
+ * Records the action of opening a file by the file volume type.
+ */
+export function recordViewingVolumeTypeUma(
+    state: State, fileKey: FileKey): void {
+  const fileData = getFileData(state, fileKey);
+  if (!fileData || !fileData.volumeId) {
+    return;
+  }
+
+  const volumeType = state.volumes[fileData.volumeId!]?.volumeType;
+  if (!volumeType) {
+    return;
+  }
+
+  if (!UMA_VOLUME_TYPES.includes(volumeType)) {
+    console.debug(`Unknown volume type: ${volumeType} for key ${fileKey}`);
+    console.warn(`Unknown volume type: ${volumeType}`);
+    return;
+  }
+
+  recordEnum(
+      appendAppMode(`ViewingVolumeType`, state), volumeType, UMA_VOLUME_TYPES);
+}
+
+function appendAppMode(name: string, state: State) {
+  const dialogType = state.launchParams.dialogType;
+  const appMode =
+      (dialogType === DialogType.SELECT_SAVEAS_FILE || !dialogType) ? 'Other' :
+      dialogType === DialogType.FULL_PAGE ? 'Standalone' :
+                                            'FilePicker';
+  return `${name}.${appMode}`;
+}
diff --git a/ui/file_manager/file_manager/foreground/js/dialog_action_controller.ts b/ui/file_manager/file_manager/foreground/js/dialog_action_controller.ts
index 5b68749..4132b85 100644
--- a/ui/file_manager/file_manager/foreground/js/dialog_action_controller.ts
+++ b/ui/file_manager/file_manager/foreground/js/dialog_action_controller.ts
@@ -9,9 +9,11 @@
 import type {FilesAppDirEntry, FilesAppEntry} from '../../common/js/files_app_entry_types.js';
 import {recordEnum} from '../../common/js/metrics.js';
 import {str} from '../../common/js/translations.js';
+import {recordViewingVolumeTypeUma} from '../../common/js/uma.js';
 import {testSendMessage, UserCanceledError} from '../../common/js/util.js';
 import {AllowedPaths, RootTypesForUMA} from '../../common/js/volume_manager_types.js';
 import {DialogType} from '../../state/state.js';
+import {getStore} from '../../state/store.js';
 
 import type {FileFilter} from './directory_contents.js';
 import type {DirectoryModel} from './directory_model.js';
@@ -49,8 +51,7 @@
    * @param fileFilter File filter model.
    * @param namingController Naming controller.
    * @param fileSelectionHandler Initial file selection.
-   * @param launchParam Whether the dialog should return local
-   *     path or not.
+   * @param launchParam Whether the dialog should return local path or not.
    */
   constructor(
       private dialogType_: DialogType, private dialogFooter_: DialogFooter,
@@ -253,6 +254,12 @@
         this.dialogType_ === DialogType.SELECT_OPEN_MULTI_FILE) {
       recordEnum('OpenFiles.RootType', currentRootType, RootTypesForUMA);
     }
+
+    const state = getStore().getState();
+    for (const url of selection.urls) {
+      recordViewingVolumeTypeUma(state, url);
+    }
+
     if (selection.multiple) {
       chrome.fileManagerPrivate.selectFiles(
           selection.urls, this.allowedPaths_ === AllowedPaths.NATIVE_PATH,
diff --git a/ui/file_manager/file_manager/foreground/js/file_tasks.ts b/ui/file_manager/file_manager/foreground/js/file_tasks.ts
index 9864899..e1f366a 100644
--- a/ui/file_manager/file_manager/foreground/js/file_tasks.ts
+++ b/ui/file_manager/file_manager/foreground/js/file_tasks.ts
@@ -17,6 +17,7 @@
 import {recordEnum, recordTime} from '../../common/js/metrics.js';
 import {ProgressCenterItem, ProgressItemState, ProgressItemType} from '../../common/js/progress_center_common.js';
 import {bytesToString, str, strf} from '../../common/js/translations.js';
+import {recordViewingVolumeTypeUma} from '../../common/js/uma.js';
 import {LEGACY_FILES_EXTENSION_ID} from '../../common/js/url_constants.js';
 import {descriptorEqual, extractFilePath, isTeleported, makeTaskID, splitExtension} from '../../common/js/util.js';
 import {RootType, RootTypesForUMA, VolumeError, VolumeType} from '../../common/js/volume_manager_types.js';
@@ -200,10 +201,12 @@
   /** Records trial of opening file grouped by extensions.  */
   private static recordViewingFileTypeUma_(
       volumeManager: VolumeManager, entries: Array<Entry|FilesAppEntry>) {
+    const state = getStore().getState();
     for (const entry of entries) {
       FileTasks.recordEnumWithOnlineAndOffline_(
           volumeManager, 'ViewingFileType', FileTasks.getViewFileType(entry),
           UMA_INDEX_KNOWN_EXTENSIONS as string[]);
+      recordViewingVolumeTypeUma(state, entry.toURL());
     }
   }
 
@@ -577,12 +580,11 @@
       for (const entry of this.entries_) {
         recordEnum(
             'DriveOfflineOpen.Unavailable', FileTasks.getViewFileType(entry),
-            UMA_INDEX_KNOWN_EXTENSIONS as string[]);
+            UMA_INDEX_KNOWN_EXTENSIONS);
         if (isBulkPinningEnabled) {
           recordEnum(
               'GoogleDrive.BulkPinning.OfflineOpen',
-              FileTasks.getViewFileType(entry),
-              UMA_INDEX_KNOWN_EXTENSIONS as string[]);
+              FileTasks.getViewFileType(entry), UMA_INDEX_KNOWN_EXTENSIONS);
         }
       }
       return Promise.reject('drive is offline');
diff --git a/ui/file_manager/file_manager/foreground/js/quick_view_uma.ts b/ui/file_manager/file_manager/foreground/js/quick_view_uma.ts
index 3d1e0185..b299734 100644
--- a/ui/file_manager/file_manager/foreground/js/quick_view_uma.ts
+++ b/ui/file_manager/file_manager/foreground/js/quick_view_uma.ts
@@ -6,7 +6,7 @@
 import {getExtension} from '../../common/js/file_type.js';
 import type {FilesAppEntry} from '../../common/js/files_app_entry_types.js';
 import {recordEnum} from '../../common/js/metrics.js';
-import {VolumeType} from '../../common/js/volume_manager_types.js';
+import {UMA_VOLUME_TYPES} from '../../common/js/uma.js';
 import {DialogType} from '../../state/state.js';
 
 import {UMA_INDEX_KNOWN_EXTENSIONS} from './uma_enums.gen.js';
@@ -50,8 +50,8 @@
     const volumeInfo = this.volumeManager_.getVolumeInfo(entry);
     const volumeType = volumeInfo && volumeInfo.volumeType;
     if (volumeType) {
-      if (QUICK_VIEW_VOLUME_TYPES.includes(volumeType)) {
-        recordEnum('QuickView.VolumeType', volumeType, QUICK_VIEW_VOLUME_TYPES);
+      if (UMA_VOLUME_TYPES.includes(volumeType)) {
+        recordEnum('QuickView.VolumeType', volumeType, UMA_VOLUME_TYPES);
       } else {
         console.warn('Unknown volume type: ' + volumeType);
       }
@@ -88,23 +88,3 @@
   WayToOpen.SPACE_KEY,
   WayToOpen.SELECTION_MENU,
 ];
-
-/**
- * Keep the order of this in sync with FileManagerVolumeType in
- * tools/metrics/histograms/enums.xml.
- */
-const QUICK_VIEW_VOLUME_TYPES = [
-  VolumeType.DRIVE,
-  VolumeType.DOWNLOADS,
-  VolumeType.REMOVABLE,
-  VolumeType.ARCHIVE,
-  VolumeType.PROVIDED,
-  VolumeType.MTP,
-  VolumeType.MEDIA_VIEW,
-  VolumeType.CROSTINI,
-  VolumeType.ANDROID_FILES,
-  VolumeType.DOCUMENTS_PROVIDER,
-  VolumeType.SMB,
-  VolumeType.SYSTEM_INTERNAL,
-  VolumeType.GUEST_OS,
-];
diff --git a/ui/file_manager/file_names.gni b/ui/file_manager/file_names.gni
index 2a235dd8..3c2f80b 100644
--- a/ui/file_manager/file_names.gni
+++ b/ui/file_manager/file_names.gni
@@ -59,6 +59,7 @@
   "file_manager/common/js/trash.ts",
   "file_manager/common/js/trusted_script_url_policy_util.ts",
   "file_manager/common/js/tslib_shim.ts",
+  "file_manager/common/js/uma.ts",
   "file_manager/common/js/url_constants.ts",
   "file_manager/common/js/util.ts",
   "file_manager/common/js/volume_manager_types.ts",
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index a64df51a..7c81ce5 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -1092,6 +1092,8 @@
     "test/views_test_helper.h",
     "test/views_test_utils.cc",
     "test/views_test_utils.h",
+    "test/widget_activation_waiter.cc",
+    "test/widget_activation_waiter.h",
     "test/widget_animation_waiter.cc",
     "test/widget_animation_waiter.h",
     "test/widget_test.cc",
diff --git a/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc b/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc
index a03ea5aa..8e47f54 100644
--- a/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc
+++ b/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc
@@ -21,6 +21,7 @@
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
 
@@ -46,9 +47,8 @@
     textfield_->SetBounds(0, 0, 200, 20);
     textfield_->SetText(u"Some text.");
     widget_->GetRootView()->AddChildView(textfield_.get());
-    test::WidgetActivationWaiter waiter(widget_, true);
     widget_->Show();
-    waiter.Wait();
+    test::WaitForWidgetActive(widget_, true);
     textfield_->RequestFocus();
     ASSERT_TRUE(widget_->IsActive());
     ASSERT_TRUE(textfield_->HasFocus());
@@ -351,11 +351,10 @@
     LabelButton button{Button::PressedCallback(), std::u16string()};
     button.SetBounds(500, 0, 200, 20);
     widget_->GetRootView()->AddChildView(&button);
-    test::WidgetActivationWaiter waiter(widget_, true);
     WinAccessibilityCaretEventMonitor monitor(EVENT_OBJECT_SHOW,
                                               EVENT_OBJECT_LOCATIONCHANGE);
     widget_->Show();
-    waiter.Wait();
+    test::WaitForWidgetActive(widget_, true);
     button.SetFocusBehavior(View::FocusBehavior::ALWAYS);
     button.RequestFocus();
     monitor.WaitForNextEvent(&event, &role, &state);
diff --git a/ui/views/bubble/bubble_dialog_delegate_view_interactive_uitest_aura.cc b/ui/views/bubble/bubble_dialog_delegate_view_interactive_uitest_aura.cc
index 971a8c2..22f8df1e 100644
--- a/ui/views/bubble/bubble_dialog_delegate_view_interactive_uitest_aura.cc
+++ b/ui/views/bubble/bubble_dialog_delegate_view_interactive_uitest_aura.cc
@@ -11,6 +11,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
 #include "ui/views/buildflags.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
@@ -68,9 +69,8 @@
   View* anchor_view = anchor_widget->GetContentsView();
   anchor_widget->LayoutRootViewIfNecessary();
 
-  test::WidgetActivationWaiter waiter(anchor_widget.get(), true);
   anchor_widget->Show();
-  waiter.Wait();
+  test::WaitForWidgetActive(anchor_widget.get(), true);
   EXPECT_TRUE(anchor_widget->IsActive());
   EXPECT_TRUE(anchor_widget->GetNativeWindow()->HasFocus());
 
diff --git a/ui/views/interaction/interaction_test_util_views.cc b/ui/views/interaction/interaction_test_util_views.cc
index 7aceee54..1dbd2f3d 100644
--- a/ui/views/interaction/interaction_test_util_views.cc
+++ b/ui/views/interaction/interaction_test_util_views.cc
@@ -38,6 +38,7 @@
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/interaction/element_tracker_views.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/view.h"
 #include "ui/views/view_observer.h"
@@ -671,9 +672,8 @@
   }
 #endif  // HANDLE_WAYLAND_FAILURE
 
-  views::test::WidgetActivationWaiter waiter(widget, true);
   widget->Activate();
-  waiter.Wait();
+  views::test::WaitForWidgetActive(widget, true);
   return ui::test::ActionResult::kSucceeded;
 }
 
diff --git a/ui/views/test/widget_activation_waiter.cc b/ui/views/test/widget_activation_waiter.cc
new file mode 100644
index 0000000..2c32f6d
--- /dev/null
+++ b/ui/views/test/widget_activation_waiter.cc
@@ -0,0 +1,84 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/views/test/widget_activation_waiter.h"
+
+#include "base/run_loop.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_observer.h"
+
+#if BUILDFLAG(IS_MAC)
+#include "base/test/scoped_run_loop_timeout.h"
+#include "base/test/test_timeouts.h"
+#endif
+
+namespace views {
+
+namespace test {
+
+namespace {
+
+// Use in tests to wait until a Widget's activation change to a particular
+// value. To use create and call Wait().
+class WidgetActivationWaiter : public WidgetObserver {
+ public:
+  WidgetActivationWaiter(Widget* widget, bool active) : active_(active) {
+    if (active == widget->native_widget_active()) {
+      observed_ = true;
+      return;
+    }
+    widget_observation_.Observe(widget);
+  }
+
+  WidgetActivationWaiter(const WidgetActivationWaiter&) = delete;
+  WidgetActivationWaiter& operator=(const WidgetActivationWaiter&) = delete;
+
+  ~WidgetActivationWaiter() override = default;
+
+  // Returns when the active status matches that supplied to the constructor. If
+  // the active status does not match that of the constructor a RunLoop is used
+  // until the active status matches, otherwise this returns immediately.
+  void Wait() {
+    if (!observed_) {
+#if BUILDFLAG(IS_MAC)
+      // Some tests waiting on widget creation + activation are flaky due to
+      // timeout. crbug.com/1327590.
+      const base::test::ScopedRunLoopTimeout increased_run_timeout(
+          FROM_HERE, TestTimeouts::action_max_timeout());
+#endif
+      run_loop_.Run();
+    }
+  }
+
+ private:
+  // views::WidgetObserver override:
+  void OnWidgetActivationChanged(Widget* widget, bool active) override {
+    if (active_ != active) {
+      return;
+    }
+
+    observed_ = true;
+    widget_observation_.Reset();
+    if (run_loop_.running()) {
+      run_loop_.Quit();
+    }
+  }
+
+  bool observed_ = false;
+  bool active_;
+
+  base::RunLoop run_loop_;
+  base::ScopedObservation<Widget, WidgetObserver> widget_observation_{this};
+};
+
+}  // namespace
+
+void WaitForWidgetActive(Widget* widget, bool active) {
+  WidgetActivationWaiter waiter(widget, active);
+  waiter.Wait();
+}
+
+}  // namespace test
+
+}  // namespace views
diff --git a/ui/views/test/widget_activation_waiter.h b/ui/views/test/widget_activation_waiter.h
new file mode 100644
index 0000000..a6889bd
--- /dev/null
+++ b/ui/views/test/widget_activation_waiter.h
@@ -0,0 +1,21 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef UI_VIEWS_TEST_WIDGET_ACTIVATION_WAITER_H_
+#define UI_VIEWS_TEST_WIDGET_ACTIVATION_WAITER_H_
+
+namespace views {
+
+class Widget;
+
+namespace test {
+
+// Use in tests to wait until a Widget's activation changes to `active`.
+void WaitForWidgetActive(Widget* widget, bool active);
+
+}  // namespace test
+
+}  // namespace views
+
+#endif  // UI_VIEWS_TEST_WIDGET_ACTIVATION_WAITER_H_
diff --git a/ui/views/test/widget_test.cc b/ui/views/test/widget_test.cc
index d62e941..1b9bb494 100644
--- a/ui/views/test/widget_test.cc
+++ b/ui/views/test/widget_test.cc
@@ -229,40 +229,6 @@
   return view_;
 }
 
-WidgetActivationWaiter::WidgetActivationWaiter(Widget* widget, bool active)
-    : active_(active) {
-  if (active == widget->IsActive()) {
-    observed_ = true;
-    return;
-  }
-  widget_observation_.Observe(widget);
-}
-
-WidgetActivationWaiter::~WidgetActivationWaiter() = default;
-
-void WidgetActivationWaiter::Wait() {
-  if (!observed_) {
-#if BUILDFLAG(IS_MAC)
-    // Some tests waiting on widget creation + activation are flaky due to
-    // timeout. crbug.com/1327590.
-    const base::test::ScopedRunLoopTimeout increased_run_timeout(
-        FROM_HERE, TestTimeouts::action_max_timeout());
-#endif
-    run_loop_.Run();
-  }
-}
-
-void WidgetActivationWaiter::OnWidgetActivationChanged(Widget* widget,
-                                                       bool active) {
-  if (active_ != active)
-    return;
-
-  observed_ = true;
-  widget_observation_.Reset();
-  if (run_loop_.running())
-    run_loop_.Quit();
-}
-
 WidgetDestroyedWaiter::WidgetDestroyedWaiter(Widget* widget) {
   widget_observation_.Observe(widget);
 }
diff --git a/ui/views/test/widget_test.h b/ui/views/test/widget_test.h
index 6e4f2d9..ff46bb3 100644
--- a/ui/views/test/widget_test.h
+++ b/ui/views/test/widget_test.h
@@ -260,33 +260,6 @@
   raw_ptr<View> view_;
 };
 
-// Use in tests to wait until a Widget's activation change to a particular
-// value. To use create and call Wait().
-class WidgetActivationWaiter : public WidgetObserver {
- public:
-  WidgetActivationWaiter(Widget* widget, bool active);
-
-  WidgetActivationWaiter(const WidgetActivationWaiter&) = delete;
-  WidgetActivationWaiter& operator=(const WidgetActivationWaiter&) = delete;
-
-  ~WidgetActivationWaiter() override;
-
-  // Returns when the active status matches that supplied to the constructor. If
-  // the active status does not match that of the constructor a RunLoop is used
-  // until the active status matches, otherwise this returns immediately.
-  void Wait();
-
- private:
-  // views::WidgetObserver override:
-  void OnWidgetActivationChanged(Widget* widget, bool active) override;
-
-  bool observed_ = false;
-  bool active_;
-
-  base::RunLoop run_loop_;
-  base::ScopedObservation<Widget, WidgetObserver> widget_observation_{this};
-};
-
 // Use in tests to wait for a widget to be destroyed.
 class WidgetDestroyedWaiter : public WidgetObserver {
  public:
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_interactive_uitest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_interactive_uitest.cc
index d575b55..ad5c05c 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_interactive_uitest.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_interactive_uitest.cc
@@ -5,6 +5,7 @@
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "ui/views/test/native_widget_factory.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/wm/public/activation_client.h"
 
@@ -57,13 +58,10 @@
 
   const auto show_widget = [&](Widget* target) {
     target->Show();
-    views::test::WidgetActivationWaiter(widget1.get(), target == widget1.get())
-        .Wait();
-    views::test::WidgetActivationWaiter(widget1_child.get(),
-                                        target == widget1_child.get())
-        .Wait();
-    views::test::WidgetActivationWaiter(widget2.get(), target == widget2.get())
-        .Wait();
+    views::test::WaitForWidgetActive(widget1.get(), target == widget1.get());
+    views::test::WaitForWidgetActive(widget1_child.get(),
+                                     target == widget1_child.get());
+    views::test::WaitForWidgetActive(widget2.get(), target == widget2.get());
   };
 
   show_widget(widget1.get());
@@ -131,23 +129,23 @@
   ASSERT_EQ(activation_client, activation_client_child);
 
   widget->Show();
-  views::test::WidgetActivationWaiter(widget.get(), true).Wait();
-  views::test::WidgetActivationWaiter(widget_child.get(), false).Wait();
+  views::test::WaitForWidgetActive(widget.get(), true);
+  views::test::WaitForWidgetActive(widget_child.get(), false);
   EXPECT_TRUE(widget->IsActive());
   EXPECT_FALSE(widget_child->IsActive());
   EXPECT_EQ(activation_client->GetActiveWindow(), widget->GetNativeView());
 
   widget_child->Show();
-  views::test::WidgetActivationWaiter(widget.get(), false).Wait();
-  views::test::WidgetActivationWaiter(widget_child.get(), true).Wait();
+  views::test::WaitForWidgetActive(widget.get(), false);
+  views::test::WaitForWidgetActive(widget_child.get(), true);
   EXPECT_FALSE(widget->IsActive());
   EXPECT_TRUE(widget_child->IsActive());
   EXPECT_EQ(activation_client->GetActiveWindow(),
             widget_child->GetNativeView());
 
   widget_child->Close();
-  views::test::WidgetActivationWaiter(widget.get(), true).Wait();
-  views::test::WidgetActivationWaiter(widget_child.get(), false).Wait();
+  views::test::WaitForWidgetActive(widget.get(), true);
+  views::test::WaitForWidgetActive(widget_child.get(), false);
   EXPECT_TRUE(widget->IsActive());
   EXPECT_FALSE(widget_child->IsActive());
   EXPECT_EQ(activation_client->GetActiveWindow(), widget->GetNativeView());
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc
index ecccb5a..d7b1ab5 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc
@@ -17,6 +17,7 @@
 #include "ui/platform_window/platform_window.h"
 #include "ui/platform_window/wm/wm_move_resize_handler.h"
 #include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/widget_delegate.h"
@@ -571,18 +572,16 @@
   std::unique_ptr<Widget> widget(CreateWidget(gfx::Rect(100, 100, 100, 100)));
 
   {
-    views::test::WidgetActivationWaiter waiter(widget.get(), true);
     widget->Show();
     widget->Activate();
-    waiter.Wait();
+    views::test::WaitForWidgetActive(widget.get(), true);
   }
 
   {
     // Regardless of whether |widget|'s X11 window eventually gets deactivated,
     // |widget|'s "active" state should change.
-    views::test::WidgetActivationWaiter waiter(widget.get(), false);
     widget->Deactivate();
-    waiter.Wait();
+    views::test::WaitForWidgetActive(widget.get(), false);
     EXPECT_FALSE(widget->IsActive());
   }
 
@@ -591,9 +590,8 @@
     // should update the widget's "active" state. Note: Activating a widget
     // whose X11 window is not active does not synchronously update the widget's
     // "active" state.
-    views::test::WidgetActivationWaiter waiter(widget.get(), true);
     widget->Activate();
-    waiter.Wait();
+    views::test::WaitForWidgetActive(widget.get(), true);
     EXPECT_TRUE(widget->IsActive());
   }
 }
@@ -606,15 +604,13 @@
 
   std::unique_ptr<Widget> widget1(CreateWidget(gfx::Rect(100, 100, 100, 100)));
   aura::Window* window1 = widget1->GetNativeWindow();
-  views::test::WidgetActivationWaiter waiter1(widget1.get(), true);
   widget1->Show();
-  waiter1.Wait();
+  views::test::WaitForWidgetActive(widget1.get(), true);
 
   std::unique_ptr<Widget> widget2(CreateWidget(gfx::Rect(200, 100, 100, 100)));
   aura::Window* window2 = widget2->GetNativeWindow();
-  views::test::WidgetActivationWaiter waiter2(widget2.get(), true);
   widget2->Show();
-  waiter2.Wait();
+  views::test::WaitForWidgetActive(widget2.get(), true);
 
   MouseMoveCounterHandler recorder1;
   window1->AddPreTargetHandler(&recorder1);
@@ -694,9 +690,8 @@
   // EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
   //           widget->GetInputMethod()->GetTextInputType());
 
-  views::test::WidgetActivationWaiter waiter(widget.get(), true);
   widget->Activate();
-  waiter.Wait();
+  views::test::WaitForWidgetActive(widget.get(), true);
 
   EXPECT_TRUE(widget->IsActive());
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT,
diff --git a/ui/views/widget/native_widget_aura_interactive_uitest.cc b/ui/views/widget/native_widget_aura_interactive_uitest.cc
index f13483f..47c4780 100644
--- a/ui/views/widget/native_widget_aura_interactive_uitest.cc
+++ b/ui/views/widget/native_widget_aura_interactive_uitest.cc
@@ -7,6 +7,7 @@
 #include "ui/aura/window.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/native_widget_factory.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/focus_controller.h"
@@ -76,9 +77,8 @@
   Textfield* textfield2b = new Textfield;
   widget2->GetRootView()->AddChildView(textfield2b);
 
-  views::test::WidgetActivationWaiter waiter1(widget1, true);
   widget1->Show();
-  waiter1.Wait();
+  views::test::WaitForWidgetActive(widget1, true);
   textfield1->RequestFocus();
   EXPECT_TRUE(textfield1->HasFocus());
   EXPECT_FALSE(textfield2a->HasFocus());
@@ -94,9 +94,8 @@
   // Allow window activation and |widget2| gets activated at this step, focus
   // should be properly restored.
   test_focus_rules->set_can_activate(true);
-  views::test::WidgetActivationWaiter waiter2(widget2, true);
   widget2->Activate();
-  waiter2.Wait();
+  views::test::WaitForWidgetActive(widget2, true);
   EXPECT_TRUE(textfield2a->HasFocus());
   EXPECT_FALSE(textfield2b->HasFocus());
   EXPECT_FALSE(textfield1->HasFocus());
diff --git a/ui/views/widget/native_widget_mac_interactive_uitest.mm b/ui/views/widget/native_widget_mac_interactive_uitest.mm
index 2b124412..8826f165 100644
--- a/ui/views/widget/native_widget_mac_interactive_uitest.mm
+++ b/ui/views/widget/native_widget_mac_interactive_uitest.mm
@@ -15,6 +15,7 @@
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/native_widget_factory.h"
 #include "ui/views/test/test_widget_observer.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget_interactive_uitest_utils.h"
 
@@ -79,9 +80,8 @@
   EXPECT_FALSE(widget->IsActive());
   EXPECT_EQ(0, activation_count_);
   {
-    WidgetActivationWaiter wait_for_first_active(widget, true);
     widget->Show();
-    wait_for_first_active.Wait();
+    WaitForWidgetActive(widget, true);
   }
   EXPECT_TRUE(widget->IsActive());
   EXPECT_TRUE(widget->GetNativeWindow().GetNativeNSWindow().keyWindow);
@@ -93,18 +93,16 @@
   Widget* widget2 = MakeWidget();  // Note: not observed.
   EXPECT_EQ(0, deactivation_count_);
   {
-    WidgetActivationWaiter wait_for_deactivate(widget, false);
     widget2->Show();
-    wait_for_deactivate.Wait();
+    WaitForWidgetActive(widget2, true);
   }
   EXPECT_EQ(1, deactivation_count_);
   EXPECT_FALSE(widget->IsActive());
   EXPECT_EQ(1, activation_count_);
 
   {
-    WidgetActivationWaiter wait_for_external_activate(widget, true);
     [widget->GetNativeWindow().GetNativeNSWindow() makeKeyAndOrderFront:nil];
-    wait_for_external_activate.Wait();
+    WaitForWidgetActive(widget, true);
   }
   EXPECT_TRUE(widget->IsActive());
   EXPECT_EQ(1, deactivation_count_);
@@ -370,9 +368,8 @@
   widget->GetContentsView()->AddChildView(textfield);
   textfield->RequestFocus();
   {
-    WidgetActivationWaiter wait_for_first_active(widget, true);
     widget->Show();
-    wait_for_first_active.Wait();
+    WaitForWidgetActive(widget, true);
   }
   EXPECT_TRUE(widget->GetNativeView().GetNativeNSView().inputContext);
   EXPECT_EQ(widget->GetNativeView().GetNativeNSView().inputContext,
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index d47c52cc..5a0df4d 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -1193,6 +1193,8 @@
   // Returns the current ownership model of the widget.
   InitParams::Ownership ownership() const { return ownership_; }
 
+  bool native_widget_active() const { return native_widget_active_; }
+
  protected:
   // Creates the RootView to be used within this Widget. Subclasses may override
   // to create custom RootViews that do specialized event processing.
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 9a6e827..fcbf186 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -38,6 +38,7 @@
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/test/focus_manager_test.h"
 #include "ui/views/test/native_widget_factory.h"
+#include "ui/views/test/widget_activation_waiter.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "ui/views/widget/root_view.h"
@@ -244,17 +245,15 @@
 // this is just an activation. For other widgets, it means activating and then
 // spinning the run loop until the OS has activated the window.
 void ActivateSync(Widget* widget) {
-  views::test::WidgetActivationWaiter waiter(widget, true);
   widget->Activate();
-  waiter.Wait();
+  views::test::WaitForWidgetActive(widget, true);
 }
 
 // Like for ActivateSync(), wait for a widget to become active, but Show() the
 // widget rather than calling Activate().
 void ShowSync(Widget* widget) {
-  views::test::WidgetActivationWaiter waiter(widget, true);
   widget->Show();
-  waiter.Wait();
+  views::test::WaitForWidgetActive(widget, true);
 }
 
 void DeactivateSync(Widget* widget) {
@@ -271,9 +270,8 @@
   stealer->CloseNow();
   widget->widget_delegate()->SetCanActivate(true);
 #else
-  views::test::WidgetActivationWaiter waiter(widget, false);
   widget->Deactivate();
-  waiter.Wait();
+  views::test::WaitForWidgetActive(widget, false);
 #endif
 }
 
@@ -950,9 +948,8 @@
 #if BUILDFLAG(IS_MAC)
   // Window modal dialogs on Mac are "sheets", which animate to close before
   // activating their parent widget.
-  views::test::WidgetActivationWaiter waiter(top_level_widget.get(), true);
   modal_dialog_widget->Close();
-  waiter.Wait();
+  views::test::WaitForWidgetActive(top_level_widget.get(), true);
 #else
   views::test::WidgetDestroyedWaiter waiter(modal_dialog_widget);
   modal_dialog_widget->Close();
@@ -1123,9 +1120,8 @@
   // TODO(crbug/1217331): This test fails if put under NativeWidgetAuraTest.
   WidgetAutoclosePtr anchor_widget(CreateTopLevelNativeWidget());
 
-  test::WidgetActivationWaiter waiter(anchor_widget.get(), true);
   anchor_widget->Show();
-  waiter.Wait();
+  test::WaitForWidgetActive(anchor_widget.get(), true);
   EXPECT_TRUE(anchor_widget->IsActive());
 #if !BUILDFLAG(IS_MAC)
   EXPECT_TRUE(anchor_widget->GetNativeWindow()->HasFocus());
diff --git a/v8 b/v8
index b5c3d32..ea012d2 160000
--- a/v8
+++ b/v8
@@ -1 +1 @@
-Subproject commit b5c3d32f28d7af9f527a5eddca570c11e14303c9
+Subproject commit ea012d232c66229b2d4f3f2a268aa999d668972b