Allow WebUI tab strip to be used on Windows and Linux

Bug: 1032592
Change-Id: If3e59edd7b2c90d95e0d323e5451a9821dc032ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1953577
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723454}

chrome/browser/ui/webui/tab_strip/tab_strip_ui_browsertest.cc

@@ -34,16 +34,11 @@ namespace {
 
 class MockTabStripUIEmbedder : public TabStripUI::Embedder {
  public:
-  MOCK_METHOD(const ui::AcceleratorProvider*,
-              GetAcceleratorProvider,
-              (),
-              (const override));
-  MOCK_METHOD(void, CloseContainer, (), (override));
-  MOCK_METHOD(void,
-              ShowContextMenuAtPoint,
-              (gfx::Point point, std::unique_ptr<ui::MenuModel> menu_model),
-              (override));
-  MOCK_METHOD(TabStripUILayout, GetLayout, (), (override));
+  MOCK_CONST_METHOD0(GetAcceleratorProvider, const ui::AcceleratorProvider*());
+  MOCK_METHOD0(CloseContainer, void());
+  MOCK_METHOD2(ShowContextMenuAtPoint,
+               void(gfx::Point, std::unique_ptr<ui::MenuModel>));
+  MOCK_METHOD0(GetLayout, TabStripUILayout());
 };
 
 }  // namespace

chrome/test/base/browser_with_test_window_test.cc

@@ -205,6 +205,8 @@ std::unique_ptr<Browser> BrowserWithTestWindowTest::CreateBrowser(
   if (hosted_app) {
     params = Browser::CreateParams::CreateForApp(
         "Test", true /* trusted_source */, gfx::Rect(), profile, true);
+  } else if (browser_type == Browser::TYPE_DEVTOOLS) {
+    params = Browser::CreateParams::CreateForDevTools(profile);
   } else {
     params.type = browser_type;
   }

ui/webui/webui_features.gni

@@ -14,5 +14,5 @@ declare_args() {
   closure_compile = is_chromeos || is_linux || is_android
 
   # Enable the WebUI version of the browser's tab strip.
-  enable_webui_tab_strip = is_chromeos
+  enable_webui_tab_strip = is_chromeos || is_linux || is_win
 }