Remove NTB from toolbar in webui mode.

Bug: 1045669
Change-Id: Ib5d5afeb13b5ab50293a03dbeaafe388ff0a8522
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2018341
Commit-Queue: Taylor Bergquist <tbergquist@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735571}

chrome/browser/ui/views/frame/webui_tab_strip_container_view.h

@@ -123,6 +123,7 @@ class WebUITabStripContainerView : public TabStripUIEmbedder,
   Browser* const browser_;
   views::WebView* const web_view_;
   views::View* tab_contents_container_;
+  // TODO(1045669): Remove this, or run an experiment on bringing it back.
   ToolbarButton* new_tab_button_ = nullptr;
   views::View* tab_counter_ = nullptr;
 

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

@@ -58,10 +58,6 @@ TEST_F(WebUITabStripContainerViewTest, TouchModeTransition) {
 }
 
 TEST_F(WebUITabStripContainerViewTest, ButtonsPresentInToolbar) {
-  ASSERT_NE(nullptr,
-            browser_view()->webui_tab_strip()->new_tab_button_for_testing());
-  EXPECT_TRUE(browser_view()->toolbar()->Contains(
-      browser_view()->webui_tab_strip()->new_tab_button_for_testing()));
   ASSERT_NE(nullptr,
             browser_view()->webui_tab_strip()->tab_counter_for_testing());
   EXPECT_TRUE(browser_view()->toolbar()->Contains(

chrome/browser/ui/views/toolbar/toolbar_view.cc

@@ -362,8 +362,6 @@ void ToolbarView::UpdateForWebUITabStrip() {
 #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
   if (browser_view_->webui_tab_strip() && app_menu_button_) {
     const int insertion_index = GetIndexOf(app_menu_button_);
-    AddChildViewAt(browser_view_->webui_tab_strip()->CreateNewTabButton(),
-                   insertion_index);
     AddChildViewAt(browser_view_->webui_tab_strip()->CreateTabCounter(),
                    insertion_index);
     LoadImages();