NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

Index: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
index e6fba5bcc15be9f7ed7eb83a1f0f984f9ce6c404..f58f60f284d591e701b7625c6e1579238c1ab403 100644
--- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
@@ -16,6 +16,7 @@
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
 #include "chromeos/dbus/mock_session_manager_client.h"
 #include "chromeos/dbus/mock_update_engine_client.h"
+#include "chromeos/network/network_state.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -44,6 +45,8 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
   UpdateScreenTest() : WizardInProcessBrowserTest("update"),
                        mock_update_engine_client_(NULL),
                        mock_network_library_(NULL),
+                       stub_ethernet_(kDefaultEthernetServicePath),
+                       stub_wifi_(kDefaultWifiServicePath),
                        network_portal_detector_stub_(NULL) {
   }
 
@@ -78,29 +81,10 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
         .WillOnce(Invoke(RequestUpdateCheckSuccess));
 
     mock_network_library_ = cros_mock_->mock_network_library();
-    stub_ethernet_.reset(new EthernetNetwork(kDefaultEthernetServicePath));
-    stub_wifi_.reset(new WifiNetwork(kDefaultWifiServicePath));
     EXPECT_CALL(*mock_network_library_, SetDefaultCheckPortalList())
         .Times(1);
-    EXPECT_CALL(*mock_network_library_, AddNetworkManagerObserver(_))
-        .Times(1)
-        .RetiresOnSaturation();
-    EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
-        .Times(AnyNumber());
-    EXPECT_CALL(*mock_network_library_, FindWifiDevice())
-        .Times(AnyNumber());
-    EXPECT_CALL(*mock_network_library_, FindEthernetDevice())
-        .Times(AnyNumber());
     EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
         .Times(AnyNumber());
-    EXPECT_CALL(*mock_network_library_,
-                FindNetworkByPath(kDefaultEthernetServicePath))
-        .Times(AnyNumber())
-        .WillRepeatedly((Return(stub_ethernet_.get())));
-    EXPECT_CALL(*mock_network_library_,
-                FindNetworkByPath(kDefaultWifiServicePath))
-        .Times(AnyNumber())
-        .WillRepeatedly((Return(stub_wifi_.get())));
 
     // Setup network portal detector to return online state for both
     // ethernet and wifi networks. Ethernet is an active network by
@@ -111,9 +95,9 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
     NetworkPortalDetector::CaptivePortalState online_state;
     online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
     online_state.response_code = 204;
-    SetActiveNetwork(stub_ethernet_.get());
-    SetDetectionResults(stub_ethernet_.get(), online_state);
-    SetDetectionResults(stub_wifi_.get(), online_state);
+    SetDefaultNetwork(&stub_ethernet_);
+    SetDetectionResults(&stub_ethernet_, online_state);
+    SetDetectionResults(&stub_wifi_, online_state);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
@@ -143,13 +127,13 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
     DBusThreadManager::Shutdown();
   }
 
-  void SetActiveNetwork(const Network* network) {
+  void SetDefaultNetwork(const NetworkState* network) {
     DCHECK(network_portal_detector_stub_);
-    network_portal_detector_stub_->SetActiveNetworkForTesting(network);
+    network_portal_detector_stub_->SetDefaultNetworkForTesting(network);
   }
 
   void SetDetectionResults(
-      const Network* network,
+      const NetworkState* network,
       const NetworkPortalDetector::CaptivePortalState& state) {
     DCHECK(network_portal_detector_stub_);
     network_portal_detector_stub_->SetDetectionResultsForTesting(network,
@@ -163,8 +147,8 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
 
   MockUpdateEngineClient* mock_update_engine_client_;
   MockNetworkLibrary* mock_network_library_;
-  scoped_ptr<Network> stub_ethernet_;
-  scoped_ptr<Network> stub_wifi_;
+  NetworkState stub_ethernet_;
+  NetworkState stub_wifi_;
   scoped_ptr<MockScreenObserver> mock_screen_observer_;
   scoped_ptr<MockErrorScreenActor> mock_error_screen_actor_;
   scoped_ptr<MockErrorScreen> mock_error_screen_;
@@ -301,7 +285,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTemproraryOfflineNetwork) {
   NetworkPortalDetector::CaptivePortalState portal_state;
   portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
   portal_state.response_code = 200;
-  SetDetectionResults(stub_ethernet_.get(), portal_state);
+  SetDetectionResults(&stub_ethernet_, portal_state);
 
   // Update screen will show error message about portal state because
   // ethernet is behind captive portal.
@@ -321,7 +305,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTemproraryOfflineNetwork) {
   NetworkPortalDetector::CaptivePortalState online_state;
   online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
   online_state.response_code = 204;
-  SetDetectionResults(stub_ethernet_.get(), online_state);
+  SetDetectionResults(&stub_ethernet_, online_state);
 
   // Second notification from portal detector will be about online state,
   // so update screen will hide error message and proceed to update.
@@ -347,7 +331,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTwoOfflineNetworks) {
   NetworkPortalDetector::CaptivePortalState portal_state;
   portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
   portal_state.response_code = 200;
-  SetDetectionResults(stub_ethernet_.get(), portal_state);
+  SetDetectionResults(&stub_ethernet_, portal_state);
 
   // Update screen will show error message about portal state because
   // ethernet is behind captive portal.
@@ -369,8 +353,8 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTwoOfflineNetworks) {
   proxy_state.status =
       NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
   proxy_state.response_code = -1;
-  SetActiveNetwork(stub_wifi_.get());
-  SetDetectionResults(stub_wifi_.get(), proxy_state);
+  SetDefaultNetwork(&stub_wifi_);
+  SetDetectionResults(&stub_wifi_, proxy_state);
 
   // Update screen will show message about proxy error because wifie
   // network requires proxy authentication.