Chrome OS: New window on teleported browser window should show on current desktop

chrome/browser/ui/ash/multi_user/multi_user_util.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 "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "components/signin/core/account_id/account_id.h"
@@ skipping 41 matching lines @@
 
 const AccountId GetCurrentAccountId() {
   const user_manager::User* user =
       user_manager::UserManager::Get()->GetActiveUser();
   // In unit tests user login phase is usually skipped.
   return user ? user->GetAccountId() : EmptyAccountId();
 }
 
 // Move the window to the current user's desktop.
 void MoveWindowToCurrentDesktop(aura::Window* window) {
-  if (!chrome::MultiUserWindowManager::GetInstance()->IsWindowOnDesktopOfUser(
-          window, GetCurrentAccountId())) {
-    chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser(
-        window, GetCurrentAccountId());
-  }
+  chrome::MultiUserWindowManager* manager =
+      chrome::MultiUserWindowManager::GetInstance();
+
+  // Some unit tests have no manager instantiated.
+  if (!manager)
+    return;
+
+  if (!manager->IsWindowOnDesktopOfUser(window, GetCurrentAccountId()))
+    manager->ShowWindowForUser(window, GetCurrentAccountId());
 }
 
 }  // namespace multi_user_util