Revert of Make AXProviderTest.HelloWorld bail without oopifs.

components/html_viewer/ax_provider_apptest.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/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "components/view_manager/public/cpp/tests/view_manager_test_base.h"
@@ skipping 39 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestFrameTreeServer);
 };
 
 }  // namespace
 
 using AXProviderTest = ViewManagerTestBase;
 
 TEST_F(AXProviderTest, HelloWorld) {
-  // TODO(msw|sky): Fix flaky timeouts without oopifs; http://crbug.com/504917
-  if (!EnableOOPIFs())
-    return;
-
   // Start a test server for net/data/test.html access.
   net::SpawnedTestServer server(
       net::SpawnedTestServer::TYPE_HTTP, net::SpawnedTestServer::kLocalhost,
       base::FilePath(FILE_PATH_LITERAL("net/data")));
   ASSERT_TRUE(server.Start());
 
   // Connect to the URL through the mojo:html_viewer content handler.
   const uint16_t assigned_port = server.host_port_pair().port();
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From(
@@ skipping 33 matching lines @@
                          EXPECT_TRUE(QuitRunLoop());
                        });
   ASSERT_TRUE(DoRunLoopWithTimeout());
 
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "Hello "));
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "World!"));
   EXPECT_FALSE(AxTreeContainsText(ax_tree, "foo"));
 }
 
 }  // namespace mojo