Move common default expectations for network library to CrosMock

chrome/browser/chromeos/login/screens/update_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/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"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_stub.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/fake_update_engine_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
@@ skipping 13 matching lines @@
 
 const char kStubEthernetServicePath[] = "eth0";
 const char kStubWifiServicePath[] = "wlan0";
 
 }  // namespace
 
 class UpdateScreenTest : public WizardInProcessBrowserTest {
  public:
   UpdateScreenTest() : WizardInProcessBrowserTest("update"),
                        fake_update_engine_client_(NULL),
-                       mock_network_library_(NULL),
                        network_portal_detector_stub_(NULL) {
   }
 
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager =
         new MockDBusThreadManagerWithoutGMock;
     DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
     WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
     cros_mock_->InitStatusAreaMocks();
     cros_mock_->SetStatusAreaMocksExpectations();
 
     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.
     network_portal_detector_stub_ =
         static_cast<NetworkPortalDetectorStub*>(
             NetworkPortalDetector::GetInstance());
     NetworkPortalDetector::CaptivePortalState online_state;
     online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
     online_state.response_code = 204;
     SetDefaultNetworkPath(kStubEthernetServicePath);
@@ skipping 41 matching lines @@
     network_portal_detector_stub_->SetDetectionResultsForTesting(service_path,
                                                                  state);
   }
 
   void NotifyPortalDetectionCompleted() {
     DCHECK(network_portal_detector_stub_);
     network_portal_detector_stub_->NotifyObserversForTesting();
   }
 
   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_;
   UpdateScreen* update_screen_;
   NetworkPortalDetectorStub* network_portal_detector_stub_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UpdateScreenTest);
 };
 
@@ skipping 216 matching lines @@
   EXPECT_CALL(*mock_error_screen_actor_,
               SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE, std::string()))
       .Times(1);
   EXPECT_CALL(*mock_screen_observer_, ShowErrorScreen())
       .Times(1);
   base::MessageLoop::current()->RunUntilIdle();
   NotifyPortalDetectionCompleted();
 }
 
 }  // namespace chromeos