Revert "Reland "[Tab Scrolling] Add field trial testing config.""

This reverts commit 91c96d6.

Reason for revert: This change made TabRestore tests flaky
Bug: 1179636

Original change's description:
> Reland "[Tab Scrolling] Add field trial testing config."
>
> This reverts commit a637026.
>
> Reason for revert: Attempt to land
>
> Original change's description:
> > Revert "[Tab Scrolling] Add field trial testing config."
> >
> > This reverts commit 2e66af5.
> >
> > Reason for revert: <Misclicked SUBMIT>
> >
> > Original change's description:
> > > [Tab Scrolling] Add field trial testing config.
> > >
> > > Bug: 1121354, 951078
> > > Change-Id: Iad44a7a11db3f6f86f6ec1240a21ed0acc77fe18
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2673623
> > > Commit-Queue: Charlene Yan <cyan@chromium.org>
> > > Reviewed-by: Taylor Bergquist <tbergquist@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#852684}
> >
> > TBR=tbergquist@chromium.org,cyan@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com
> >
> > Change-Id: I9689bf84185a3a4e9283352839298b9c8e60d13e
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: 1121354
> > Bug: 951078
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2685333
> > Reviewed-by: Charlene Yan <cyan@chromium.org>
> > Commit-Queue: Charlene Yan <cyan@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#852691}
>
> TBR=tbergquist@chromium.org,cyan@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com
>
> # Not skipping CQ checks because this is a reland.
>
> Bug: 1121354
> Bug: 951078
> Change-Id: I174c2c2b85c600defeee7627e6ce1772a920f0f9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2687744
> Reviewed-by: Charlene Yan <cyan@chromium.org>
> Reviewed-by: Taylor Bergquist <tbergquist@chromium.org>
> Commit-Queue: Charlene Yan <cyan@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#854913}

Bug: 1121354
Bug: 951078
Change-Id: I3ab7fcc971191c56e006281ac70abe39f2e7d135
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2706365
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Tsuyoshi Horo <horo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#855717}

chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc

@@ -9,7 +9,6 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
-#include "chrome/browser/ui/views/frame/tab_strip_region_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/pref_names.h"
@@ -144,7 +143,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewTest, BrowserFullscreenShowTopView) {
   EXPECT_EQ(top_view_in_browser_fullscreen, browser_view->GetTabStripVisible());
   // This makes sure that the layout was updated accordingly.
   EXPECT_EQ(top_view_in_browser_fullscreen,
-            browser_view->tab_strip_region_view()->GetVisible());
+            browser_view->tabstrip()->GetVisible());
   EXPECT_EQ(top_view_in_browser_fullscreen,
             chrome::IsCommandEnabled(browser(), IDC_SHOW_BOOKMARK_BAR));
 

chrome/browser/ui/views/frame/immersive_mode_controller_chromeos_browsertest.cc

@@ -15,7 +15,6 @@
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.h"
-#include "chrome/browser/ui/views/frame/tab_strip_region_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
@@ -161,8 +160,7 @@ class ImmersiveModeControllerChromeosWebAppBrowserTest
 IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerChromeosWebAppBrowserTest,
                        Layout) {
   LaunchAppBrowser();
-  TabStripRegionView* tabstrip_region_view =
-      browser_view()->tab_strip_region_view();
+  TabStrip* tabstrip = browser_view()->tabstrip();
   ToolbarView* toolbar = browser_view()->toolbar();
   views::WebView* contents_web_view = browser_view()->contents_web_view();
   views::View* top_container = browser_view()->top_container();
@@ -171,8 +169,8 @@ IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerChromeosWebAppBrowserTest,
   ASSERT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   ASSERT_FALSE(controller()->IsEnabled());
 
-  // The tab strip is not visible for web apps.
-  EXPECT_FALSE(tabstrip_region_view->GetVisible());
+  // The tabstrip is not visible for web apps.
+  EXPECT_FALSE(tabstrip->GetVisible());
   EXPECT_TRUE(toolbar->GetVisible());
 
   // The window header should be above the web contents.
@@ -186,7 +184,7 @@ IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerChromeosWebAppBrowserTest,
   // Entering immersive fullscreen should make the web contents flush with the
   // top of the widget. The popup browser type doesn't support tabstrip and
   // toolbar feature, thus invisible.
-  EXPECT_FALSE(tabstrip_region_view->GetVisible());
+  EXPECT_FALSE(tabstrip->GetVisible());
   EXPECT_FALSE(toolbar->GetVisible());
   EXPECT_TRUE(top_container->GetVisibleBounds().IsEmpty());
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
@@ -196,7 +194,7 @@ IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerChromeosWebAppBrowserTest,
 
   // The tabstrip should still be hidden and the web contents should still be
   // flush with the top of the screen.
-  EXPECT_FALSE(tabstrip_region_view->GetVisible());
+  EXPECT_FALSE(tabstrip->GetVisible());
   EXPECT_TRUE(toolbar->GetVisible());
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
 
@@ -212,7 +210,7 @@ IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerChromeosWebAppBrowserTest,
   ToggleFullscreen();
   EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   EXPECT_FALSE(controller()->IsEnabled());
-  EXPECT_FALSE(tabstrip_region_view->GetVisible());
+  EXPECT_FALSE(tabstrip->GetVisible());
   EXPECT_TRUE(toolbar->GetVisible());
   EXPECT_EQ(header_height, GetBoundsInWidget(contents_web_view).y());
 }

testing/variations/fieldtrial_testing_config.json

@@ -2545,25 +2545,6 @@
             ]
         }
     ],
-    "DesktopTabScrolling": [
-        {
-            "platforms": [
-                "chromeos",
-                "chromeos_lacros",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "ScrollableTabStrip"
-                    ]
-                }
-            ]
-        }
-    ],
     "DesktopWebAppInstallIconExperiment": [
         {
             "platforms": [