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

Unified Diff: chrome/browser/chromeos/login/managed/managed_user_test_base.cc

Issue 296773002: Add a Key class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 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/managed/managed_user_test_base.cc
diff --git a/chrome/browser/chromeos/login/managed/managed_user_test_base.cc b/chrome/browser/chromeos/login/managed/managed_user_test_base.cc
index 1e45c9a80ac503ac48985d84750cac81182e9e8c..2ff6e1179723476a5353ad6b62cc2a895e9c1a9e 100644
--- a/chrome/browser/chromeos/login/managed/managed_user_test_base.cc
+++ b/chrome/browser/chromeos/login/managed/managed_user_test_base.cc
@@ -13,6 +13,8 @@
#include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/chromeos/login/auth/key.h"
+#include "chrome/browser/chromeos/login/auth/user_context.h"
#include "chrome/browser/chromeos/login/login_manager_test.h"
#include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
@@ -287,7 +289,9 @@ void ManagedUserTestBase::StartFlowLoginAsManager() {
// Next button is now enabled.
JSExpect("!$('managed-user-creation-next-button').disabled");
- SetExpectedCredentials(kTestManager, kTestManagerPassword);
+ UserContext user_context(kTestManager);
+ user_context.SetKey(Key(kTestManagerPassword));
+ SetExpectedCredentials(user_context);
content::WindowedNotificationObserver login_observer(
chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
content::NotificationService::AllSources());

Powered by Google App Engine
This is Rietveld 408576698