Make Hands-Off Zero-Touch Enrollment compatibile with tests

chromeos/network/portal_detector/network_portal_detector.h

 // Copyright 2014 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.
 
 #ifndef CHROMEOS_NETWORK_PORTAL_DETECTOR_NETWORK_PORTAL_DETECTOR_H_
 #define CHROMEOS_NETWORK_PORTAL_DETECTOR_NETWORK_PORTAL_DETECTOR_H_
 
 #include "base/macros.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"
@@ skipping 120 matching lines @@
 CHROMEOS_EXPORT void Shutdown();
 
 CHROMEOS_EXPORT void SetNetworkPortalDetector(
     NetworkPortalDetector* network_portal_detector);
 
 // Initializes network portal detector for testing. The
 // |network_portal_detector| will be owned by the internal pointer
 // 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
 
 #endif  // CHROMEOS_NETWORK_PORTAL_DETECTOR_NETWORK_PORTAL_DETECTOR_H_