Fix flaky CastChannelAPI.TestOpenError test

extensions/browser/api/cast_channel/cast_channel_apitest.cc

 // Copyright 2014 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/files/file_path.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 251 matching lines @@
 #endif
 // Test loading extension, execute a open-send-close sequence, then get logs.
 IN_PROC_BROWSER_TEST_F(CastChannelAPITest, MAYBE_TestGetLogs) {
   SetUpOpenSendClose();
 
   EXPECT_TRUE(RunExtensionSubtest("cast_channel/api", "test_get_logs.html"));
 }
 
 // TODO(munjal): Win Dbg has a workaround that makes RunExtensionSubtest
 // always return true without actually running the test. Remove when fixed.
-// Flaky on mac: crbug.com/393969
-#if (defined(OS_WIN) && !defined(NDEBUG)) || defined(OS_MACOSX)
+#if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_TestOpenError DISABLED_TestOpenError
 #else
 #define MAYBE_TestOpenError TestOpenError
 #endif
 // Test the case when socket open results in an error.
 IN_PROC_BROWSER_TEST_F(CastChannelAPITest, MAYBE_TestOpenError) {
   SetUpMockCastSocket();
 
   EXPECT_CALL(*mock_cast_socket_, Connect(_))
       .WillOnce(DoAll(InvokeDelegateOnError(this, GetApi()),
                       InvokeCompletionCallback<0>(net::ERR_CONNECTION_FAILED)));
   EXPECT_CALL(*mock_cast_socket_, error_state())
       .WillRepeatedly(Return(cast_channel::CHANNEL_ERROR_CONNECT_ERROR));
   EXPECT_CALL(*mock_cast_socket_, ready_state())
       .WillRepeatedly(Return(cast_channel::READY_STATE_CLOSED));
   EXPECT_CALL(*mock_cast_socket_, Close(_))
       .WillOnce(InvokeCompletionCallback<0>(net::OK));
 
   EXPECT_TRUE(RunExtensionSubtest("cast_channel/api",
                                   "test_open_error.html"));
-
-  ResultCatcher catcher;
-  EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(CastChannelAPITest, TestOpenInvalidConnectInfo) {
   scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
   scoped_refptr<extensions::CastChannelOpenFunction> cast_channel_open_function;
 
   // Invalid URL
   // TODO(mfoltz): Remove this test case when fixing crbug.com/331905
   cast_channel_open_function = CreateOpenFunction(empty_extension);
   std::string error(utils::RunFunctionAndReturnError(
@@ skipping 82 matching lines @@
       cast_channel_send_function.get(),
       "[{\"channelId\": 1, \"url\": \"cast://127.0.0.1:8009\", "
       "\"connectInfo\": "
       "{\"ipAddress\": \"127.0.0.1\", \"port\": 8009, "
       "\"auth\": \"ssl\"}, \"readyState\": \"open\"}, "
       "{\"namespace_\": \"foo\", \"sourceId\": \"src\", "
       "\"destinationId\": \"\", \"data\": \"data\"}]",
       browser());
   EXPECT_EQ(error, "message_info.destination_id is required");
 }