OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/profiles/profile_chooser_view.h" | 5 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 } // namespace | 114 } // namespace |
115 | 115 |
116 class ProfileChooserViewExtensionsTest : public ExtensionBrowserTest { | 116 class ProfileChooserViewExtensionsTest : public ExtensionBrowserTest { |
117 public: | 117 public: |
118 ProfileChooserViewExtensionsTest() {} | 118 ProfileChooserViewExtensionsTest() {} |
119 ~ProfileChooserViewExtensionsTest() override {} | 119 ~ProfileChooserViewExtensionsTest() override {} |
120 | 120 |
121 protected: | 121 protected: |
122 void SetUp() override { | 122 void SetUp() override { |
123 ExtensionBrowserTest::SetUp(); | 123 ExtensionBrowserTest::SetUp(); |
124 DCHECK(switches::IsNewProfileManagement()); | |
125 } | 124 } |
126 | 125 |
127 void SetUpCommandLine(base::CommandLine* command_line) override { | 126 void SetUpCommandLine(base::CommandLine* command_line) override { |
128 ExtensionBrowserTest::SetUpCommandLine(command_line); | 127 ExtensionBrowserTest::SetUpCommandLine(command_line); |
129 switches::EnableNewProfileManagementForTesting(command_line); | |
130 } | 128 } |
131 | 129 |
132 void OpenProfileChooserView(Browser* browser) { | 130 void OpenProfileChooserView(Browser* browser) { |
133 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); | 131 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); |
134 views::View* button = browser_view->frame()->GetNewAvatarMenuButton(); | 132 views::View* button = browser_view->frame()->GetNewAvatarMenuButton(); |
135 if (!button) | 133 if (!button) |
136 NOTREACHED() << "NewAvatarButton not found."; | 134 NOTREACHED() << "NewAvatarButton not found."; |
137 | 135 |
138 ProfileChooserView::close_on_deactivate_for_testing_ = false; | 136 ProfileChooserView::close_on_deactivate_for_testing_ = false; |
139 | 137 |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 // Wait until the user manager is shown. | 334 // Wait until the user manager is shown. |
337 runner->Run(); | 335 runner->Run(); |
338 | 336 |
339 // Assert that the first profile's extensions are not blocked. | 337 // Assert that the first profile's extensions are not blocked. |
340 ASSERT_EQ(total_enabled_extensions, registry->enabled_extensions().size()); | 338 ASSERT_EQ(total_enabled_extensions, registry->enabled_extensions().size()); |
341 ASSERT_EQ(0U, registry->blocked_extensions().size()); | 339 ASSERT_EQ(0U, registry->blocked_extensions().size()); |
342 | 340 |
343 // We need to hide the User Manager or else the process can't die. | 341 // We need to hide the User Manager or else the process can't die. |
344 UserManager::Hide(); | 342 UserManager::Hide(); |
345 } | 343 } |
OLD | NEW |