Refactor NetworkPortalDetector and NetworkPortalNotificationController.

chrome/browser/chromeos/net/network_portal_notification_controller_unittest.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 "base/command_line.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_state.h"
@@ skipping 46 matching lines @@
   unsigned update_count_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationObserver);
 };
 
 }  // namespace
 
 class NetworkPortalNotificationControllerTest : public testing::Test {
  public:
   NetworkPortalNotificationControllerTest()
-      : user_manager_enabler_(new chromeos::FakeChromeUserManager()) {}
+      : user_manager_enabler_(new chromeos::FakeChromeUserManager()),
+        controller_(nullptr) {}
   ~NetworkPortalNotificationControllerTest() override {}
 
   void SetUp() override {
     base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
     cl->AppendSwitch(switches::kEnableNetworkPortalNotification);
     MessageCenter::Initialize();
     MessageCenter::Get()->AddObserver(&observer_);
   }
 
   void TearDown() override {
@@ skipping 115 matching lines @@
   // Network was switched (by shill or by user) to wifi1. Notification
   // should be displayed.
   OnPortalDetectionCompleted(&wifi1, portal_state);
   ASSERT_TRUE(HasNotification());
   EXPECT_EQ(2u, observer().add_count());
   EXPECT_EQ(1u, observer().remove_count());
   EXPECT_EQ(1u, observer().update_count());
 }
 
 }  // namespace chromeos