Move common default expectations for network library to CrosMock

Removes mock expectations that are no longer needed. This also results
in removal of all direct {Mock}NetworkLibrary dependencies
in chromeos/login/*.

BUG=189035

Review URL: https://chromiumcodereview.appspot.com/16196006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203979 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/cros/cros_mock.cc

@@ -153,6 +153,10 @@ void CrosMock::SetNetworkLibraryStatusAreaExpectations() {
   EXPECT_CALL(*mock_network_library_, cellular_initializing())
       .Times(AnyNumber())
       .WillRepeatedly((Return(false)));
+  EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
+        .Times(AnyNumber());
+  EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
+        .Times(AnyNumber());
 
   // Set specific expectations for interesting functions:
 

chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

@@ -11,7 +11,6 @@
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/cros/cros_mock.h"
-#include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ -123,8 +122,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest,
                                    public testing::WithParamInterface<bool> {
  protected:
   ExistingUserControllerTest()
-      : mock_network_library_(NULL),
-        mock_login_display_(NULL),
+     :  mock_login_display_(NULL),
         mock_user_manager_(NULL),
         testing_profile_(NULL) {
   }
@@ -144,12 +142,6 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest,
     cros_mock_->InitStatusAreaMocks();
     cros_mock_->SetStatusAreaMocksExpectations();
 
-    mock_network_library_ = cros_mock_->mock_network_library();
-    EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
-        .Times(AnyNumber());
-    EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
-        .Times(AnyNumber());
-
     mock_login_utils_ = new MockLoginUtils();
     LoginUtils::Set(mock_login_utils_);
     EXPECT_CALL(*mock_login_utils_, PrewarmAuthentication())
@@ -263,9 +255,6 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest,
 
   scoped_ptr<ExistingUserController> existing_user_controller_;
 
-  // These mocks are owned by CrosLibrary class.
-  MockNetworkLibrary* mock_network_library_;
-
   // |mock_login_display_| is owned by the ExistingUserController, which calls
   // CreateLoginDisplay() on the |mock_login_display_host_| to get it.
   MockLoginDisplay* mock_login_display_;

chrome/browser/chromeos/login/login_browsertest.cc

@@ -8,7 +8,6 @@
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
-#include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -38,8 +37,7 @@ namespace {
 class LoginTestBase : public chromeos::CrosInProcessBrowserTest {
  public:
   LoginTestBase()
-    : mock_cryptohome_library_(NULL),
-      mock_network_library_(NULL) {
+    : mock_cryptohome_library_(NULL) {
   }
 
  protected:
@@ -47,19 +45,13 @@ class LoginTestBase : public chromeos::CrosInProcessBrowserTest {
     mock_cryptohome_library_.reset(new chromeos::MockCryptohomeLibrary());
     cros_mock_->InitStatusAreaMocks();
     cros_mock_->SetStatusAreaMocksExpectations();
-    mock_network_library_ = cros_mock_->mock_network_library();
     EXPECT_CALL(*(mock_cryptohome_library_.get()), GetSystemSalt())
         .WillRepeatedly(Return(std::string("stub_system_salt")));
     EXPECT_CALL(*(mock_cryptohome_library_.get()), InstallAttributesIsReady())
         .WillRepeatedly(Return(false));
-    EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
-        .Times(AnyNumber());
-    EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
-        .Times(AnyNumber());
   }
 
   scoped_ptr<chromeos::MockCryptohomeLibrary> mock_cryptohome_library_;
-  chromeos::MockNetworkLibrary* mock_network_library_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LoginTestBase);

chrome/browser/chromeos/login/screen_locker_browsertest.cc

@@ -6,7 +6,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
-#include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/login/mock_authenticator.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/screen_locker_tester.h"
@@ -125,12 +124,6 @@ class ScreenLockerTest : public CrosInProcessBrowserTest {
     cros_mock_->InitStatusAreaMocks();
     // Expectations for the status are on the screen lock window.
     cros_mock_->SetStatusAreaMocksExpectations();
-    MockNetworkLibrary* mock_network_library =
-        cros_mock_->mock_network_library();
-    EXPECT_CALL(*mock_network_library, AddUserActionObserver(_))
-        .Times(AnyNumber());
-    EXPECT_CALL(*mock_network_library, LoadOncNetworks(_, _))
-        .Times(AnyNumber());
     zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
         ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
   }

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

@@ -3,9 +3,6 @@
 // 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"
@@ -38,7 +35,6 @@ class DummyButtonListener : public views::ButtonListener {
 class NetworkScreenTest : public WizardInProcessBrowserTest {
  public:
   NetworkScreenTest(): WizardInProcessBrowserTest("network"),
-                       mock_network_library_(NULL),
                        fake_session_manager_client_(NULL) {
   }
 
@@ -55,24 +51,14 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
     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();
   }
@@ -131,7 +117,6 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
 
   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_;
@@ -189,13 +174,6 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Wifi) {
   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();
 
@@ -235,9 +213,6 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Cellular) {
   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();
 
@@ -274,9 +249,6 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Timeout) {
   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();
 

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

@@ -4,7 +4,6 @@
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
@@ -38,7 +37,6 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
  public:
   UpdateScreenTest() : WizardInProcessBrowserTest("update"),
                        fake_update_engine_client_(NULL),
-                       mock_network_library_(NULL),
                        network_portal_detector_stub_(NULL) {
   }
 
@@ -54,10 +52,6 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
     fake_update_engine_client_
         = mock_dbus_thread_manager->fake_update_engine_client();
 
-    mock_network_library_ = cros_mock_->mock_network_library();
-    EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
-        .Times(AnyNumber());
-
     // Setup network portal detector to return online state for both
     // ethernet and wifi networks. Ethernet is an active network by
     // default.
@@ -119,7 +113,6 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
   }
 
   FakeUpdateEngineClient* fake_update_engine_client_;
-  MockNetworkLibrary* mock_network_library_;
   scoped_ptr<MockScreenObserver> mock_screen_observer_;
   scoped_ptr<MockErrorScreenActor> mock_error_screen_actor_;
   scoped_ptr<MockErrorScreen> mock_error_screen_;