Revert 64888 - Push for ers:...

chrome/browser/chromeos/login/network_screen_browsertest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
@@ skipping 70 matching lines @@
     EXPECT_CALL(*mock_network_library_, cellular_connecting())
         .Times(3)
         .WillRepeatedly(Return(false));
     EXPECT_CALL(*mock_network_library_, Connected())
         .Times(4)
         .WillRepeatedly(Return(false));
     // Add a Connecting for prewarming auth url check.
     EXPECT_CALL(*mock_network_library_, Connecting())
         .Times(2)
         .WillRepeatedly(Return(false));
+    // Add an AddObserver for prewarming auth url check.
     EXPECT_CALL(*mock_network_library_, AddObserver(_))
         .Times(3);
     EXPECT_CALL(*mock_network_library_, RemoveObserver(_))
-    // Add an Observer for prewarming auth url check.
-    EXPECT_CALL(*mock_network_library_, AddNetworkManagerObserver(_))
-        .Times(3);
-    EXPECT_CALL(*mock_network_library_, RemoveNetworkManagerObserver(_))
         .Times(2);
 
     cros_mock_->SetStatusAreaMocksExpectations();
   }
 
   virtual void TearDownInProcessBrowserTestFixture() {
     CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
     cros_mock_->test_api()->SetLoginLibrary(NULL, false);
   }
 
@@ skipping 35 matching lines @@
 
   EXPECT_CALL(*mock_network_library_, ethernet_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, cellular_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, ethernet_connecting())
       .WillOnce((Return(true)));
 
-  network_screen->OnNetworkManagerChanged(mock_network_library_);
+  network_screen->NetworkChanged(mock_network_library_);
   EXPECT_FALSE(network_view->IsContinueEnabled());
   EXPECT_FALSE(network_view->IsConnecting());
 
   EXPECT_CALL(*mock_network_library_, ethernet_connected())
       .WillOnce(Return(true));
   EXPECT_CALL(*mock_network_library_, Connected())
       .WillOnce(Return(true));
 
-  network_screen->OnNetworkManagerChanged(mock_network_library_);
+  network_screen->NetworkChanged(mock_network_library_);
   EXPECT_TRUE(network_view->IsContinueEnabled());
 
   EmulateContinueButtonExit(network_screen);
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Wifi) {
   ASSERT_TRUE(controller());
   NetworkScreen* network_screen = controller()->GetNetworkScreen();
   ASSERT_TRUE(network_screen != NULL);
   ASSERT_EQ(network_screen, controller()->current_screen());
 
   NetworkSelectionView* network_view = network_screen->view();
   ASSERT_TRUE(network_view != NULL);
   EXPECT_FALSE(network_view->IsContinueEnabled());
 
   EXPECT_CALL(*mock_network_library_, ethernet_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, cellular_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, ethernet_connecting())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connecting())
       .WillOnce((Return(true)));
   scoped_ptr<WifiNetwork> wifi(new WifiNetwork());
   EXPECT_CALL(*mock_network_library_, wifi_network())
       .WillOnce(Return(wifi.get()));
 
-  network_screen->OnNetworkManagerChanged(mock_network_library_);
+  network_screen->NetworkChanged(mock_network_library_);
   EXPECT_FALSE(network_view->IsContinueEnabled());
   EXPECT_FALSE(network_view->IsConnecting());
 
   EXPECT_CALL(*mock_network_library_, ethernet_connected())
       .WillOnce(Return(true));
   EXPECT_CALL(*mock_network_library_, Connected())
       .WillOnce(Return(true));
 
-  network_screen->OnNetworkManagerChanged(mock_network_library_);
+  network_screen->NetworkChanged(mock_network_library_);
   EXPECT_TRUE(network_view->IsContinueEnabled());
 
   EmulateContinueButtonExit(network_screen);
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Cellular) {
   ASSERT_TRUE(controller());
   NetworkScreen* network_screen = controller()->GetNetworkScreen();
   ASSERT_TRUE(network_screen != NULL);
   ASSERT_EQ(network_screen, controller()->current_screen());
@@ skipping 11 matching lines @@
   EXPECT_CALL(*mock_network_library_, ethernet_connecting())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connecting())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, cellular_connecting())
       .WillOnce((Return(true)));
   scoped_ptr<CellularNetwork> cellular(new CellularNetwork());
   EXPECT_CALL(*mock_network_library_, cellular_network())
       .WillOnce(Return(cellular.get()));
 
-  network_screen->OnNetworkManagerChanged(mock_network_library_);
+  network_screen->NetworkChanged(mock_network_library_);
   EXPECT_FALSE(network_view->IsContinueEnabled());
   EXPECT_FALSE(network_view->IsConnecting());
 
   EXPECT_CALL(*mock_network_library_, ethernet_connected())
       .WillOnce(Return(true));
   EXPECT_CALL(*mock_network_library_, Connected())
       .WillOnce(Return(true));
 
-  network_screen->OnNetworkManagerChanged(mock_network_library_);
+  network_screen->NetworkChanged(mock_network_library_);
   EXPECT_TRUE(network_view->IsContinueEnabled());
 
   EmulateContinueButtonExit(network_screen);
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Timeout) {
   ASSERT_TRUE(controller());
   NetworkScreen* network_screen = controller()->GetNetworkScreen();
   ASSERT_TRUE(network_screen != NULL);
   ASSERT_EQ(network_screen, controller()->current_screen());
@@ skipping 11 matching lines @@
   EXPECT_CALL(*mock_network_library_, ethernet_connecting())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connecting())
       .WillOnce((Return(true)));
   scoped_ptr<WifiNetwork> wifi(new WifiNetwork());
   EXPECT_CALL(*mock_network_library_, wifi_network())
       .WillOnce(Return(wifi.get()));
   EXPECT_CALL(*mock_network_library_, Connected())
       .WillOnce(Return(false));
 
-  network_screen->OnNetworkManagerChanged(mock_network_library_);
+  network_screen->NetworkChanged(mock_network_library_);
   EXPECT_FALSE(network_view->IsContinueEnabled());
   EXPECT_FALSE(network_view->IsConnecting());
 
   network_screen->OnConnectionTimeout();
   EXPECT_FALSE(network_view->IsContinueEnabled());
   EXPECT_FALSE(network_view->IsConnecting());
 
   // Close infobubble with error message - it makes test stable.
   network_screen->ClearErrors();
 }
 
 }  // namespace chromeos