| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 last_opened_profiles.push_back(profile_4); | 69 last_opened_profiles.push_back(profile_4); |
| 70 browser_creator.Start(dummy, profile_manager->user_data_dir(), profile_2, | 70 browser_creator.Start(dummy, profile_manager->user_data_dir(), profile_2, |
| 71 last_opened_profiles); | 71 last_opened_profiles); |
| 72 | 72 |
| 73 while (!browser_creator.ActivatedProfile()) | 73 while (!browser_creator.ActivatedProfile()) |
| 74 base::MessageLoop::current()->RunUntilIdle(); | 74 base::MessageLoop::current()->RunUntilIdle(); |
| 75 | 75 |
| 76 Browser* new_browser = NULL; | 76 Browser* new_browser = NULL; |
| 77 | 77 |
| 78 // The last used profile (the profile_2 in this case) must be active. | 78 // The last used profile (the profile_2 in this case) must be active. |
| 79 ASSERT_EQ(1u, chrome::GetBrowserCount(profile_2, | 79 ASSERT_EQ(1u, chrome::GetBrowserCount(profile_2)); |
| 80 browser()->host_desktop_type())); | 80 new_browser = chrome::FindBrowserWithProfile(profile_2); |
| 81 new_browser = FindBrowserWithProfile(profile_2, | |
| 82 browser()->host_desktop_type()); | |
| 83 ASSERT_TRUE(new_browser); | 81 ASSERT_TRUE(new_browser); |
| 84 EXPECT_TRUE(new_browser->window()->IsActive()); | 82 EXPECT_TRUE(new_browser->window()->IsActive()); |
| 85 | 83 |
| 86 // All other profiles browser should not be active. | 84 // All other profiles browser should not be active. |
| 87 ASSERT_EQ(1u, chrome::GetBrowserCount(profile_1, | 85 ASSERT_EQ(1u, chrome::GetBrowserCount(profile_1)); |
| 88 browser()->host_desktop_type())); | 86 new_browser = chrome::FindBrowserWithProfile(profile_1); |
| 89 new_browser = FindBrowserWithProfile(profile_1, | |
| 90 browser()->host_desktop_type()); | |
| 91 ASSERT_TRUE(new_browser); | 87 ASSERT_TRUE(new_browser); |
| 92 EXPECT_FALSE(new_browser->window()->IsActive()); | 88 EXPECT_FALSE(new_browser->window()->IsActive()); |
| 93 | 89 |
| 94 ASSERT_EQ(1u, chrome::GetBrowserCount(profile_3, | 90 ASSERT_EQ(1u, chrome::GetBrowserCount(profile_3)); |
| 95 browser()->host_desktop_type())); | 91 new_browser = chrome::FindBrowserWithProfile(profile_3); |
| 96 new_browser = FindBrowserWithProfile(profile_3, | |
| 97 browser()->host_desktop_type()); | |
| 98 ASSERT_TRUE(new_browser); | 92 ASSERT_TRUE(new_browser); |
| 99 EXPECT_FALSE(new_browser->window()->IsActive()); | 93 EXPECT_FALSE(new_browser->window()->IsActive()); |
| 100 | 94 |
| 101 ASSERT_EQ(1u, chrome::GetBrowserCount(profile_4, | 95 ASSERT_EQ(1u, chrome::GetBrowserCount(profile_4)); |
| 102 browser()->host_desktop_type())); | 96 new_browser = chrome::FindBrowserWithProfile(profile_4); |
| 103 new_browser = FindBrowserWithProfile(profile_4, | |
| 104 browser()->host_desktop_type()); | |
| 105 ASSERT_TRUE(new_browser); | 97 ASSERT_TRUE(new_browser); |
| 106 EXPECT_FALSE(new_browser->window()->IsActive()); | 98 EXPECT_FALSE(new_browser->window()->IsActive()); |
| 107 } | 99 } |
| 108 #endif // !OS_MACOSX && !OS_CHROMEOS | 100 #endif // !OS_MACOSX && !OS_CHROMEOS |
| OLD | NEW |