Permission Action Reporting: Fix flaky Browsertest

chrome/browser/safe_browsing/permission_reporter_browsertest.cc

 // Copyright 2016 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/safe_browsing/permission_reporter.h"
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/simple_test_clock.h"
@@ skipping 82 matching lines @@
 
  private:
   std::unique_ptr<MockPermissionPromptFactory> mock_permission_prompt_factory_;
 
   // Owned by permission reporter.
   MockPermissionReportSender* mock_report_sender_;
 };
 
 // Test that permission action report will be sent if the user is opted into it.
 IN_PROC_BROWSER_TEST_F(PermissionReporterBrowserTest,
-                       DISABLED_PermissionActionReporting) {
+                       PermissionActionReporting) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(), embedded_test_server()->GetURL("/permissions/request.html"),
       1);
 
   prompt_factory()->WaitForPermissionBubble();
   EXPECT_TRUE(prompt_factory()->is_visible());
 
   AcceptBubble();
 
   EXPECT_FALSE(prompt_factory()->is_visible());
+
+  // We need to wait for the report to be sent on the IO thread.
+  mock_report_sender()->WaitForReportSet();
   EXPECT_EQ(1, mock_report_sender()->GetAndResetNumberOfReportsSent());
 
   PermissionReport permission_report;
   ASSERT_TRUE(
       permission_report.ParseFromString(mock_report_sender()->latest_report()));
   EXPECT_EQ(PermissionReport::GEOLOCATION, permission_report.permission());
   EXPECT_EQ(PermissionReport::GRANTED, permission_report.action());
   EXPECT_EQ(embedded_test_server()->base_url().spec(),
             permission_report.origin());
   EXPECT_EQ(PermissionReport::DESKTOP_PLATFORM,
             permission_report.platform_type());
   EXPECT_EQ(PermissionReport::NO_GESTURE, permission_report.gesture());
 }
 
 }  // namespace safe_browsing