Refactor NetworkPortalDetector and NetworkPortalNotificationController.

chromeos/network/portal_detector/network_portal_detector.cc

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 5cfdcaec223a046325a78f162673612254a013c8..a9af6acfa62784e6ea4632aa108eafd37621fe63 100644
--- a/chromeos/network/portal_detector/network_portal_detector.cc
+++ b/chromeos/network/portal_detector/network_portal_detector.cc
@@ -21,7 +21,8 @@ const char kCaptivePortalStatusUnrecognized[] = "Unrecognized";
 
 // static
 bool NetworkPortalDetector::set_for_testing_ = false;
-NetworkPortalDetector* NetworkPortalDetector::network_portal_detector_ = NULL;
+NetworkPortalDetector* NetworkPortalDetector::network_portal_detector_ =
+    nullptr;
 
 // static
 void NetworkPortalDetector::InitializeForTesting(
@@ -29,12 +30,11 @@ void NetworkPortalDetector::InitializeForTesting(
   if (network_portal_detector) {
     CHECK(!set_for_testing_)
         << "NetworkPortalDetector::InitializeForTesting is called twice";
-    CHECK(network_portal_detector);
     delete network_portal_detector_;
     network_portal_detector_ = network_portal_detector;
     set_for_testing_ = true;
   } else {
-    network_portal_detector_ = NULL;
+    network_portal_detector_ = nullptr;
     set_for_testing_ = false;
   }
 }
@@ -49,7 +49,7 @@ void NetworkPortalDetector::Shutdown() {
   CHECK(network_portal_detector_ || set_for_testing_)
       << "NetworkPortalDetector::Shutdown() called without Initialize()";
   delete network_portal_detector_;
-  network_portal_detector_ = NULL;
+  network_portal_detector_ = nullptr;
 }
 
 // static
@@ -79,47 +79,4 @@ std::string NetworkPortalDetector::CaptivePortalStatusString(
   return kCaptivePortalStatusUnrecognized;
 }
 
-// NetworkPortalDetectorStubImpl
-
-NetworkPortalDetectorStubImpl::NetworkPortalDetectorStubImpl() {
-}
-
-NetworkPortalDetectorStubImpl::~NetworkPortalDetectorStubImpl() {
-}
-
-void NetworkPortalDetectorStubImpl::AddObserver(Observer* /* observer */) {
-}
-
-void NetworkPortalDetectorStubImpl::AddAndFireObserver(Observer* observer) {
-  if (observer)
-    observer->OnPortalDetectionCompleted(NULL, CaptivePortalState());
-}
-
-void NetworkPortalDetectorStubImpl::RemoveObserver(Observer* /* observer */) {
-}
-
-NetworkPortalDetector::CaptivePortalState
-NetworkPortalDetectorStubImpl::GetCaptivePortalState(
-    const std::string& /* service_path */) {
-  return CaptivePortalState();
-}
-
-bool NetworkPortalDetectorStubImpl::IsEnabled() {
-  return false;
-}
-
-void NetworkPortalDetectorStubImpl::Enable(bool /* start_detection */) {
-}
-
-bool NetworkPortalDetectorStubImpl::StartDetectionIfIdle() {
-  return false;
-}
-
-void NetworkPortalDetectorStubImpl::SetStrategy(
-    PortalDetectorStrategy::StrategyId /* id */) {
-}
-
-void NetworkPortalDetectorStubImpl::OnLockScreenRequest() {
-}
-
 }  // namespace chromeos