Refactor NetworkPortalDetector and NetworkPortalNotificationController.

chrome/browser/chromeos/net/network_portal_notification_controller.cc

 // 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.
 
 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "components/captive_portal/captive_portal_detector.h"
 #include "components/user_manager/user_manager.h"
 #include "extensions/browser/api/networking_config/networking_config_service.h"
 #include "extensions/browser/api/networking_config/networking_config_service_factory.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
@@ skipping 179 matching lines @@
     "chrome://net/network_portal_detector";
 
 // static
 const char NetworkPortalNotificationController::kNotificationMetric[] =
     "CaptivePortal.Notification.Status";
 
 // static
 const char NetworkPortalNotificationController::kUserActionMetric[] =
     "CaptivePortal.Notification.UserAction";
 
-NetworkPortalNotificationController::NetworkPortalNotificationController()
-    : dialog_(nullptr),
-      ignore_no_network_for_testing_(false),
-      weak_factory_(this) {}
+NetworkPortalNotificationController::NetworkPortalNotificationController(
+    NetworkPortalDetector* network_portal_detector)
+    : network_portal_detector_(network_portal_detector), weak_factory_(this) {
+  if (NetworkHandler::IsInitialized()) {

[stevenjb, 2015/09/17 20:45:53]

This should probably be a DCHECK, it would be bad if we create this before NSH.

[achuithb, 2015/09/17 22:03:33]

It's NULL for unit tests. I've added a comment.

+    NetworkHandler::Get()->network_state_handler()->AddObserver(this,
+                                                                FROM_HERE);
+  }
+  if (network_portal_detector_)
+    network_portal_detector_->AddObserver(this);
+}
 
 NetworkPortalNotificationController::~NetworkPortalNotificationController() {
+  if (network_portal_detector_)
+    network_portal_detector_->RemoveObserver(this);
+  if (NetworkHandler::IsInitialized()) {
+    NetworkHandler::Get()->network_state_handler()->RemoveObserver(this,
+                                                                   FROM_HERE);
+  }
 }
 
 void NetworkPortalNotificationController::DefaultNetworkChanged(
     const NetworkState* network) {
   if (!network)
     return;
   Profile* profile = GetProfileForPrimaryUser();
   extensions::NetworkingConfigService* networking_config_service =
       GetNetworkingConfigService(profile);
   if (!networking_config_service)
@@ skipping 173 matching lines @@
   if (dialog_)
     dialog_->Close();
 }
 
 const NetworkPortalWebDialog*
 NetworkPortalNotificationController::GetDialogForTesting() const {
   return dialog_;
 }
 
 }  // namespace chromeos