Merge "cros: Fix loading user profile w/o UserSessionManager"

chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include <deque>
 
 #include "base/bind.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h"
 #include "chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h"
 #include "chrome/browser/extensions/api/braille_display_private/brlapi_connection.h"
 #include "chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 309 matching lines @@
 #define MAYBE_KeyEventOnLockScreen DISABLED_KeyEventOnLockScreen
 #else
 #define MAYBE_KeyEventOnLockScreen KeyEventOnLockScreen
 #endif
 IN_PROC_BROWSER_TEST_F(BrailleDisplayPrivateAPIUserTest,
                        MAYBE_KeyEventOnLockScreen) {
   std::unique_ptr<ScreenLockerTester> tester(ScreenLocker::GetTester());
   // Log in.
   session_manager::SessionManager::Get()->CreateSession(
       AccountId::FromUserEmail(kTestUserName), kTestUserName);
+  g_browser_process->profile_manager()->GetProfile(
+      ProfileHelper::Get()->GetProfilePathByUserIdHash(kTestUserName));
   session_manager::SessionManager::Get()->SessionStarted();
   Profile* profile = ProfileManager::GetActiveUserProfile();
   ASSERT_FALSE(
       ProfileHelper::GetSigninProfile()->IsSameProfile(profile))
       << ProfileHelper::GetSigninProfile()->GetDebugName() << " vs. "
       << profile->GetDebugName();
 
   // Create API and event delegate for sign in profile.
   BrailleDisplayPrivateAPI signin_api(ProfileHelper::GetSigninProfile());
   MockEventDelegate* signin_delegate = SetMockEventDelegate(&signin_api);
@@ skipping 22 matching lines @@
   DismissLockScreen(tester.get());
   signin_api.OnBrailleKeyEvent(key_event);
   user_api.OnBrailleKeyEvent(key_event);
   EXPECT_EQ(1, signin_delegate->GetEventCount());
   EXPECT_EQ(2, user_delegate->GetEventCount());
 }
 
 }  // namespace braille_display_private
 }  // namespace api
 }  // namespace extensions