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

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

Issue 1319373003: Enable TestLoadingPublicUsersFromLocalState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 runner1 = new content::MessageLoopRunner; 453 runner1 = new content::MessageLoopRunner;
454 subscription1 = chromeos::CrosSettings::Get()->AddSettingsObserver( 454 subscription1 = chromeos::CrosSettings::Get()->AddSettingsObserver(
455 chromeos::kAccountsPrefDeviceLocalAccountAutoLoginId, 455 chromeos::kAccountsPrefDeviceLocalAccountAutoLoginId,
456 runner1->QuitClosure()); 456 runner1->QuitClosure());
457 } 457 }
458 scoped_refptr<content::MessageLoopRunner> runner2; 458 scoped_refptr<content::MessageLoopRunner> runner2;
459 scoped_ptr<CrosSettings::ObserverSubscription> subscription2; 459 scoped_ptr<CrosSettings::ObserverSubscription> subscription2;
460 if (!proto.has_device_local_accounts() || 460 if (!proto.has_device_local_accounts() ||
461 !proto.device_local_accounts().has_auto_login_delay() || 461 !proto.device_local_accounts().has_auto_login_delay() ||
462 proto.device_local_accounts().auto_login_delay() != delay) { 462 proto.device_local_accounts().auto_login_delay() != delay) {
463 runner1 = new content::MessageLoopRunner; 463 runner2 = new content::MessageLoopRunner;
bartfab (slow) 2015/09/08 14:57:17 Oops, that was quite a stupid typo. Thanks for fix
464 subscription1 = chromeos::CrosSettings::Get()->AddSettingsObserver( 464 subscription2 = chromeos::CrosSettings::Get()->AddSettingsObserver(
465 chromeos::kAccountsPrefDeviceLocalAccountAutoLoginDelay, 465 chromeos::kAccountsPrefDeviceLocalAccountAutoLoginDelay,
466 runner1->QuitClosure()); 466 runner2->QuitClosure());
467 } 467 }
468 468
469 // Update the policy. 469 // Update the policy.
470 proto.mutable_device_local_accounts()->set_auto_login_id(username); 470 proto.mutable_device_local_accounts()->set_auto_login_id(username);
471 proto.mutable_device_local_accounts()->set_auto_login_delay(delay); 471 proto.mutable_device_local_accounts()->set_auto_login_delay(delay);
472 RefreshDevicePolicy(); 472 RefreshDevicePolicy();
473 473
474 // Wait for ExistingUserController to read the updated settings. 474 // Wait for ExistingUserController to read the updated settings.
475 if (runner1.get()) 475 if (runner1.get())
476 runner1->Run(); 476 runner1->Run();
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 // Check that when the timer fires, auto-login fails with an error. 731 // Check that when the timer fires, auto-login fails with an error.
732 ExpectLoginFailure(); 732 ExpectLoginFailure();
733 FireAutoLogin(); 733 FireAutoLogin();
734 } 734 }
735 735
736 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, 736 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
737 PRE_TestLoadingPublicUsersFromLocalState) { 737 PRE_TestLoadingPublicUsersFromLocalState) {
738 // First run propagates public accounts and stores them in Local State. 738 // First run propagates public accounts and stores them in Local State.
739 } 739 }
740 740
741 // See http://crbug.com/393704; flaky.
742 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, 741 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
743 DISABLED_TestLoadingPublicUsersFromLocalState) { 742 TestLoadingPublicUsersFromLocalState) {
744 // Second run loads list of public accounts from Local State. 743 // Second run loads list of public accounts from Local State.
745 } 744 }
746 745
747 } // namespace chromeos 746 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698