Move common default expectations for network library to CrosMock

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

 // Copyright (c) 2012 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/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/net/mock_connectivity_state_helper.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
 #include "content/public/test/test_utils.h"
@@ skipping 12 matching lines @@
 
 class DummyButtonListener : public views::ButtonListener {
  public:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {}
 };
 
 class NetworkScreenTest : public WizardInProcessBrowserTest {
  public:
   NetworkScreenTest(): WizardInProcessBrowserTest("network"),
-                       mock_network_library_(NULL),
                        fake_session_manager_client_(NULL) {
   }
 
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager =
         new MockDBusThreadManagerWithoutGMock;
     DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
     fake_session_manager_client_ =
         mock_dbus_thread_manager->fake_session_manager_client();
 
     mock_connectivity_state_helper_.reset(new MockConnectivityStateHelper);
     ConnectivityStateHelper::SetForTest(mock_connectivity_state_helper_.get());
     SetDefaultMockConnectivityStateHelperExpectations();
 
     cros_mock_->InitStatusAreaMocks();
-    mock_network_library_ = cros_mock_->mock_network_library();
     cellular_.reset(new NetworkDevice("cellular"));
 
     // Minimal set of expectations needed on NetworkScreen initialization.
     // Status bar expectations are defined with RetiresOnSaturation() so
-    // these mocks will be active once status bar is initialized.
-    EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
-        .Times(AnyNumber());
     EXPECT_CALL(*mock_connectivity_state_helper_,
                 IsConnectedType(flimflam::kTypeWifi))
         .Times(1)
         .WillRepeatedly(Return(false));
-    EXPECT_CALL(*mock_network_library_, FindWifiDevice())
-        .Times(AnyNumber());
-    EXPECT_CALL(*mock_network_library_, FindEthernetDevice())
-        .Times(AnyNumber());
-    EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
-        .Times(AnyNumber());
 
     cros_mock_->SetStatusAreaMocksExpectations();
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     WizardInProcessBrowserTest::SetUpOnMainThread();
     mock_screen_observer_.reset(new MockScreenObserver());
     ASSERT_TRUE(WizardController::default_controller() != NULL);
     network_screen_ =
         WizardController::default_controller()->GetNetworkScreen();
@@ skipping 38 matching lines @@
     EXPECT_CALL(*mock_connectivity_state_helper_, IsConnectedType(_))
         .Times(AnyNumber())
         .WillRepeatedly((Return(false)));
     EXPECT_CALL(*mock_connectivity_state_helper_, IsConnectingType(_))
         .Times(AnyNumber())
         .WillRepeatedly((Return(false)));
   }
 
   scoped_ptr<MockScreenObserver> mock_screen_observer_;
   scoped_ptr<MockConnectivityStateHelper> mock_connectivity_state_helper_;
-  MockNetworkLibrary* mock_network_library_;
   scoped_ptr<NetworkDevice> cellular_;
   NetworkScreen* network_screen_;
   FakeSessionManagerClient* fake_session_manager_client_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest);
 };
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Ethernet) {
   EXPECT_CALL(*mock_connectivity_state_helper_,
@@ skipping 37 matching lines @@
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectedType(flimflam::kTypeCellular))
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectingType(flimflam::kTypeEthernet))
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectingType(flimflam::kTypeWifi))
       .WillOnce((Return(true)));
-  scoped_ptr<WifiNetwork> wifi(new WifiNetwork("wifi"));
-  WifiNetworkVector wifi_networks;
-  wifi_networks.push_back(wifi.get());
-  EXPECT_CALL(*mock_network_library_, wifi_network())
-      .WillRepeatedly(Return(wifi.get()));
-  EXPECT_CALL(*mock_network_library_, wifi_networks())
-      .WillRepeatedly(ReturnRef(wifi_networks));
   // EXPECT_FALSE(actor_->IsContinueEnabled());
   network_screen_->NetworkManagerChanged();
 
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectedType(flimflam::kTypeEthernet))
       .WillOnce(Return(true));
   EXPECT_CALL(*mock_connectivity_state_helper_, IsConnected())
         .Times(2)
         .WillRepeatedly(Return(true));
   // TODO(nkostylev): Add integration with WebUI actor http://crosbug.com/22570
@@ skipping 19 matching lines @@
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectingType(flimflam::kTypeEthernet))
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectingType(flimflam::kTypeWifi))
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectingType(flimflam::kTypeCellular))
       .WillOnce((Return(true)));
-  scoped_ptr<CellularNetwork> cellular(new CellularNetwork("cellular"));
-  EXPECT_CALL(*mock_network_library_, cellular_network())
-      .WillRepeatedly(Return(cellular.get()));
   // EXPECT_FALSE(actor_->IsContinueEnabled());
   network_screen_->NetworkManagerChanged();
 
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectedType(flimflam::kTypeEthernet))
       .WillOnce(Return(true));
   EXPECT_CALL(*mock_connectivity_state_helper_, IsConnected())
       .Times(2)
       .WillRepeatedly(Return(true));
   // TODO(nkostylev): Add integration with WebUI actor http://crosbug.com/22570
@@ skipping 16 matching lines @@
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectedType(flimflam::kTypeCellular))
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectingType(flimflam::kTypeEthernet))
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_connectivity_state_helper_,
               IsConnectingType(flimflam::kTypeWifi))
       .WillOnce((Return(true)));
-  scoped_ptr<WifiNetwork> wifi(new WifiNetwork("wifi"));
-  EXPECT_CALL(*mock_network_library_, wifi_network())
-      .WillRepeatedly(Return(wifi.get()));
   // EXPECT_FALSE(actor_->IsContinueEnabled());
   network_screen_->NetworkManagerChanged();
 
   EXPECT_CALL(*mock_connectivity_state_helper_, IsConnected())
       .Times(2)
       .WillRepeatedly(Return(false));
   // TODO(nkostylev): Add integration with WebUI actor http://crosbug.com/22570
   // EXPECT_FALSE(actor_->IsContinueEnabled());
   // EXPECT_FALSE(actor_->IsConnecting());
   network_screen_->OnConnectionTimeout();
 
   // Close infobubble with error message - it makes the test stable.
   // EXPECT_FALSE(actor_->IsContinueEnabled());
   // EXPECT_FALSE(actor_->IsConnecting());
   // actor_->ClearErrors();
   EXPECT_EQ(
       1, fake_session_manager_client_->emit_login_prompt_ready_call_count());
 }
 
 }  // namespace chromeos