Revert of Mark 3 tests flaky on android

content/browser/security_exploit_browsertest.cc

 // Copyright (c) 2013 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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 235 matching lines @@
   EXPECT_EQ(0, shell()->web_contents()->GetMainFrame()->GetEnabledBindings());
 
   RenderProcessHostWatcher terminated(
       shell()->web_contents(),
       RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
   shell()->web_contents()->GetRenderViewHost()->SetWebUIProperty(
       "toolkit", "views");
   terminated.Wait();
 }
 
-#if defined(OS_ANDROID)
-// Flaky on android: https://crbug.com/703657
-#define MAYBE_AttemptDuplicateRenderViewHost \
-  DISABLED_AttemptDuplicateRenderViewHost
-#else
-#define MAYBE_AttemptDuplicateRenderViewHost AttemptDuplicateRenderViewHost
-#endif
-
 // This is a test for crbug.com/312016 attempting to create duplicate
 // RenderViewHosts. SetupForDuplicateHosts sets up this test case and leaves
 // it in a state with pending RenderViewHost. Before the commit of the new
 // pending RenderViewHost, this test case creates a new window through the new
 // process.
 IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
-                       MAYBE_AttemptDuplicateRenderViewHost) {
+                       AttemptDuplicateRenderViewHost) {
   int32_t duplicate_routing_id = MSG_ROUTING_NONE;
   RenderViewHostImpl* pending_rvh =
       PrepareToDuplicateHosts(shell(), &duplicate_routing_id);
   EXPECT_NE(MSG_ROUTING_NONE, duplicate_routing_id);
 
   // Since this test executes on the UI thread and hopping threads might cause
   // different timing in the test, let's simulate a CreateNewWindow call coming
   // from the IO thread.
   DOMStorageContextWrapper* dom_storage_context =
       static_cast<DOMStorageContextWrapper*>(
           BrowserContext::GetStoragePartition(
               shell()->web_contents()->GetBrowserContext(),
               pending_rvh->GetSiteInstance())->GetDOMStorageContext());
   scoped_refptr<SessionStorageNamespaceImpl> session_storage(
       new SessionStorageNamespaceImpl(dom_storage_context));
   // Cause a deliberate collision in routing ids.
   int32_t main_frame_routing_id = duplicate_routing_id + 1;
   // TODO(avi): This should be made unique from the view routing ID once
   // RenderViewHostImpl has-a RenderWidgetHostImpl. https://crbug.com/545684
   int32_t main_frame_widget_routing_id = duplicate_routing_id;
   static_cast<RenderFrameHostImpl*>(pending_rvh->GetMainFrame())
       ->OnCreateNewWindow(duplicate_routing_id, main_frame_routing_id,
                           main_frame_widget_routing_id,
                           mojom::CreateNewWindowParams(),
                           session_storage.get());
 
   // If the above operation doesn't cause a crash, the test has succeeded!
 }
 
-#if defined(OS_ANDROID)
-// Flaky on android: https://crbug.com/703657
-#define MAYBE_AttemptDuplicateRenderWidgetHost \
-  DISABLED_AttemptDuplicateRenderWidgetHost
-#else
-#define MAYBE_AttemptDuplicateRenderWidgetHost AttemptDuplicateRenderWidgetHost
-#endif
-
 // This is a test for crbug.com/312016. It tries to create two RenderWidgetHosts
 // with the same process and routing ids, which causes a collision. It is almost
 // identical to the AttemptDuplicateRenderViewHost test case.
 IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
-                       MAYBE_AttemptDuplicateRenderWidgetHost) {
+                       AttemptDuplicateRenderWidgetHost) {
 #if defined(OS_WIN)
   // PlzNavigate
   // This test is failing in a flaky manner on Android as it appears to be
   // leaking URLRequests. See crbug.com/702584.
   if (IsBrowserSideNavigationEnabled())
     return;
 #endif
   int duplicate_routing_id = MSG_ROUTING_NONE;
   RenderViewHostImpl* pending_rvh =
       PrepareToDuplicateHosts(shell(), &duplicate_routing_id);
@@ skipping 260 matching lines @@
   // separate task of the message loop, so ensure that the process is still
   // considered alive.
   EXPECT_TRUE(root->current_frame_host()->GetProcess()->HasConnection());
 
   exit_observer.Wait();
   EXPECT_FALSE(exit_observer.did_exit_normally());
   ResourceDispatcherHost::Get()->SetDelegate(nullptr);
 }
 
 }  // namespace content