Add CheckPortalList manager property to NetworkStateHandler

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 361523c2c260e07cd6b3cc6bfe5d1c396d53070f..b13c0d1fbd7afea355c71e415bb4d56305ec1264 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -7,8 +7,6 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 #include "chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
@@ -31,6 +29,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/chromeos_test_utils.h"
+#include "chromeos/network/network_state_handler.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -116,13 +115,14 @@ class WizardControllerFlowTest : public WizardControllerTest {
   WizardControllerFlowTest() {}
   // Overriden from InProcessBrowserTest:
   virtual void SetUpOnMainThread() OVERRIDE {
+    NetworkHandler::Get()->network_state_handler()->InitShillPropertyHandler();

[stevenjb, 2013/05/30 01:43:13]

This should not be necessary

[gauravsh, 2013/05/30 18:27:37]

Weird. If I remove this, the test starts failing. And I confirmed that
InitShillPropertyHandler is already being called as part of
NetworkHandler::Init().

[stevenjb, 2013/05/30 18:43:53]

How does it fail exactly?

     WizardControllerTest::SetUpOnMainThread();
 
     // Make sure that OOBE is run as an "official" build.
     WizardController::default_controller()->is_official_build_ = true;
 
     // Clear portal list (as it is by default in OOBE).
-    CrosLibrary::Get()->GetNetworkLibrary()->SetCheckPortalList("");
+    NetworkHandler::Get()->network_state_handler()->SetCheckPortalList("");
 
     // Set up the mocks for all screens.
     MOCK(mock_network_screen_, network_screen_,
@@ -179,8 +179,9 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
   OnExit(ScreenObserver::UPDATE_INSTALLED);
 
   EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
-  EXPECT_EQ("ethernet,wifi,cellular",
-            CrosLibrary::Get()->GetNetworkLibrary()->GetCheckPortalList());
+  EXPECT_EQ(
+      "ethernet,wifi,cellular",
+      NetworkHandler::Get()->network_state_handler()->check_portal_list());
 }
 
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
@@ -235,12 +236,14 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowSkipUpdateEnroll) {
   EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
   EXPECT_CALL(*mock_enrollment_screen_, Hide()).Times(0);
   OnExit(ScreenObserver::EULA_ACCEPTED);
+  content::RunAllPendingInMessageLoop();
 
   EXPECT_EQ(WizardController::default_controller()->GetEnrollmentScreen(),
             WizardController::default_controller()->current_screen());
   EXPECT_TRUE(ExistingUserController::current_controller() == NULL);
-  EXPECT_EQ("ethernet,wifi,cellular",
-            CrosLibrary::Get()->GetNetworkLibrary()->GetCheckPortalList());
+  EXPECT_EQ(
+      "ethernet,wifi,cellular",
+      NetworkHandler::Get()->network_state_handler()->check_portal_list());
 }
 
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowEulaDeclined) {