Commit d67afc73 authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by Commit Bot

Fix AppListClientImplBrowserTest.OpenSearchResult on branded builds

The test is looking for an app called "Chromium", but on Google-branded
builds the app is called "Chrome".

Bug: 977737
Test: AppListClientImplBrowserTest.OpenSearchResult
Change-Id: I5666ae8f97c8b41e1119ba3f6150020b109c969c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1674347Reviewed-by: default avatarJenny Zhang <jennyz@chromium.org>
Commit-Queue: Vladislav Kaznacheev <kaznacheev@chromium.org>
Auto-Submit: Vladislav Kaznacheev <kaznacheev@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672241}
parent e60d95fa
...@@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(AppListClientImplBrowserTest, ShowContextMenu) { ...@@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(AppListClientImplBrowserTest, ShowContextMenu) {
} }
// Test that OpenSearchResult that dismisses app list runs fine without // Test that OpenSearchResult that dismisses app list runs fine without
// user-after-free. // use-after-free.
IN_PROC_BROWSER_TEST_F(AppListClientImplBrowserTest, OpenSearchResult) { IN_PROC_BROWSER_TEST_F(AppListClientImplBrowserTest, OpenSearchResult) {
AppListClientImpl* client = AppListClientImpl::GetInstance(); AppListClientImpl* client = AppListClientImpl::GetInstance();
ASSERT_TRUE(client); ASSERT_TRUE(client);
...@@ -172,7 +172,12 @@ IN_PROC_BROWSER_TEST_F(AppListClientImplBrowserTest, OpenSearchResult) { ...@@ -172,7 +172,12 @@ IN_PROC_BROWSER_TEST_F(AppListClientImplBrowserTest, OpenSearchResult) {
// Any app that opens a window to dismiss app list is good enough for this // Any app that opens a window to dismiss app list is good enough for this
// test. // test.
#if defined(GOOGLE_CHROME_BUILD)
const std::string app_title = "chrome";
#else
const std::string app_title = "chromium"; const std::string app_title = "chromium";
#endif // !defined(GOOGLE_CHROME_BUILD)
const std::string app_result_id = const std::string app_result_id =
"chrome-extension://mgndgikekgjfcpckkfioiadnlibdjbkf/"; "chrome-extension://mgndgikekgjfcpckkfioiadnlibdjbkf/";
......
# TODO(crbug.com/977736): Enable this. # TODO(crbug.com/977736): Enable this.
-ActiveDirectoryWebUILoginTest.PasswordChange_ReopenClearErrors -ActiveDirectoryWebUILoginTest.PasswordChange_ReopenClearErrors
# TODO(crbug.com/977737): Enable this.
-AppListClientImplBrowserTest.OpenSearchResult
# TODO(crbug.com/977738): Enable this. # TODO(crbug.com/977738): Enable this.
-ChromePluginTest.InstalledPlugins -ChromePluginTest.InstalledPlugins
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment