Commit 6153a6f9 authored by Glen Robertson's avatar Glen Robertson Committed by Commit Bot

desktop-pwas: Suppress desktop icon creation in more browsertests.

These are all the tests I can find that were likely creating desktop
icons every time the test was run.

Bug: 1046866
Fixed: 1046866
Change-Id: I10e90c313ff8ff2ab4fda288990be4bd500f895b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2049563Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Reviewed-by: default avatarAlan Cutter <alancutter@chromium.org>
Reviewed-by: default avatarOwen Min <zmin@chromium.org>
Commit-Queue: Glen Robertson <glenrob@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740518}
parent 973d62d0
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#include "chrome/browser/banners/app_banner_manager_browsertest_base.h" #include "chrome/browser/banners/app_banner_manager_browsertest_base.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/web_applications/components/app_shortcut_manager.h"
#include "chrome/browser/web_applications/components/web_app_provider_base.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h" #include "content/public/test/browser_test_utils.h"
#include "net/base/url_util.h" #include "net/base/url_util.h"
...@@ -18,6 +20,10 @@ void AppBannerManagerBrowserTestBase::SetUpOnMainThread() { ...@@ -18,6 +20,10 @@ void AppBannerManagerBrowserTestBase::SetUpOnMainThread() {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
InProcessBrowserTest::SetUpOnMainThread(); InProcessBrowserTest::SetUpOnMainThread();
web_app::WebAppProviderBase::GetProviderBase(browser()->profile())
->shortcut_manager()
.SuppressShortcutsForTesting();
} }
GURL AppBannerManagerBrowserTestBase::GetBannerURL() { GURL AppBannerManagerBrowserTestBase::GetBannerURL() {
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/web_applications/components/app_registrar.h" #include "chrome/browser/web_applications/components/app_registrar.h"
#include "chrome/browser/web_applications/components/app_shortcut_manager.h"
#include "chrome/browser/web_applications/components/web_app_helpers.h" #include "chrome/browser/web_applications/components/web_app_helpers.h"
#include "chrome/browser/web_applications/components/web_app_provider_base.h" #include "chrome/browser/web_applications/components/web_app_provider_base.h"
#include "chrome/browser/web_applications/test/test_web_app_ui_manager.h" #include "chrome/browser/web_applications/test/test_web_app_ui_manager.h"
...@@ -167,6 +168,10 @@ class InstallReplacementWebAppApiTest : public ExtensionManagementApiTest { ...@@ -167,6 +168,10 @@ class InstallReplacementWebAppApiTest : public ExtensionManagementApiTest {
ExtensionManagementApiTest::SetUpOnMainThread(); ExtensionManagementApiTest::SetUpOnMainThread();
https_test_server_.ServeFilesFromDirectory(test_data_dir_); https_test_server_.ServeFilesFromDirectory(test_data_dir_);
ASSERT_TRUE(https_test_server_.Start()); ASSERT_TRUE(https_test_server_.Start());
web_app::WebAppProviderBase::GetProviderBase(profile())
->shortcut_manager()
.SuppressShortcutsForTesting();
} }
void RunTest(const char* manifest, void RunTest(const char* manifest,
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include "chrome/browser/policy/profile_policy_connector_builder.h" #include "chrome/browser/policy/profile_policy_connector_builder.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/web_applications/components/app_shortcut_manager.h"
#include "chrome/browser/web_applications/components/web_app_provider_base.h"
#include "chrome/common/extensions/extension_test_util.h" #include "chrome/common/extensions/extension_test_util.h"
#include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
#include "chrome/common/web_application_info.h" #include "chrome/common/web_application_info.h"
...@@ -135,6 +137,10 @@ class ExtensionPolicyTest : public PolicyTest { ...@@ -135,6 +137,10 @@ class ExtensionPolicyTest : public PolicyTest {
extension_service()->updater()->SetExtensionCacheForTesting( extension_service()->updater()->SetExtensionCacheForTesting(
test_extension_cache_.get()); test_extension_cache_.get());
} }
web_app::WebAppProviderBase::GetProviderBase(browser()->profile())
->shortcut_manager()
.SuppressShortcutsForTesting();
} }
extensions::ExtensionService* extension_service() { extensions::ExtensionService* extension_service() {
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
#include "chrome/browser/ui/web_applications/web_app_menu_model.h" #include "chrome/browser/ui/web_applications/web_app_menu_model.h"
#include "chrome/browser/web_applications/components/app_registry_controller.h" #include "chrome/browser/web_applications/components/app_registry_controller.h"
#include "chrome/browser/web_applications/components/app_shortcut_manager.h"
#include "chrome/browser/web_applications/components/external_install_options.h" #include "chrome/browser/web_applications/components/external_install_options.h"
#include "chrome/browser/web_applications/components/web_app_id.h" #include "chrome/browser/web_applications/components/web_app_id.h"
#include "chrome/browser/web_applications/components/web_app_provider_base.h" #include "chrome/browser/web_applications/components/web_app_provider_base.h"
...@@ -342,6 +343,10 @@ class HostedAppTest : public extensions::ExtensionBrowserTest, ...@@ -342,6 +343,10 @@ class HostedAppTest : public extensions::ExtensionBrowserTest,
host_resolver()->AddRule("*", "127.0.0.1"); host_resolver()->AddRule("*", "127.0.0.1");
// By default, all SSL cert checks are valid. Can be overridden in tests. // By default, all SSL cert checks are valid. Can be overridden in tests.
cert_verifier_.mock_cert_verifier()->set_default_result(net::OK); cert_verifier_.mock_cert_verifier()->set_default_result(net::OK);
web_app::WebAppProviderBase::GetProviderBase(profile())
->shortcut_manager()
.SuppressShortcutsForTesting();
} }
// Tests that performing |action| results in a new foreground tab // Tests that performing |action| results in a new foreground tab
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/browsertest_util.h" #include "chrome/browser/extensions/browsertest_util.h"
#include "chrome/browser/predictors/loading_predictor_config.h" #include "chrome/browser/predictors/loading_predictor_config.h"
#include "chrome/browser/ui/web_applications/test/web_app_browsertest_util.h" #include "chrome/browser/ui/web_applications/test/web_app_browsertest_util.h"
#include "chrome/browser/web_applications/components/app_shortcut_manager.h"
#include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/components/web_app_constants.h"
#include "chrome/browser/web_applications/web_app_provider.h" #include "chrome/browser/web_applications/web_app_provider.h"
#include "chrome/common/chrome_features.h" #include "chrome/common/chrome_features.h"
...@@ -149,6 +150,10 @@ void WebAppControllerBrowserTest::SetUpOnMainThread() { ...@@ -149,6 +150,10 @@ void WebAppControllerBrowserTest::SetUpOnMainThread() {
// By default, all SSL cert checks are valid. Can be overridden in tests. // By default, all SSL cert checks are valid. Can be overridden in tests.
cert_verifier_.mock_cert_verifier()->set_default_result(net::OK); cert_verifier_.mock_cert_verifier()->set_default_result(net::OK);
web_app::WebAppProviderBase::GetProviderBase(profile())
->shortcut_manager()
.SuppressShortcutsForTesting();
} }
} // namespace web_app } // namespace web_app
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