Make Hands-Off Zero-Touch Enrollment compatibile with tests

chromeos/network/portal_detector/network_portal_detector.h

Index: chromeos/network/portal_detector/network_portal_detector.h
diff --git a/chromeos/network/portal_detector/network_portal_detector.h b/chromeos/network/portal_detector/network_portal_detector.h
index f5cf75646a90af632d0f72049089c77fda3bc56c..b65e8c27a98cc0ed16a490fa2694af6d814f95d3 100644
--- a/chromeos/network/portal_detector/network_portal_detector.h
+++ b/chromeos/network/portal_detector/network_portal_detector.h
@@ -138,8 +138,15 @@ CHROMEOS_EXPORT void SetNetworkPortalDetector(
 // and deleted by Shutdown().
 CHROMEOS_EXPORT void InitializeForTesting(
     NetworkPortalDetector* network_portal_detector);
+
+// Returns true if the network portal detector has been set for testing.
 CHROMEOS_EXPORT bool SetForTesting();
 
+// Make it globally known that testing is over.
+// Should be called in the TearDown of any test where InitializeForTesting was
+// used.
+CHROMEOS_EXPORT void EndTest();

[xiyuan, 2017/05/15 17:24:23]

This is not necessary and resetting the flag separately is error prone. If
leaving the flag unchanged makes you feel uncomfortable, we can reset it in
Shutdown().

[kumarniranjan, 2017/05/15 22:08:22]

Thanks for catching this. I think I used to need it at some point during
development but forgot to delete it.

Do you think we should modify network_portal_detector::Shutdown to reset this
flag? I'm okay either way.

[xiyuan, 2017/05/15 22:30:20]

I am okay leaving it as-is.

[kumarniranjan, 2017/05/15 23:21:53]

Okay, I will leave it as-is. Smaller CLs are better.

+
 }  // namespace network_portal_detector
 
 }  // namespace chromeos