BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 5 insertions, 41 deletions

diff --git a/chromium/chrome/browser/extensions/api/mdns/mdns_apitest.cc b/chromium/chrome/browser/extensions/api/mdns/mdns_apitest.cc
index 914c9eb0467..b7f9bde94a7 100644
--- a/chromium/chrome/browser/extensions/api/mdns/mdns_apitest.cc
+++ b/chromium/chrome/browser/extensions/api/mdns/mdns_apitest.cc
@@ -49,15 +49,8 @@ class MDnsAPITest : public extensions::ExtensionApiTest {
 
 }  // namespace
 
-// TODO(justinlin): Win Dbg has a workaround that makes RunExtensionSubtest
-// always return true without actually running the test. Remove when fixed.
-#if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_RegisterListener DISABLED_RegisterListener
-#else
-#define MAYBE_RegisterListener RegisterListener
-#endif
 // Test loading extension, registering an MDNS listener and dispatching events.
-IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_RegisterListener) {
+IN_PROC_BROWSER_TEST_F(MDnsAPITest, RegisterListener) {
   const std::string& service_type = "_googlecast._tcp.local";
   SetUpTestDnsSdRegistry();
 
@@ -86,15 +79,8 @@ IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_RegisterListener) {
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
-// TODO(justinlin): Win Dbg has a workaround that makes RunExtensionSubtest
-// always return true without actually running the test. Remove when fixed.
-#if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_ForceDiscovery DISABLED_ForceDiscovery
-#else
-#define MAYBE_ForceDiscovery ForceDiscovery
-#endif
 // Test loading extension, registering an MDNS listener and dispatching events.
-IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_ForceDiscovery) {
+IN_PROC_BROWSER_TEST_F(MDnsAPITest, ForceDiscovery) {
   const std::string& service_type = "_googlecast._tcp.local";
   SetUpTestDnsSdRegistry();
 
@@ -120,15 +106,8 @@ IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_ForceDiscovery) {
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
-// TODO(justinlin): Win Dbg has a workaround that makes RunExtensionSubtest
-// always return true without actually running the test. Remove when fixed.
-#if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_RegisterMultipleListeners DISABLED_RegisterMultipleListeners
-#else
-#define MAYBE_RegisterMultipleListeners RegisterMultipleListeners
-#endif
 // Test loading extension and registering multiple listeners.
-IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_RegisterMultipleListeners) {
+IN_PROC_BROWSER_TEST_F(MDnsAPITest, RegisterMultipleListeners) {
   const std::string& service_type = "_googlecast._tcp.local";
   const std::string& test_service_type = "_testing._tcp.local";
   SetUpTestDnsSdRegistry();
@@ -161,15 +140,8 @@ IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_RegisterMultipleListeners) {
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
-// TODO(justinlin): Win Dbg has a workaround that makes RunExtensionSubtest
-// always return true without actually running the test. Remove when fixed.
-#if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_RegisterTooManyListeners DISABLED_RegisterTooManyListeners
-#else
-#define MAYBE_RegisterTooManyListeners RegisterTooManyListeners
-#endif
 // Test loading extension and registering multiple listeners.
-IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_RegisterTooManyListeners) {
+IN_PROC_BROWSER_TEST_F(MDnsAPITest, RegisterTooManyListeners) {
   SetUpTestDnsSdRegistry();
 
   EXPECT_CALL(*dns_sd_registry_, RegisterDnsSdListener(_)).Times(10);
@@ -182,16 +154,8 @@ IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_RegisterTooManyListeners) {
       << message_;
 }
 
-// TODO(justinlin): Win Dbg has a workaround that makes RunExtensionSubtest
-// always return true without actually running the test. Remove when fixed.
-#if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_MaxServiceInstancesPerEventConst \
-  DISABLED_MaxServiceInstancesPerEventConst
-#else
-#define MAYBE_MaxServiceInstancesPerEventConst MaxServiceInstancesPerEventConst
-#endif
 // Test loading extension and registering multiple listeners.
-IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_MaxServiceInstancesPerEventConst) {
+IN_PROC_BROWSER_TEST_F(MDnsAPITest, MaxServiceInstancesPerEventConst) {
   EXPECT_TRUE(RunExtensionSubtest("mdns/api",
                                   "get_max_service_instances.html"));
 }