Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(598)

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

Issue 2486813002: Add DeviceADPolicyManager to provide AD policy. (Closed)
Patch Set: Address Bernhard's comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/browser/chromeos/login/login_manager_test.h" 12 #include "chrome/browser/chromeos/login/login_manager_test.h"
12 #include "chrome/browser/chromeos/login/startup_utils.h" 13 #include "chrome/browser/chromeos/login/startup_utils.h"
13 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 14 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
14 #include "chrome/browser/chromeos/profiles/profile_helper.h" 15 #include "chrome/browser/chromeos/profiles/profile_helper.h"
15 #include "chrome/browser/chromeos/settings/cros_settings.h" 16 #include "chrome/browser/chromeos/settings/cros_settings.h"
16 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" 17 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
17 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
19 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
21 #include "chrome/test/base/ui_test_utils.h" 22 #include "chrome/test/base/ui_test_utils.h"
22 #include "chromeos/settings/cros_settings_names.h" 23 #include "chromeos/settings/cros_settings_names.h"
23 #include "components/prefs/pref_service.h" 24 #include "components/prefs/pref_service.h"
24 #include "components/user_manager/user_manager.h" 25 #include "components/user_manager/user_manager.h"
26 #include "content/public/browser/notification_service.h"
27 #include "content/public/browser/notification_source.h"
25 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
26 #include "content/public/test/browser_test_utils.h" 29 #include "content/public/test/browser_test_utils.h"
27 #include "content/public/test/test_utils.h" 30 #include "content/public/test/test_utils.h"
28 31
29 namespace chromeos { 32 namespace chromeos {
30 33
31 namespace { 34 namespace {
32 35
33 const char* kTestUsers[] = { "test-user1@gmail.com", "test-user2@gmail.com" }; 36 const char* kTestUsers[] = { "test-user1@gmail.com", "test-user2@gmail.com" };
34 37
(...skipping 16 matching lines...) Expand all
51 ~AccountsOptionsTest() override {} 54 ~AccountsOptionsTest() override {}
52 55
53 void SetUpOnMainThread() override { 56 void SetUpOnMainThread() override {
54 LoginManagerTest::SetUpOnMainThread(); 57 LoginManagerTest::SetUpOnMainThread();
55 CrosSettings* settings = CrosSettings::Get(); 58 CrosSettings* settings = CrosSettings::Get();
56 CrosSettingsProvider* device_settings_provider = 59 CrosSettingsProvider* device_settings_provider =
57 settings->GetProvider(kDeviceOwner); 60 settings->GetProvider(kDeviceOwner);
58 device_settings_provider_ = 61 device_settings_provider_ =
59 settings->RemoveSettingsProvider(device_settings_provider); 62 settings->RemoveSettingsProvider(device_settings_provider);
60 settings->AddSettingsProvider(std::move(stub_settings_provider_)); 63 settings->AddSettingsProvider(std::move(stub_settings_provider_));
64
65 // Notify ChromeUserManager of ownership change.
66 content::NotificationService::current()->Notify(
Dan Beam 2016/11/17 19:09:10 the notification service is deprecated (as is code
Thiemo Nagel 2016/11/18 09:46:51 As discussed offline: The CL fixes some useless fi
67 chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED,
68 content::Source<AccountsOptionsTest>(this),
69 content::NotificationService::NoDetails());
61 } 70 }
62 71
63 void TearDownOnMainThread() override { 72 void TearDownOnMainThread() override {
64 CrosSettings* settings = CrosSettings::Get(); 73 CrosSettings* settings = CrosSettings::Get();
65 stub_settings_provider_ = 74 stub_settings_provider_ =
66 settings->RemoveSettingsProvider(stub_settings_provider_ptr_); 75 settings->RemoveSettingsProvider(stub_settings_provider_ptr_);
67 settings->AddSettingsProvider(std::move(device_settings_provider_)); 76 settings->AddSettingsProvider(std::move(device_settings_provider_));
68 LoginManagerTest::TearDownOnMainThread(); 77 LoginManagerTest::TearDownOnMainThread();
69 } 78 }
70 79
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 AddUser(test_users_[1].GetUserEmail()); 158 AddUser(test_users_[1].GetUserEmail());
150 159
151 user_manager::UserManager* manager = user_manager::UserManager::Get(); 160 user_manager::UserManager* manager = user_manager::UserManager::Get();
152 ASSERT_EQ(2u, manager->GetLoggedInUsers().size()); 161 ASSERT_EQ(2u, manager->GetLoggedInUsers().size());
153 162
154 CheckAccountsUI(manager->FindUser(test_users_[0]), true /* is_owner */); 163 CheckAccountsUI(manager->FindUser(test_users_[0]), true /* is_owner */);
155 CheckAccountsUI(manager->FindUser(test_users_[1]), false /* is_owner */); 164 CheckAccountsUI(manager->FindUser(test_users_[1]), false /* is_owner */);
156 } 165 }
157 166
158 } // namespace chromeos 167 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698