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

Unified Diff: chrome/browser/chromeos/login/login_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
Index: chrome/browser/chromeos/login/login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index 9dc8ded770efde7522019b8fcf0c2545137ec906..05d495496cd20d08527dabd894421b5c4cbb9e67 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/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);

Powered by Google App Engine
This is Rietveld 408576698