Fix C++/Python symbols related to "layout test" in blink/renderer

Bug: 843412
Change-Id: I5f5b67cbefe1fa6f591a62cd646b0babacbe4a4f
Reviewed-on: https://chromium-review.googlesource.com/c/1371309Reviewed-by: Rakina Zata Amni <rakina@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615760}

third_party/blink/renderer/core/editing/frame_caret_test.cc

@@ -18,14 +18,13 @@ namespace blink {
 
 class FrameCaretTest : public EditingTestBase {
  public:
-  FrameCaretTest()
-      : was_running_layout_test_(WebTestSupport::IsRunningWebTest()) {
+  FrameCaretTest() : was_running_web_test_(WebTestSupport::IsRunningWebTest()) {
     // The caret blink timer doesn't work if IsRunningWebTest() because
     // LayoutTheme::CaretBlinkInterval() returns 0.
     WebTestSupport::SetIsRunningWebTest(false);
   }
   ~FrameCaretTest() override {
-    WebTestSupport::SetIsRunningWebTest(was_running_layout_test_);
+    WebTestSupport::SetIsRunningWebTest(was_running_web_test_);
   }
 
   static bool ShouldBlinkCaret(const FrameCaret& caret) {
@@ -33,7 +32,7 @@ class FrameCaretTest : public EditingTestBase {
   }
 
  private:
-  const bool was_running_layout_test_;
+  const bool was_running_web_test_;
 };
 
 TEST_F(FrameCaretTest, BlinkAfterTyping) {

third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc

@@ -305,7 +305,7 @@ void CanvasAsyncBlobCreator::ScheduleAsyncBlobCreation(const double& quality) {
   bool use_idle_encoding =
       (mime_type_ != kMimeTypeWebp) &&
       (enforce_idle_encoding_for_test_ ||
-       !RuntimeEnabledFeatures::NoIdleEncodingForLayoutTestsEnabled());
+       !RuntimeEnabledFeatures::NoIdleEncodingForWebTestsEnabled());
 
   if (!use_idle_encoding) {
     if (!IsMainThread()) {

third_party/blink/renderer/modules/bluetooth/testing/clusterfuzz/setup.py

@@ -21,7 +21,7 @@ import sys
 # src path from this file's path.
 SRC_PATH = os.path.join(
     os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir)
-LAYOUT_TESTS_RESOURCES_PATH = os.path.join(
+WEB_TESTS_RESOURCES_PATH = os.path.join(
     SRC_PATH, 'third_party', 'blink', 'web_tests', 'resources')
 WEB_PLATFORM_TESTS_RESOURCES_PATH = os.path.join(
     SRC_PATH, 'third_party', 'blink', 'web_tests', 'external', 'wpt',
@@ -29,8 +29,8 @@ WEB_PLATFORM_TESTS_RESOURCES_PATH = os.path.join(
 COMMON_FUZZER_RESOURCES_PATH = os.path.join(
     SRC_PATH, 'testing', 'clusterfuzz', 'common')
 RESOURCES = [
-    os.path.join(LAYOUT_TESTS_RESOURCES_PATH, 'testharness.js'),
-    os.path.join(LAYOUT_TESTS_RESOURCES_PATH, 'testharnessreport.js'),
+    os.path.join(WEB_TESTS_RESOURCES_PATH, 'testharness.js'),
+    os.path.join(WEB_TESTS_RESOURCES_PATH, 'testharnessreport.js'),
     os.path.join(WEB_PLATFORM_TESTS_RESOURCES_PATH, 'bluetooth-helpers.js'),
     os.path.join(COMMON_FUZZER_RESOURCES_PATH, 'fuzzy_types.py'),
     os.path.join(COMMON_FUZZER_RESOURCES_PATH, 'utils.py'),

third_party/blink/renderer/modules/media_controls/media_controls_orientation_lock_delegate_test.cc

@@ -300,7 +300,7 @@ class MediaControlsOrientationLockAndRotateToFullscreenDelegateTest
   void SetUp() override {
     // Unset this to fix ScreenOrientationControllerImpl::ComputeOrientation.
     // TODO(mlamouri): Refactor to avoid this (crbug.com/726817).
-    was_running_layout_test_ = WebTestSupport::IsRunningWebTest();
+    was_running_web_test_ = WebTestSupport::IsRunningWebTest();
     WebTestSupport::SetIsRunningWebTest(false);
 
     MediaControlsOrientationLockDelegateTest::SetUp();
@@ -317,7 +317,7 @@ class MediaControlsOrientationLockAndRotateToFullscreenDelegateTest
 
   void TearDown() override {
     MediaControlsOrientationLockDelegateTest::TearDown();
-    WebTestSupport::SetIsRunningWebTest(was_running_layout_test_);
+    WebTestSupport::SetIsRunningWebTest(was_running_web_test_);
   }
 
   void SetIsAutoRotateEnabledByUser(bool enabled) {
@@ -426,7 +426,7 @@ class MediaControlsOrientationLockAndRotateToFullscreenDelegateTest
         ->orientation_lock_delegate_->ComputeDeviceOrientation(data);
   }
 
-  bool was_running_layout_test_ = false;
+  bool was_running_web_test_ = false;
   bool natural_orientation_is_portrait_ = true;
 };
 

third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc

@@ -114,7 +114,7 @@ class HarfBuzzShaperTest : public testing::Test {
 class ScopedSubpixelOverride {
  public:
   ScopedSubpixelOverride(bool b) {
-    prev_layout_test_ = WebTestSupport::IsRunningWebTest();
+    prev_web_test_ = WebTestSupport::IsRunningWebTest();
     prev_subpixel_allowed_ =
         WebTestSupport::IsTextSubpixelPositioningAllowedForTest();
     prev_antialias_ = WebTestSupport::IsFontAntialiasingEnabledForTest();
@@ -147,7 +147,7 @@ class ScopedSubpixelOverride {
     WebTestSupport::SetFontAntialiasingEnabledForTest(prev_antialias_);
     WebTestSupport::SetTextSubpixelPositioningAllowedForTest(
         prev_subpixel_allowed_);
-    WebTestSupport::SetIsRunningWebTest(prev_layout_test_);
+    WebTestSupport::SetIsRunningWebTest(prev_web_test_);
 
     // Fonts cached with a different subpixel positioning state are not
     // automatically invalidated and need to be cleared between test
@@ -156,7 +156,7 @@ class ScopedSubpixelOverride {
   }
 
  private:
-  bool prev_layout_test_;
+  bool prev_web_test_;
   bool prev_subpixel_allowed_;
   bool prev_antialias_;
   bool prev_fd_subpixel_;

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -850,7 +850,7 @@
       settable_from_internals: true,
     },
     {
-      name: "NoIdleEncodingForLayoutTests",
+      name: "NoIdleEncodingForWebTests",
       status: "test",
     },
     {

third_party/blink/renderer/platform/web_test_support.cc

@@ -52,17 +52,17 @@ bool FontAntialiasingEnabledForTest() {
   return WebTestSupport::IsFontAntialiasingEnabledForTest();
 }
 
-static bool g_is_running_layout_test = false;
+static bool g_is_running_web_test = false;
 static bool g_is_mock_theme_enabled = false;
 static bool g_is_font_antialiasing_enabled = false;
 static bool g_is_subpixel_positioning_allowed = true;
 
 bool WebTestSupport::IsRunningWebTest() {
-  return g_is_running_layout_test;
+  return g_is_running_web_test;
 }
 
 void WebTestSupport::SetIsRunningWebTest(bool value) {
-  g_is_running_layout_test = value;
+  g_is_running_web_test = value;
 }
 
 bool WebTestSupport::IsMockThemeEnabledForTest() {
@@ -70,7 +70,7 @@ bool WebTestSupport::IsMockThemeEnabledForTest() {
 }
 
 void WebTestSupport::SetMockThemeEnabledForTest(bool value) {
-  DCHECK(g_is_running_layout_test);
+  DCHECK(g_is_running_web_test);
   g_is_mock_theme_enabled = value;
 }