Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2e91d30f41fe86dfa82bb8254ef2d938cde34b4d
brave-core/browser/brave_app_controller_mac_browsertest.mm
T
Emerick Rogul d6ac385821 [cr147] Fix problematic wait for browser close in Mac bookmarks browser test 
Instead of waiting for any browser close notification, wait for the specific
browser we are expecting to close. Also, migrate to using
`ui_test_utils::BrowserDestroyedObserver` as `WaitForBrowserToClose` is now
deprecated.

Chromium changes:
https://source.chromium.org/chromium/chromium/src/+/1b6e9c1e01183fe636c1e99a4fe647d12e976855

commit 1b6e9c1e01183fe636c1e99a4fe647d12e976855
Author: Thomas Lukaszewicz <tluk@chromium.org>
Date:   Wed Feb 18 10:00:35 2026 -0800

    Reland "[bedrock] Match browser collection close with BWI did-close events"

    This is a reland of commit 36d0f0ca9bc67a071b33a8f0cdb66e580f29981e

    Original change's description:
    > [bedrock] Match browser collection close with BWI did-close events
    >
    > Currently BrowserManagerService emits close events immediately before
    > the browser instance is destroyed.
    >
    > However BrowserWindowInterface is closed earlier, and destruction
    > happens asynchronously.
    >
    > This CL updates BrowserManagerService, and consequently the
    > BrowserCollection APIs to match the close event propagation of their
    > BrowserWindowInterface instances.
    >
    > Logic from ~Browser has been inlined into BrowserManagerService
    > as these steps must be the last things run during Browser
    > destruction - or immediately after Browser destruction.
    >
    > Follow up CLs will refactor these to address the existing TODOs.
    >
    > Bug: 431671320
    > Change-Id: I3fd2783f40a774128b152b33cb4794aed1f7575b
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7570170
    > Commit-Queue: Tom Lukaszewicz <tluk@chromium.org>
    > Reviewed-by: Glenn Hartmann <hartmanng@chromium.org>
    > Cr-Commit-Position: refs/heads/main@{#1586192}

    Bug: 431671320
    Change-Id: Ia30b59b3b13a566a2e1d93c71412fea2235f4267
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7586615
    Reviewed-by: Glenn Hartmann <hartmanng@chromium.org>
    Commit-Queue: Tom Lukaszewicz <tluk@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1586524}
2026-03-26 19:55:43 -04:00

427 lines
17 KiB
Plaintext
Raw Blame History

/* Copyright (c) 2023 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/. */
#include "brave/browser/brave_app_controller_mac.h"
#include <AppKit/AppKit.h>
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
#import <objc/runtime.h>
#include <stddef.h>
#include <string>
#include "base/apple/foundation_util.h"
#include "base/apple/scoped_objc_class_swizzler.h"
#include "base/check.h"
#include "base/test/scoped_feature_list.h"
#include "brave/app/brave_command_ids.h"
#include "brave/browser/brave_browser_features.h"
#include "brave/browser/brave_browser_process.h"
#include "brave/browser/ui/views/frame/brave_browser_view.h"
#include "brave/components/tor/buildflags/buildflags.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
#include "chrome/browser/ui/location_bar/location_bar.h"
#include "chrome/browser/ui/omnibox/omnibox_view.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_utils.h"
#include "components/bookmarks/test/bookmark_test_helpers.h"
#include "components/policy/core/common/policy_pref_names.h"
#include "content/public/test/browser_test.h"
#if BUILDFLAG(ENABLE_TOR)
#include "brave/browser/tor/tor_profile_service_factory.h"
#include "brave/components/tor/pref_names.h"
#endif // BUILDFLAG(ENABLE_TOR)
using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
namespace {
constexpr char kTestingPage[] = "/empty.html";
class BraveAppControllerBrowserTest : public InProcessBrowserTest {
public:
BraveAppControllerBrowserTest() {
features_.InitWithFeatureState(features::kBraveCopyCleanLinkByDefault,
true);
}
BookmarkModel* WaitForBookmarkModel(Profile* profile) {
BookmarkModel* bookmark_model =
BookmarkModelFactory::GetForBrowserContext(profile);
bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
return bookmark_model;
}
private:
base::test::ScopedFeatureList features_;
};
class BraveAppControllerCleanLinkFeatureDisabledBrowserTest
: public InProcessBrowserTest {
public:
BraveAppControllerCleanLinkFeatureDisabledBrowserTest() {
features_.InitWithFeatureState(features::kBraveCopyCleanLinkByDefault,
false);
}
private:
base::test::ScopedFeatureList features_;
};
IN_PROC_BROWSER_TEST_F(BraveAppControllerCleanLinkFeatureDisabledBrowserTest,
CopyLinkItemVisible) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url = embedded_test_server()->GetURL(kTestingPage);
ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
BraveBrowserView* browser_view = static_cast<BraveBrowserView*>(
BraveBrowserView::GetBrowserViewForBrowser(browser()));
OmniboxView* omnibox_view = browser_view->GetLocationBar()->GetOmniboxView();
omnibox_view->SetFocus(true);
omnibox_view->SelectAll(false);
EXPECT_TRUE(omnibox_view->IsSelectAll());
EXPECT_TRUE(BraveBrowserWindow::From(browser()->window())->HasSelectedURL());
BraveAppController* ac = base::apple::ObjCCastStrict<BraveAppController>(
[[NSApplication sharedApplication] delegate]);
ASSERT_TRUE(ac);
NSMenu* edit_submenu = [[[NSApp mainMenu] itemWithTag:IDC_EDIT_MENU] submenu];
NSMenuItem* copy_item = [edit_submenu itemWithTag:IDC_CONTENT_CONTEXT_COPY];
NSMenuItem* clean_link_menu_item =
[edit_submenu itemWithTag:IDC_COPY_CLEAN_LINK];
[ac menuNeedsUpdate:[clean_link_menu_item menu]];
base::RunLoop().RunUntilIdle();
EXPECT_FALSE([clean_link_menu_item isHidden]);
EXPECT_TRUE([[clean_link_menu_item keyEquivalent] isEqualToString:@""]);
EXPECT_TRUE([[copy_item keyEquivalent] isEqualToString:@"c"]);
EXPECT_EQ([copy_item keyEquivalentModifierMask], NSEventModifierFlagCommand);
}
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest, CopyLinkItemVisible) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url = embedded_test_server()->GetURL(kTestingPage);
ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
BraveBrowserView* browser_view = static_cast<BraveBrowserView*>(
BraveBrowserView::GetBrowserViewForBrowser(browser()));
OmniboxView* omnibox_view = browser_view->GetLocationBar()->GetOmniboxView();
omnibox_view->SetFocus(true);
omnibox_view->SelectAll(false);
EXPECT_TRUE(omnibox_view->IsSelectAll());
EXPECT_TRUE(BraveBrowserWindow::From(browser()->window())->HasSelectedURL());
BraveAppController* ac = base::apple::ObjCCastStrict<BraveAppController>(
[[NSApplication sharedApplication] delegate]);
ASSERT_TRUE(ac);
NSMenu* edit_submenu = [[[NSApp mainMenu] itemWithTag:IDC_EDIT_MENU] submenu];
NSMenuItem* copy_item = [edit_submenu itemWithTag:IDC_CONTENT_CONTEXT_COPY];
NSMenuItem* clean_link_menu_item =
[edit_submenu itemWithTag:IDC_COPY_CLEAN_LINK];
[ac menuNeedsUpdate:[clean_link_menu_item menu]];
base::RunLoop().RunUntilIdle();
EXPECT_FALSE([clean_link_menu_item isHidden]);
EXPECT_TRUE([[clean_link_menu_item keyEquivalent] isEqualToString:@"c"]);
EXPECT_EQ([clean_link_menu_item keyEquivalentModifierMask],
NSEventModifierFlagCommand);
EXPECT_TRUE([[copy_item keyEquivalent] isEqualToString:@""]);
EXPECT_EQ([copy_item keyEquivalentModifierMask], 0UL);
}
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest, CopyLinkItemNotVisible) {
EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
OmniboxView* omnibox_view =
browser()->window()->GetLocationBar()->GetOmniboxView();
omnibox_view->SetUserText(u"any text");
omnibox_view->SelectAll(false);
EXPECT_TRUE(omnibox_view->IsSelectAll());
AppController* ac = base::apple::ObjCCastStrict<AppController>(
[[NSApplication sharedApplication] delegate]);
ASSERT_TRUE(ac);
NSMenu* edit_submenu = [[[NSApp mainMenu] itemWithTag:IDC_EDIT_MENU] submenu];
NSMenuItem* copy_item = [edit_submenu itemWithTag:IDC_CONTENT_CONTEXT_COPY];
NSMenuItem* clean_link_menu_item =
[edit_submenu itemWithTag:IDC_COPY_CLEAN_LINK];
[ac menuNeedsUpdate:[clean_link_menu_item menu]];
EXPECT_TRUE([clean_link_menu_item isHidden]);
EXPECT_TRUE([[clean_link_menu_item keyEquivalent] isEqualToString:@""]);
EXPECT_EQ([clean_link_menu_item keyEquivalentModifierMask], 0UL);
EXPECT_TRUE([[copy_item keyEquivalent] isEqualToString:@"c"]);
EXPECT_EQ([copy_item keyEquivalentModifierMask], NSEventModifierFlagCommand);
}
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest,
CopyLinkItemNotVisibleWithoutSelection) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url = embedded_test_server()->GetURL(kTestingPage);
ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
BraveBrowserView* browser_view = static_cast<BraveBrowserView*>(
BraveBrowserView::GetBrowserViewForBrowser(browser()));
OmniboxView* omnibox_view = browser_view->GetLocationBar()->GetOmniboxView();
EXPECT_FALSE(omnibox_view->IsSelectAll());
EXPECT_FALSE(BraveBrowserWindow::From(browser()->window())->HasSelectedURL());
BraveAppController* ac = base::apple::ObjCCastStrict<BraveAppController>(
[[NSApplication sharedApplication] delegate]);
ASSERT_TRUE(ac);
NSMenu* edit_submenu = [[[NSApp mainMenu] itemWithTag:IDC_EDIT_MENU] submenu];
NSMenuItem* clean_link_menu_item =
[edit_submenu itemWithTag:IDC_COPY_CLEAN_LINK];
[ac menuNeedsUpdate:[clean_link_menu_item menu]];
base::RunLoop().RunUntilIdle();
EXPECT_TRUE([clean_link_menu_item isHidden]);
}
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest,
BookmarkItemsFromMenuBarTest) {
AppController* ac =
base::apple::ObjCCastStrict<AppController>([NSApp delegate]);
[ac mainMenuCreated];
[ac setLastProfile:browser()->profile()];
// Add one bookmark item.
constexpr char kPersistBookmarkURL[] = "http://www.cnn.com/";
constexpr char16_t kPersistBookmarkTitle[] = u"CNN";
BookmarkModel* bookmark_model = WaitForBookmarkModel(browser()->profile());
bookmarks::AddIfNotBookmarked(bookmark_model, GURL(kPersistBookmarkURL),
kPersistBookmarkTitle);
// Update menubar's bookmark menu to make it includes above item.
NSMenu* normal_window_submenu = [ac bookmarkMenuBridge]->BookmarkMenu();
[[normal_window_submenu delegate] menuNeedsUpdate:normal_window_submenu];
// Total 5 items - basic 3 items (Bookmark Manager, Bookmark This Tab... and
// Bookmark All Tabs..), separator, and "Bookmarks" (which contains the new
// bookmark item).
EXPECT_EQ(5, [normal_window_submenu numberOfItems]);
EXPECT_EQ(
std::u16string(kPersistBookmarkTitle),
base::SysNSStringToUTF16([[normal_window_submenu itemAtIndex:4] title]));
// Create private browser and check bookmark menubar has same items.
auto* private_browser = CreateIncognitoBrowser(browser()->profile());
[ac setLastProfile:private_browser->profile()];
NSMenu* private_browser_submenu = [ac bookmarkMenuBridge]->BookmarkMenu();
[[private_browser_submenu delegate] menuNeedsUpdate:private_browser_submenu];
EXPECT_EQ(5, [private_browser_submenu numberOfItems]);
EXPECT_EQ(std::u16string(kPersistBookmarkTitle),
base::SysNSStringToUTF16(
[[private_browser_submenu itemAtIndex:4] title]));
// Close private browser and check bookmark menubar still has same items.
ui_test_utils::BrowserDestroyedObserver observer(private_browser);
chrome::CloseWindow(private_browser);
observer.Wait();
[ac setLastProfile:browser()->profile()];
[[normal_window_submenu delegate] menuNeedsUpdate:normal_window_submenu];
EXPECT_EQ(5, [normal_window_submenu numberOfItems]);
EXPECT_EQ(
std::u16string(kPersistBookmarkTitle),
base::SysNSStringToUTF16([[normal_window_submenu itemAtIndex:4] title]));
}
#if BUILDFLAG(ENABLE_TOR)
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest, TorItemEnabled) {
NSApplication* app = [NSApplication sharedApplication];
BraveAppController* ac =
base::apple::ObjCCastStrict<BraveAppController>([app delegate]);
ASSERT_TRUE(ac);
NSMenu* dockMenu = [ac applicationDockMenu:app];
ASSERT_TRUE(dockMenu);
ASSERT_FALSE(TorProfileServiceFactory::IsTorDisabled(browser()->profile()));
// Tor item should exist and be enabled
NSMenuItem* tor_menu = [dockMenu itemWithTag:IDC_NEW_OFFTHERECORD_WINDOW_TOR];
EXPECT_TRUE(tor_menu);
EXPECT_FALSE(tor_menu.isHidden);
EXPECT_TRUE([ac validateUserInterfaceItem:tor_menu]);
EXPECT_TRUE(tor_menu.enabled);
EXPECT_FALSE(tor_menu.isHidden);
// Executing the item should create a new incognito window with Tor
[ac executeCommand:tor_menu withProfile:browser()->profile()];
base::RunLoop().RunUntilIdle();
Browser* tor_window = chrome::FindLastActive();
EXPECT_TRUE(tor_window);
EXPECT_TRUE(tor_window->profile()->IsTor());
}
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest,
TorItemDisabled_ByPolicy) {
NSApplication* app = [NSApplication sharedApplication];
BraveAppController* ac =
base::apple::ObjCCastStrict<BraveAppController>([app delegate]);
ASSERT_TRUE(ac);
NSMenu* dockMenu = [ac applicationDockMenu:app];
ASSERT_TRUE(dockMenu);
ASSERT_FALSE(TorProfileServiceFactory::IsTorDisabled(browser()->profile()));
NSMenuItem* tor_menu = [dockMenu itemWithTag:IDC_NEW_OFFTHERECORD_WINDOW_TOR];
EXPECT_TRUE(tor_menu);
EXPECT_TRUE(tor_menu.enabled);
EXPECT_FALSE(tor_menu.isHidden);
// When policy disabled incognito mode, the tor itme should be hidden
PrefService* pref_service = browser()->profile()->GetPrefs();
pref_service->SetInteger(
policy::policy_prefs::kIncognitoModeAvailability,
static_cast<int>(policy::IncognitoModeAvailability::kDisabled));
ASSERT_TRUE(TorProfileServiceFactory::IsTorDisabled(browser()->profile()));
// Tor item should exist and be enabled
EXPECT_FALSE([ac validateUserInterfaceItem:tor_menu]);
EXPECT_FALSE(tor_menu.enabled);
EXPECT_TRUE(tor_menu.isHidden);
}
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest,
TorItemDisabled_ByLocalState) {
NSApplication* app = [NSApplication sharedApplication];
BraveAppController* ac =
base::apple::ObjCCastStrict<BraveAppController>([app delegate]);
ASSERT_TRUE(ac);
CHECK(g_browser_process);
ASSERT_TRUE(g_browser_process);
auto* local_state = g_browser_process->local_state();
ASSERT_TRUE(local_state);
ASSERT_FALSE(local_state->GetBoolean(tor::prefs::kTorDisabled));
NSMenu* dockMenu = [ac applicationDockMenu:app];
ASSERT_TRUE(dockMenu);
ASSERT_FALSE(TorProfileServiceFactory::IsTorDisabled(browser()->profile()));
NSMenuItem* tor_menu = [dockMenu itemWithTag:IDC_NEW_OFFTHERECORD_WINDOW_TOR];
EXPECT_TRUE(tor_menu);
EXPECT_TRUE(tor_menu.enabled);
EXPECT_FALSE(tor_menu.isHidden);
// When local state changed to disable tor, the tor itme should be hidden
local_state->SetBoolean(tor::prefs::kTorDisabled, true);
EXPECT_FALSE([ac validateUserInterfaceItem:tor_menu]);
EXPECT_FALSE(tor_menu.enabled);
EXPECT_TRUE(tor_menu.isHidden);
}
// Verify that _torMainMenuItem is never null when Tor is enabled
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest, TorMenuItemExists) {
NSApplication* app = [NSApplication sharedApplication];
BraveAppController* controller =
base::apple::ObjCCastStrict<BraveAppController>([app delegate]);
ASSERT_TRUE(controller);
[controller setLastProfile:browser()->profile()];
[controller mainMenuCreated];
NSMenu* fileMenu = [[[NSApp mainMenu] itemWithTag:IDC_FILE_MENU] submenu];
ASSERT_TRUE(fileMenu);
NSMenuItem* torMenuItem =
[fileMenu itemWithTag:IDC_NEW_OFFTHERECORD_WINDOW_TOR];
ASSERT_TRUE(torMenuItem);
}
// Verify that tor_main_pref_observer_ is lazily created when Tor is enabled
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest,
TorPrefObserverLazyCreationEnabled) {
NSApplication* app = [NSApplication sharedApplication];
BraveAppController* controller =
base::apple::ObjCCastStrict<BraveAppController>([app delegate]);
ASSERT_TRUE(controller);
// Ensure Tor is enabled
browser()->profile()->GetPrefs()->ClearPref(
policy::policy_prefs::kIncognitoModeAvailability);
g_browser_process->local_state()->ClearPref(tor::prefs::kTorDisabled);
ASSERT_FALSE(TorProfileServiceFactory::IsTorDisabled(browser()->profile()));
[controller mainMenuCreated];
NSMenu* fileMenu = [[[NSApp mainMenu] itemWithTag:IDC_FILE_MENU] submenu];
ASSERT_TRUE(fileMenu);
NSMenuItem* torMenuItem =
[fileMenu itemWithTag:IDC_NEW_OFFTHERECORD_WINDOW_TOR];
ASSERT_TRUE(torMenuItem);
// Ensure menu updates are processed
[[torMenuItem menu] setDelegate:controller];
// Trigger menu update
[controller setLastProfile:browser()->profile()];
[controller menuNeedsUpdate:[torMenuItem menu]];
EXPECT_TRUE([torMenuItem isEnabled]);
EXPECT_FALSE([torMenuItem isHidden]);
}
// Verify that tor_main_pref_observer_ is lazily created when Tor is disabled
IN_PROC_BROWSER_TEST_F(BraveAppControllerBrowserTest,
TorPrefObserverLazyCreationDisabled) {
NSApplication* app = [NSApplication sharedApplication];
BraveAppController* controller =
base::apple::ObjCCastStrict<BraveAppController>([app delegate]);
ASSERT_TRUE(controller);
// Ensure Tor is disabled
browser()->profile()->GetPrefs()->SetInteger(
policy::policy_prefs::kIncognitoModeAvailability,
static_cast<int>(policy::IncognitoModeAvailability::kDisabled));
g_browser_process->local_state()->SetBoolean(tor::prefs::kTorDisabled, true);
ASSERT_TRUE(TorProfileServiceFactory::IsTorDisabled(browser()->profile()));
[controller mainMenuCreated];
NSMenu* fileMenu = [[[NSApp mainMenu] itemWithTag:IDC_FILE_MENU] submenu];
ASSERT_TRUE(fileMenu);
NSMenuItem* torMenuItem =
[fileMenu itemWithTag:IDC_NEW_OFFTHERECORD_WINDOW_TOR];
ASSERT_TRUE(torMenuItem);
// Ensure menu updates are processed
[[torMenuItem menu] setDelegate:controller];
// Trigger menu update
[controller setLastProfile:browser()->profile()];
[controller menuNeedsUpdate:[torMenuItem menu]];
EXPECT_FALSE([torMenuItem isEnabled]);
EXPECT_TRUE([torMenuItem isHidden]);
}
#endif // BUILDFLAG(ENABLE_TOR)
} // namespace
Reference in New Issue View Git Blame Copy Permalink