Fix flaky NetworkingPrivateChromeOSApiTest.EnabledNetworkTypes

We will need to maintain the networkingPrivate api tests for
networkingOnc (which is just an alias of a subset of networkingPrivate)
even with the mojo api. This fixes the one disabled flaky test.

Bug: 927450
Change-Id: Ia76c1de42adeb31c20c02990054278c5d867d8aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1820099Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699147}

chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc

@@ -550,10 +550,9 @@ IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest,
   EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_;
 }
 
-// TODO(crbug.com/928778): Flaky on CrOS.
-IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest,
-                       DISABLED_EnabledNetworkTypes) {
-  EXPECT_TRUE(RunNetworkingSubtest("enabledNetworkTypes")) << message_;
+IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, EnabledNetworkTypes) {
+  EXPECT_TRUE(RunNetworkingSubtest("enabledNetworkTypesDisable")) << message_;
+  EXPECT_TRUE(RunNetworkingSubtest("enabledNetworkTypesEnable")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, GetDeviceStates) {

chrome/test/data/extensions/api_test/networking_private/chromeos/test.js

@@ -455,31 +455,38 @@ var availableTests = [
         }], result);
       }));
   },
-  function enabledNetworkTypes() {
-    // Note: We call getEnabledNetworkTypes twice after each enable/dsiable
-    // to ensure that Chrome has processed the command (since enable/disable
-    // are 'synchronous' even though the action of enabling/disabling is not).
-    chrome.networkingPrivate.getEnabledNetworkTypes(
-        callbackPass(function(types) {
-          assertTrue(types.indexOf('WiFi') >= 0);
-          chrome.networkingPrivate.disableNetworkType('WiFi');
-          chrome.networkingPrivate.getEnabledNetworkTypes(
-              callbackPass(function(types) {
-                chrome.networkingPrivate.getEnabledNetworkTypes(
-                    callbackPass(function(types) {
-                      assertFalse(types.indexOf('WiFi') >= 0);
-                      chrome.networkingPrivate.enableNetworkType('WiFi');
-                      chrome.networkingPrivate.getEnabledNetworkTypes(
-                          callbackPass(function(types) {
-                            chrome.networkingPrivate.getEnabledNetworkTypes(
-                                callbackPass(function(types) {
-                                  assertTrue(types.indexOf('WiFi') >= 0);
-                                }));
-                          }));
-                    }));
-              }));
-        }));
+  function enabledNetworkTypesDisable() {
+    chrome.networkingPrivate.getEnabledNetworkTypes(function(types) {
+      assertTrue(types.indexOf('WiFi') >= 0);
+      var listener = callbackPass(function() {
+        chrome.networkingPrivate.onDeviceStateListChanged.removeListener(
+          listener);
+        chrome.networkingPrivate.getEnabledNetworkTypes(
+          callbackPass(function(types2) {
+            assertFalse(types2.indexOf('WiFi') >= 0);
+          }));
+      });
+      chrome.networkingPrivate.onDeviceStateListChanged.addListener(listener);
+      chrome.networkingPrivate.disableNetworkType('WiFi');
+    });
   },
+
+  function enabledNetworkTypesEnable() {
+    chrome.networkingPrivate.getEnabledNetworkTypes(function(types) {
+      assertFalse(types.indexOf('WiFi') >= 0);
+      var listener = callbackPass(function() {
+        chrome.networkingPrivate.onDeviceStateListChanged.removeListener(
+          listener);
+        chrome.networkingPrivate.getEnabledNetworkTypes(
+          callbackPass(function(types2) {
+            assertTrue(types2.indexOf('WiFi') >= 0);
+          }));
+      });
+      chrome.networkingPrivate.onDeviceStateListChanged.addListener(listener);
+      chrome.networkingPrivate.enableNetworkType('WiFi');
+    });
+  },
+
   function getDeviceStates() {
     chrome.networkingPrivate.getDeviceStates(callbackPass(function(result) {
       assertEq([