Fix SettingsTestCase.testBreakpadReportingFirstLaunch on Official

ios/chrome/browser/ui/settings/settings_egtest.mm

 // 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.
 
 #import <EarlGrey/EarlGrey.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 445 matching lines @@
 - (void)openPasswordSettings {
   // Open settings and verify data in the view controller.
   [ChromeEarlGreyUI openToolsMenu];
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(kToolsMenuSettingsId)]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:PasswordsButton()]
       performAction:grey_tap()];
 }
 
+- (void)setMetricsReportingEnabled:(BOOL)reportingEnabled
+                          wifiOnly:(BOOL)wifiOnly {
+  chrome_test_util::SetBooleanLocalStatePref(
+      metrics::prefs::kMetricsReportingEnabled, reportingEnabled);
+  chrome_test_util::SetBooleanLocalStatePref(prefs::kMetricsReportingWifiOnly,
+                                             wifiOnly);
+  // Breakpad uses dispatch_async to update its state. Wait to get to a
+  // consistent state.
+  [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
+}
+
 // Checks for a given service that it is both recording and uploading, where
 // appropriate.
 - (void)assertMetricsServiceEnabled:(MetricsServiceType)serviceType {
   switch (serviceType) {
     case kMetrics:
       GREYAssertTrue(chrome_test_util::IsMetricsRecordingEnabled(),
                      @"Metrics recording should be enabled.");
       GREYAssertTrue(chrome_test_util::IsMetricsReportingEnabled(),
                      @"Metrics reporting should be enabled.");
       break;
@@ skipping 75 matching lines @@
   // kMetricsReportingEnabled ON and kMetricsReportingWifiOnly ON
   //  - Services record data and upload data only when the device is using
   //    a wifi connection.  Note:  rather than checking for wifi, the code
   //    checks for a cellular network (wwan).  wwan != wifi.  So if wwan is
   //    true, services do not upload any data.
 
   // kMetricsReportingEnabled ON and kMetricsReportingWifiOnly OFF
   //  - Services record data and upload data.
 
   // kMetricsReportingEnabled OFF and kMetricsReportingWifiOnly OFF
-  chrome_test_util::SetBooleanLocalStatePref(
-      metrics::prefs::kMetricsReportingEnabled, NO);
-  chrome_test_util::SetBooleanLocalStatePref(prefs::kMetricsReportingWifiOnly,
-                                             NO);
+  [self setMetricsReportingEnabled:NO wifiOnly:NO];
   // Service should be completely disabled.
   // I.e. no recording of data, and no uploading of what's been recorded.
   [self assertMetricsServiceDisabled:serviceType];
 
   // kMetricsReportingEnabled OFF and kMetricsReportingWifiOnly ON
-  chrome_test_util::SetBooleanLocalStatePref(
-      metrics::prefs::kMetricsReportingEnabled, NO);
-  chrome_test_util::SetBooleanLocalStatePref(prefs::kMetricsReportingWifiOnly,
-                                             YES);
+  [self setMetricsReportingEnabled:NO wifiOnly:YES];
   // If kMetricsReportingEnabled is OFF, any service should remain completely
   // disabled, i.e. no uploading even if kMetricsReportingWifiOnly is ON.
   [self assertMetricsServiceDisabled:serviceType];
 
 // Split here:  Official build vs. Development build.
 // Official builds allow recording and uploading of data, honoring the
 // metrics prefs.  Development builds should never record or upload data.
 #if defined(GOOGLE_CHROME_BUILD)
   // Official build.
   // The values of the prefs and the wwan vs wifi state should be honored by
   // the services, turning on and off according to the rules laid out above.
 
   // kMetricsReportingEnabled ON and kMetricsReportingWifiOnly ON.
-  chrome_test_util::SetBooleanLocalStatePref(
-      metrics::prefs::kMetricsReportingEnabled, YES);
-  chrome_test_util::SetBooleanLocalStatePref(prefs::kMetricsReportingWifiOnly,
-                                             YES);
+  [self setMetricsReportingEnabled:YES wifiOnly:YES];
   // Service should be enabled.
   [self assertMetricsServiceEnabled:serviceType];
 
   // Set the network to use a cellular network, which should disable uploading
   // when the wifi-only flag is set.
   chrome_test_util::SetWWANStateTo(YES);

[Olivier, 2017/03/24 16:18:23]

Should we drainUntilIdle here too?

[lpromero, 2017/03/24 17:48:17]

No because under the hood this is synchronous, unlike the Breakpad stuff I
mention line 472.

[lpromero, 2017/03/28 13:31:41]

Ooops… Yes this is needed as SetWWANStateTo calls -connectionTypeChanged: which
calls -setBreakpadUploadingEnabled: which calls SetUploadingEnabled which calls
-setUploadingEnabled: which is the asynchronous one…

Adding those. I tested that locally it fixes the 2 tests.

   [self assertMetricsServiceEnabledButNotUploading:serviceType];
 
   // Turn off cellular network usage, which should enable uploading.
   chrome_test_util::SetWWANStateTo(NO);
   [self assertMetricsServiceEnabled:serviceType];
 
   // kMetricsReportingEnabled ON and kMetricsReportingWifiOnly OFF
-  chrome_test_util::SetBooleanLocalStatePref(
-      metrics::prefs::kMetricsReportingEnabled, YES);
-  chrome_test_util::SetBooleanLocalStatePref(prefs::kMetricsReportingWifiOnly,
-                                             NO);
+  [self setMetricsReportingEnabled:YES wifiOnly:NO];
   [self assertMetricsServiceEnabled:serviceType];
 #else
   // Development build.  Do not allow any recording or uploading of data.
   // Specifically, the kMetricsReportingEnabled preference is completely
   // disregarded for non-official builds, and checking its value always returns
   // false (NO).
   // This tests that no matter the state change, pref or network connection,
   // services remain disabled.
 
   // kMetricsReportingEnabled ON and kMetricsReportingWifiOnly ON
-  chrome_test_util::SetBooleanLocalStatePref(
-      metrics::prefs::kMetricsReportingEnabled, YES);
-  chrome_test_util::SetBooleanLocalStatePref(prefs::kMetricsReportingWifiOnly,
-                                             YES);
+  [self setMetricsReportingEnabled:YES wifiOnly:YES];
   // Service should remain disabled.
   [self assertMetricsServiceDisabled:serviceType];
 
   // kMetricsReportingEnabled ON and kMetricsReportingWifiOnly OFF
-  chrome_test_util::SetBooleanLocalStatePref(
-      metrics::prefs::kMetricsReportingEnabled, YES);
-  chrome_test_util::SetBooleanLocalStatePref(prefs::kMetricsReportingWifiOnly,
-                                             NO);
+  [self setMetricsReportingEnabled:YES wifiOnly:NO];
   // Service should remain disabled.
   [self assertMetricsServiceDisabled:serviceType];
 #endif
 }
 
 #pragma mark Tests
 
 // Tests that clearing the cookies through the UI does clear all of them. Use a
 // local server to navigate to a page that sets then tests a cookie, and then
 // clears the cookie and tests it is not set.
@@ skipping 394 matching lines @@
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:PrivacyButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SendUsageDataButton()]
       performAction:grey_tap()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   [self closeSubSettingsMenu];
 }
 
 @end