Land follow-ups to r644414

git cl upload failed to upload these changes to the last CL, so my +2
landed the wrong patchset. By the time I noticed the change was already
merged.

Bug: chromium:943702
Change-Id: I8cd74c33f1e1e36e86188af9872f3a0e85039262
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1534874
Commit-Queue: Peter Boström <pbos@chromium.org>
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Reviewed-by: Collin Baker <collinbaker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644447}

chrome/browser/ui/views/extensions/extensions_menu_view_browsertest.cc

@@ -25,18 +25,12 @@ class ExtensionsMenuViewBrowserTest : public DialogBrowserTest {
         loader.LoadExtension(test_data_dir.AppendASCII(extension)));
   }
 
- private:
   void SetUp() override {
     scoped_feature_list_.InitAndEnableFeature(features::kExtensionsToolbarMenu);
     DialogBrowserTest::SetUp();
   }
 
   void ShowUi(const std::string& name) override {
-    if (name == "default") {
-      LoadTestExtension("extensions/uitest/long_name");
-      LoadTestExtension("extensions/uitest/window_open");
-    }
-
     ui::MouseEvent click_event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                                base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, 0);
     BrowserView::GetBrowserViewForBrowser(browser())
@@ -45,19 +39,6 @@ class ExtensionsMenuViewBrowserTest : public DialogBrowserTest {
         ->OnMousePressed(click_event);
   }
 
-  bool VerifyUi() override {
-    if (!DialogBrowserTest::VerifyUi())
-      return false;
-
-    std::vector<ExtensionsMenuButton*> menu_buttons = GetExtensionMenuButtons();
-    if (extensions_.size() != menu_buttons.size())
-      return false;
-
-    // TODO(pbos): Sort and compare titles of buttons / extensions.
-
-    return true;
-  }
-
   static std::vector<ExtensionsMenuButton*> GetExtensionMenuButtons() {
     std::vector<ExtensionsMenuButton*> buttons;
     for (auto* view : ExtensionsMenuView::GetExtensionsMenuViewForTesting()
@@ -73,9 +54,23 @@ class ExtensionsMenuViewBrowserTest : public DialogBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, InvokeUi_default) {
+  LoadTestExtension("extensions/uitest/long_name");
+  LoadTestExtension("extensions/uitest/window_open");
+
   ShowAndVerifyUi();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, InvokeUi_NoExtensions) {
   ShowAndVerifyUi();
 }
+
+IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
+                       CreatesOneButtonPerExtension) {
+  LoadTestExtension("extensions/uitest/long_name");
+  LoadTestExtension("extensions/uitest/window_open");
+  ShowUi("");
+  VerifyUi();
+  EXPECT_EQ(2u, extensions_.size());
+  EXPECT_EQ(extensions_.size(), GetExtensionMenuButtons().size());
+  DismissUi();
+}