Move common default expectations for network library to CrosMock

chrome/browser/chromeos/login/existing_user_controller_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 <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #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"
 #include "chrome/browser/chromeos/login/mock_authenticator.h"
 #include "chrome/browser/chromeos/login/mock_login_display.h"
 #include "chrome/browser/chromeos/login/mock_login_display_host.h"
 #include "chrome/browser/chromeos/login/mock_login_utils.h"
 #include "chrome/browser/chromeos/login/mock_url_fetchers.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 91 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(NotificationWatcher);
 };
 
 }  // namespace
 
 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) {
   }
 
   ExistingUserController* existing_user_controller() {
     return ExistingUserController::current_controller();
   }
 
   const ExistingUserController* existing_user_controller() const {
     return ExistingUserController::current_controller();
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     SetUpSessionManager();
 
     DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
     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())
         .Times(AnyNumber());
     EXPECT_CALL(*mock_login_utils_, StopBackgroundFetchers())
         .Times(AnyNumber());
     EXPECT_CALL(*mock_login_utils_, DelegateDeleted(_))
         .Times(1);
 
     mock_login_display_host_.reset(new MockLoginDisplayHost());
@@ skipping 93 matching lines @@
   int auto_login_delay() const {
     return existing_user_controller()->public_session_auto_login_delay_;
   }
 
   bool is_login_in_progress() const {
     return existing_user_controller()->is_login_in_progress_;
   }
 
   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_;
   scoped_ptr<MockLoginDisplayHost> mock_login_display_host_;
 
   // Owned by LoginUtilsWrapper.
   MockLoginUtils* mock_login_utils_;
 
   MockUserManager* mock_user_manager_;  // Not owned.
   scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
@@ skipping 458 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(ExistingUserControllerTestInstantiation,
                         ExistingUserControllerTest,
                         testing::Bool());
 
 INSTANTIATE_TEST_CASE_P(ExistingUserControllerPublicSessionTestInstantiation,
                         ExistingUserControllerPublicSessionTest,
                         testing::Bool());
 
 }  // namespace chromeos