signin: Abort previous 'channelConnected' handling on retry

chrome/browser/ui/webui/webui_webview_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
@@ skipping 81 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, AddAndRemoveContentScripts) {
   ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL());
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddAndRemoveContentScripts",
       new base::StringValue(GetTestUrl("empty.html").spec())));
 }
 
-// Flaky under MemorySanitizer: https://crbug.com/497977
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_AddContentScriptsWithNewWindowAPI DISABLED_AddContentScriptsWithNewWindowAPI
-#else
-#define MAYBE_AddContentScriptsWithNewWindowAPI AddContentScriptsWithNewWindowAPI
-#endif
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest,
-                       MAYBE_AddContentScriptsWithNewWindowAPI) {
+                       AddContentScriptsWithNewWindowAPI) {
   ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL());
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddContentScriptsWithNewWindowAPI",
       new base::StringValue(GetTestUrl("guest_from_opener.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest,
                        ContentScriptIsInjectedAfterTerminateAndReloadWebView) {
   ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL());
@@ skipping 28 matching lines @@
       browser()->profile(), GetWebViewEnabledWebUIURL());
 
   SetWebUIInstance(
       incognito_browser->tab_strip_model()->GetActiveWebContents()->GetWebUI());
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddContentScript",
       new base::StringValue(GetTestUrl("empty.html").spec())));
 }
 #endif