When user presses Ctrl-N, we should use the current active window's profile to determine on which p…

chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc

Index: chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc b/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..559678ed142b7012276e1576524909e0d91ce7a6
--- /dev/null
+++ b/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
@@ -0,0 +1,81 @@
+// Copyright 2016 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 "ash/new_window_delegate.h"
+#include "ash/shell.h"
+#include "ash/wm/window_util.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/user_manager.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/aura/window.h"
+
+namespace {
+
+const char kTestUserName1[] = "test1@test.com";
+const char kTestUserName2[] = "test2@test.com";
+
+}  // namespace
+
+typedef InProcessBrowserTest ChromeNewWindowDelegateBrowserTest;
+
+// Tests that when we open a new window by pressing 'Ctrl-N', we should use the
+// current active window's profile to determine on which profile's desktop we
+// should open a new window.
+IN_PROC_BROWSER_TEST_F(ChromeNewWindowDelegateBrowserTest,
+                       NewWindowForActiveWindowProfileTest) {
+  user_manager::UserManager::Get()->UserLoggedIn(
+      AccountId::FromUserEmail(kTestUserName1), kTestUserName1, false);
+  Profile* profile1 = ProfileManager::GetActiveUserProfile();
+  Browser* browser1 = CreateBrowser(profile1);
+  // The newly created window should be created for the current active profile.
+  ash::Shell::GetInstance()->new_window_delegate()->NewWindow(false);
+  EXPECT_EQ(
+      chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
+      profile1);
+
+  // Login another user and make sure the current active user changes.
+  user_manager::UserManager::Get()->UserLoggedIn(
+      AccountId::FromUserEmail(kTestUserName2), kTestUserName2, false);
+  Profile* profile2 = ProfileManager::GetActiveUserProfile();
+  EXPECT_NE(profile1, profile2);
+
+  Browser* browser2 = CreateBrowser(profile2);
+  // The newly created window should be created for the current active window's
+  // profile, which is |profile2|.
+  ash::Shell::GetInstance()->new_window_delegate()->NewWindow(false);
+  EXPECT_EQ(
+      chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
+      profile2);
+
+  // After activating |browser1|, the newly created window should be created
+  // against |browser1|'s profile.
+  browser1->window()->Show();
+  ash::Shell::GetInstance()->new_window_delegate()->NewWindow(false);
+  EXPECT_EQ(
+      chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
+      profile1);
+
+  // Test for incognito windows.
+  // The newly created incoginito window should be created against the current
+  // active |browser1|'s profile.
+  browser1->window()->Show();
+  ash::Shell::GetInstance()->new_window_delegate()->NewWindow(true);
+  EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())
+                ->profile()
+                ->GetOriginalProfile(),
+            profile1);
+
+  // The newly created incoginito window should be created against the current
+  // active |browser2|'s profile.
+  browser2->window()->Show();
+  ash::Shell::GetInstance()->new_window_delegate()->NewWindow(true);
+  EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())
+                ->profile()
+                ->GetOriginalProfile(),
+            profile2);
+}