Refactor NetworkPortalDetector and NetworkPortalNotificationController.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 96098f5124e86f2a6e4a77e6ca782848434290be..877057ff8ac3df789d6f437f8572889aeda17246 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -550,10 +550,9 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
   // NetworkStateHandler and initiates captive portal detection for
   // active networks. Should be called before call to CreateSessionManager,
   // because it depends on NetworkPortalDetector.
-  NetworkPortalDetectorImpl::Initialize(
+  NetworkPortalDetector::Initialize(
       g_browser_process->system_request_context());
   {
-    NetworkPortalDetector* detector = NetworkPortalDetector::Get();
 #if defined(GOOGLE_CHROME_BUILD)
     bool is_official_build = true;
 #else
@@ -562,7 +561,7 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
     // Enable portal detector if EULA was previously accepted or if
     // this is an unofficial build.
     if (!is_official_build || StartupUtils::IsEulaAccepted())
-      detector->Enable(true);
+      NetworkPortalDetector::Get()->Enable(true);
   }
 
   // Initialize input methods.