OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/views/avatar_menu_button.h" | 5 #include "chrome/browser/ui/views/avatar_menu_button.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/profiles/avatar_menu_model.h" | 10 #include "chrome/browser/profiles/avatar_menu_model.h" |
11 #include "chrome/browser/profiles/profile_manager.h" | 11 #include "chrome/browser/profiles/profile_manager.h" |
12 #include "chrome/browser/ui/browser_list.h" | 12 #include "chrome/browser/ui/browser_list.h" |
13 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" | 13 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" |
14 #include "chrome/browser/ui/views/frame/browser_view.h" | 14 #include "chrome/browser/ui/views/frame/browser_view.h" |
15 #include "chrome/browser/ui/views/profile_chooser_view.h" | 15 #include "chrome/browser/ui/views/profile_chooser_view.h" |
16 #include "chrome/common/chrome_notification_types.h" | 16 #include "chrome/common/chrome_notification_types.h" |
17 #include "chrome/common/chrome_paths.h" | 17 #include "chrome/common/chrome_paths.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/test/base/in_process_browser_test.h" | 19 #include "chrome/test/base/in_process_browser_test.h" |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 | 154 |
155 EXPECT_TRUE(model->GetItemAt(model->GetActiveProfileIndex()).signin_required); | 155 EXPECT_TRUE(model->GetItemAt(model->GetActiveProfileIndex()).signin_required); |
156 | 156 |
157 window_close_observer.Wait(); // Rely on test timeout for failure indication. | 157 window_close_observer.Wait(); // Rely on test timeout for failure indication. |
158 EXPECT_TRUE(browser_list->empty()); | 158 EXPECT_TRUE(browser_list->empty()); |
159 } | 159 } |
160 | 160 |
161 | 161 |
162 INSTANTIATE_TEST_CASE_P(Old, AvatarMenuButtonTest, testing::Values(false)); | 162 INSTANTIATE_TEST_CASE_P(Old, AvatarMenuButtonTest, testing::Values(false)); |
163 INSTANTIATE_TEST_CASE_P(New, AvatarMenuButtonTest, testing::Values(true)); | 163 INSTANTIATE_TEST_CASE_P(New, AvatarMenuButtonTest, testing::Values(true)); |
OLD | NEW |