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

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

Issue 123833004: Tentatively re-enable previously flaky tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/login/user_manager.h" 7 #include "chrome/browser/chromeos/login/user_manager.h"
8 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" 8 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
9 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 9 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
10 #include "chrome/browser/chromeos/settings/cros_settings.h" 10 #include "chrome/browser/chromeos/settings/cros_settings.h"
(...skipping 12 matching lines...) Expand all
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 // http://crbug.com/330454 33 IN_PROC_BROWSER_TEST_F(LoginScreenPolicyTest, DisableSupervisedUsers) {
34 IN_PROC_BROWSER_TEST_F(LoginScreenPolicyTest, DISABLED_DisableSupervisedUsers) {
35 EXPECT_FALSE(chromeos::UserManager::Get()->AreLocallyManagedUsersAllowed()); 34 EXPECT_FALSE(chromeos::UserManager::Get()->AreLocallyManagedUsersAllowed());
36 35
37 scoped_refptr<content::MessageLoopRunner> runner( 36 scoped_refptr<content::MessageLoopRunner> runner(
38 new content::MessageLoopRunner); 37 new content::MessageLoopRunner);
39 scoped_ptr<CrosSettings::ObserverSubscription> subscription( 38 scoped_ptr<CrosSettings::ObserverSubscription> subscription(
40 chromeos::CrosSettings::Get()->AddSettingsObserver( 39 chromeos::CrosSettings::Get()->AddSettingsObserver(
41 chromeos::kAccountsPrefSupervisedUsersEnabled, 40 chromeos::kAccountsPrefSupervisedUsersEnabled,
42 runner->QuitClosure())); 41 runner->QuitClosure()));
43 42
44 em::ChromeDeviceSettingsProto& proto(device_policy()->payload()); 43 em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
45 proto.mutable_supervised_users_settings()->set_supervised_users_enabled(true); 44 proto.mutable_supervised_users_settings()->set_supervised_users_enabled(true);
46 RefreshDevicePolicy(); 45 RefreshDevicePolicy();
47 46
48 runner->Run(); 47 runner->Run();
49 48
50 EXPECT_TRUE(chromeos::UserManager::Get()->AreLocallyManagedUsersAllowed()); 49 EXPECT_TRUE(chromeos::UserManager::Get()->AreLocallyManagedUsersAllowed());
51 } 50 }
52 51
53 } // namespace chromeos 52 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698