| Index: chromeos/network/portal_detector/network_portal_detector.cc
|
| diff --git a/chromeos/network/portal_detector/network_portal_detector.cc b/chromeos/network/portal_detector/network_portal_detector.cc
|
| index 6fcbb3b4eb433a0472c82a1f392de30adcd1c719..75f69fa1bd412a14c8a9a21178556d8ed75af8b8 100644
|
| --- a/chromeos/network/portal_detector/network_portal_detector.cc
|
| +++ b/chromeos/network/portal_detector/network_portal_detector.cc
|
| @@ -47,7 +47,8 @@ namespace network_portal_detector {
|
|
|
| void InitializeForTesting(NetworkPortalDetector* network_portal_detector) {
|
| if (network_portal_detector) {
|
| - CHECK(!set_for_testing_) << "InitializeForTesting is called twice";
|
| + // InitializeForTesting is called twice
|
| + CHECK(!set_for_testing_);
|
| delete network_portal_detector_;
|
| network_portal_detector_ = network_portal_detector;
|
| set_for_testing_ = true;
|
| @@ -66,20 +67,21 @@ bool SetForTesting() {
|
| }
|
|
|
| void Shutdown() {
|
| - CHECK(network_portal_detector_ || set_for_testing_)
|
| - << "Shutdown() called without Initialize()";
|
| + // Shutdown() called without Initialize()
|
| + CHECK(network_portal_detector_ || set_for_testing_);
|
| delete network_portal_detector_;
|
| network_portal_detector_ = nullptr;
|
| }
|
|
|
| NetworkPortalDetector* GetInstance() {
|
| - CHECK(network_portal_detector_) << "GetInstance() called before Initialize()";
|
| + // GetInstance() called before Initialize()
|
| + CHECK(network_portal_detector_);
|
| return network_portal_detector_;
|
| }
|
|
|
| void SetNetworkPortalDetector(NetworkPortalDetector* network_portal_detector) {
|
| - CHECK(!network_portal_detector_)
|
| - << "NetworkPortalDetector was initialized twice.";
|
| + // NetworkPortalDetector was initialized twice.
|
| + CHECK(!network_portal_detector_);
|
| NET_LOG(EVENT) << "SetNetworkPortalDetector";
|
| network_portal_detector_ = network_portal_detector;
|
| }
|
|
|