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

Side by Side Diff: chrome/browser/chromeos/login/login_screen_policy_browsertest.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 months 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" 7 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
8 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 8 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
9 #include "chrome/browser/chromeos/settings/cros_settings.h" 9 #include "chrome/browser/chromeos/settings/cros_settings.h"
10 #include "chromeos/chromeos_switches.h" 10 #include "chromeos/chromeos_switches.h"
11 #include "chromeos/settings/cros_settings_names.h" 11 #include "chromeos/settings/cros_settings_names.h"
12 #include "components/user_manager/user_manager.h" 12 #include "components/user_manager/user_manager.h"
13 #include "content/public/test/test_utils.h" 13 #include "content/public/test/test_utils.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace em = enterprise_management; 17 namespace em = enterprise_management;
18 18
19 namespace chromeos { 19 namespace chromeos {
20 20
21 class LoginScreenPolicyTest : public policy::DevicePolicyCrosBrowserTest { 21 class LoginScreenPolicyTest : public policy::DevicePolicyCrosBrowserTest {
22 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 22 virtual void SetUpCommandLine(CommandLine* command_line) override {
23 command_line->AppendSwitch(switches::kLoginManager); 23 command_line->AppendSwitch(switches::kLoginManager);
24 } 24 }
25 25
26 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 26 virtual void SetUpInProcessBrowserTestFixture() override {
27 InstallOwnerKey(); 27 InstallOwnerKey();
28 MarkAsEnterpriseOwned(); 28 MarkAsEnterpriseOwned();
29 DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); 29 DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
30 } 30 }
31 }; 31 };
32 32
33 IN_PROC_BROWSER_TEST_F(LoginScreenPolicyTest, DisableSupervisedUsers) { 33 IN_PROC_BROWSER_TEST_F(LoginScreenPolicyTest, DisableSupervisedUsers) {
34 EXPECT_FALSE(user_manager::UserManager::Get()->AreSupervisedUsersAllowed()); 34 EXPECT_FALSE(user_manager::UserManager::Get()->AreSupervisedUsersAllowed());
35 35
36 scoped_refptr<content::MessageLoopRunner> runner( 36 scoped_refptr<content::MessageLoopRunner> runner(
37 new content::MessageLoopRunner); 37 new content::MessageLoopRunner);
38 scoped_ptr<CrosSettings::ObserverSubscription> subscription( 38 scoped_ptr<CrosSettings::ObserverSubscription> subscription(
39 chromeos::CrosSettings::Get()->AddSettingsObserver( 39 chromeos::CrosSettings::Get()->AddSettingsObserver(
40 chromeos::kAccountsPrefSupervisedUsersEnabled, 40 chromeos::kAccountsPrefSupervisedUsersEnabled,
41 runner->QuitClosure())); 41 runner->QuitClosure()));
42 42
43 em::ChromeDeviceSettingsProto& proto(device_policy()->payload()); 43 em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
44 proto.mutable_supervised_users_settings()->set_supervised_users_enabled(true); 44 proto.mutable_supervised_users_settings()->set_supervised_users_enabled(true);
45 RefreshDevicePolicy(); 45 RefreshDevicePolicy();
46 46
47 runner->Run(); 47 runner->Run();
48 48
49 EXPECT_TRUE(user_manager::UserManager::Get()->AreSupervisedUsersAllowed()); 49 EXPECT_TRUE(user_manager::UserManager::Get()->AreSupervisedUsersAllowed());
50 } 50 }
51 51
52 } // namespace chromeos 52 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_manager_test.h ('k') | chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698