Linux native notifications: fix Tsan failure in NotifyAndCloseFormat

chrome/browser/notifications/notification_platform_bridge_linux_unittest.cc

 // Copyright 2017 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 "chrome/browser/notifications/notification_platform_bridge_linux.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 133 matching lines @@
 
     EXPECT_CALL(
         *mock_notification_proxy_.get(),
         ConnectToSignal(kFreedesktopNotificationsName, "ActionInvoked", _, _))
         .WillOnce(RegisterSignalCallback(&action_invoked_callback_));
 
     EXPECT_CALL(*mock_notification_proxy_.get(),
                 ConnectToSignal(kFreedesktopNotificationsName,
                                 "NotificationClosed", _, _))
         .WillOnce(RegisterSignalCallback(&notification_closed_callback_));
-
-    notification_bridge_linux_ =
-        base::WrapUnique(new NotificationPlatformBridgeLinux(mock_bus_));
   }
 
   void TearDown() override {
     EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock());
     notification_bridge_linux_->CleanUp();
     content::RunAllBlockingPoolTasksUntilIdle();
     notification_bridge_linux_.reset();
     mock_notification_proxy_ = nullptr;
     mock_bus_ = nullptr;
   }
 
  protected:
+  void CreateNotificationBridgeLinux() {
+    notification_bridge_linux_ =
+        base::WrapUnique(new NotificationPlatformBridgeLinux(mock_bus_));
+  }
+
   content::TestBrowserThreadBundle thread_bundle_;
 
   scoped_refptr<dbus::MockBus> mock_bus_;
   scoped_refptr<dbus::MockObjectProxy> mock_notification_proxy_;
 
   base::Callback<void(dbus::Signal*)> action_invoked_callback_;
   base::Callback<void(dbus::Signal*)> notification_closed_callback_;
 
   std::unique_ptr<NotificationPlatformBridgeLinux> notification_bridge_linux_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NotificationPlatformBridgeLinuxTest);
 };
 
-TEST_F(NotificationPlatformBridgeLinuxTest, SetUpAndTearDown) {}
+TEST_F(NotificationPlatformBridgeLinuxTest, SetUpAndTearDown) {
+  CreateNotificationBridgeLinux();
+}
 
-// Frequently triggers a data race. Disabled as flaky: https://crbug.com/719485
-TEST_F(NotificationPlatformBridgeLinuxTest, DISABLED_NotifyAndCloseFormat) {
+TEST_F(NotificationPlatformBridgeLinuxTest, NotifyAndCloseFormat) {
   EXPECT_CALL(*mock_notification_proxy_.get(),
               MockCallMethodAndBlock(Calls("Notify"), _))
       .WillOnce(OnNotify(1));
+  EXPECT_CALL(*mock_notification_proxy_.get(),
+              MockCallMethodAndBlock(Calls("CloseNotification"), _))
+      .WillOnce(OnCloseNotification());
+
+  CreateNotificationBridgeLinux();
   notification_bridge_linux_->Display(NotificationCommon::PERSISTENT, "", "",
                                       false,
                                       CreateNotification("id1", "", "", ""));
-
-  EXPECT_CALL(*mock_notification_proxy_.get(),
-              MockCallMethodAndBlock(Calls("CloseNotification"), _))
-      .WillOnce(OnCloseNotification());
   notification_bridge_linux_->Close("", "");
 }