Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(624)

Unified Diff: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

Issue 16196006: Move common default expectations for network library to CrosMock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/screens/network_screen_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
index cb9c84fee2346b65909565b3634c60ad2662b516..508b1b1ad5cb4e494515a71cf6540f0659e5d62b 100644
--- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
+++ b/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_;
« no previous file with comments | « chrome/browser/chromeos/login/screens/network_screen_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698