Attempt to fix flaky ChromeOS test timeouts.

chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 280 matching lines @@
   RegisterUser(kTestOwner);
   RegisterUser(kTestNonOwner);
   StartupUtils::MarkOobeCompleted();
 }
 
 // Tests the shared setting indicator for the primary user's auto-lock setting
 // when the secondary user has enabled or disabled their preference.
 // (The checkbox is unset if the current user's preference is false, but if any
 // other signed-in user has enabled this preference, the shared setting
 // indicator explains this.)
-// Disabled due to flaky timeouts.  https://crbug.com/423053
-IN_PROC_BROWSER_TEST_F(SharedOptionsTest,
-                       DISABLED_ScreenLockPreferencePrimary) {
+IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferencePrimary) {
   LoginUser(kTestOwner);
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
   AddUser(kTestNonOwner);
 
   user_manager::UserManager* manager = user_manager::UserManager::Get();
   const user_manager::User* user1 = manager->FindUser(kTestOwner);
   const user_manager::User* user2 = manager->FindUser(kTestNonOwner);
 
   PrefService* prefs1 =
@@ skipping 112 matching lines @@
   content::WaitForLoadStop(contents);
   {
     SCOPED_TRACE("Screen lock false for both users");
     expected_value = false;
     CheckBooleanPreference(contents, prefs::kEnableAutoScreenLock, disabled,
                            empty_controlled, expected_value);
   }
 }
 
 }  // namespace chromeos