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

Unified Diff: chrome/browser/chromeos/login/login_browsertest.cc

Issue 8773016: chromeos: remove power manager EXPECTs from login_browsertest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed expectations Created 9 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9cbdfdc7e3eb9854153a6c1ce4d5be753f343378..c4ee33d5eef533807282a0ffc44b516027344d51 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -8,7 +8,6 @@
#include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
#include "chrome/browser/chromeos/cros/mock_library_loader.h"
#include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/browser/chromeos/dbus/mock_power_manager_client.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_switches.h"
@@ -38,7 +37,6 @@ class LoginTestBase : public CrosInProcessBrowserTest {
}
MockCryptohomeLibrary* mock_cryptohome_library_;
- MockPowerManagerClient mock_power_manager_client_;
private:
DISALLOW_COPY_AND_ASSIGN(LoginTestBase);
@@ -48,12 +46,6 @@ class LoginUserTest : public LoginTestBase {
protected:
virtual void SetUpInProcessBrowserTestFixture() {
LoginTestBase::SetUpInProcessBrowserTestFixture();
- EXPECT_CALL(mock_power_manager_client_, AddObserver(_))
- .Times(AtLeast(1))
- .WillRepeatedly(Return());
- EXPECT_CALL(mock_power_manager_client_, RemoveObserver(_))
- .Times(AtLeast(1))
- .WillRepeatedly(Return());
}
virtual void SetUpCommandLine(CommandLine* command_line) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698