Add a Key class

chrome/browser/chromeos/login/managed/managed_user_test_base.cc

 // Copyright 2014 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 "chrome/browser/chromeos/login/managed/managed_user_test_base.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #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"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/managed_mode/managed_user_constants.h"
 #include "chrome/browser/managed_mode/managed_user_registration_utility.h"
@@ skipping 254 matching lines @@
 
   // Select the first user as manager, and enter password.
   JSExpect("$('managed-user-creation-next-button').disabled");
   JSSetTextField("#managed-user-creation .manager-pod.focused input",
                  kTestManagerPassword);
 
   JSEval("$('managed-user-creation').updateNextButtonForManager_()");
 
   // 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());
 
   // Log in as manager.
   JSEval("$('managed-user-creation-next-button').click()");
   login_observer.Wait();
 
   // OAuth token is valid.
   UserManager::Get()->SaveUserOAuthStatus(kTestManager,
@@ skipping 119 matching lines @@
   // Confirm deletion.
   JSEval(StringPrintf(
       "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()",
       user_index));
 
   // Make sure there is no supervised user in list.
   ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size());
 }
 
 }  // namespace chromeos