| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| 11 #include "chrome/browser/profiles/avatar_menu.h" | 11 #include "chrome/browser/profiles/avatar_menu.h" |
| 12 #include "chrome/browser/profiles/profile_attributes_entry.h" |
| 13 #include "chrome/browser/profiles/profile_attributes_storage.h" |
| 12 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
| 13 #include "chrome/browser/profiles/profile_window.h" | 15 #include "chrome/browser/profiles/profile_window.h" |
| 14 #include "chrome/browser/profiles/profiles_state.h" | 16 #include "chrome/browser/profiles/profiles_state.h" |
| 15 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/browser_list.h" | 18 #include "chrome/browser/ui/browser_list.h" |
| 17 #include "chrome/browser/ui/user_manager.h" | 19 #include "chrome/browser/ui/user_manager.h" |
| 18 #include "chrome/common/chrome_paths.h" | 20 #include "chrome/common/chrome_paths.h" |
| 19 #include "chrome/test/base/in_process_browser_test.h" | 21 #include "chrome/test/base/in_process_browser_test.h" |
| 20 #include "chrome/test/base/test_switches.h" | 22 #include "chrome/test/base/test_switches.h" |
| 21 #include "chrome/test/base/testing_browser_process.h" | 23 #include "chrome/test/base/testing_browser_process.h" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 false, ProfileMetrics::SWITCH_PROFILE_ICON); | 147 false, ProfileMetrics::SWITCH_PROFILE_ICON); |
| 146 EXPECT_EQ(2u, browser_list->size()); | 148 EXPECT_EQ(2u, browser_list->size()); |
| 147 | 149 |
| 148 // Switch to the first profile without opening a new window. | 150 // Switch to the first profile without opening a new window. |
| 149 menu->SwitchToProfile(menu->GetIndexOfItemWithProfilePath(path_profile1), | 151 menu->SwitchToProfile(menu->GetIndexOfItemWithProfilePath(path_profile1), |
| 150 false, ProfileMetrics::SWITCH_PROFILE_ICON); | 152 false, ProfileMetrics::SWITCH_PROFILE_ICON); |
| 151 EXPECT_EQ(2u, browser_list->size()); | 153 EXPECT_EQ(2u, browser_list->size()); |
| 152 EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath()); | 154 EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath()); |
| 153 EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath()); | 155 EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath()); |
| 154 } | 156 } |
| OLD | NEW |