| OLD | NEW | 
|    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 "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |    5 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 
|    6  |    6  | 
|    7 #include "base/bind.h" |    7 #include "base/bind.h" | 
|    8 #include "base/bind_helpers.h" |    8 #include "base/bind_helpers.h" | 
|    9 #include "base/message_loop/message_loop.h" |    9 #include "base/message_loop/message_loop.h" | 
|   10 #include "base/values.h" |   10 #include "base/values.h" | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
|   40   } |   40   } | 
|   41  |   41  | 
|   42   virtual ~KioskModeSettingsTest() { |   42   virtual ~KioskModeSettingsTest() { | 
|   43     // Restore the real DeviceSettingsProvider. |   43     // Restore the real DeviceSettingsProvider. | 
|   44     CrosSettings* cros_settings = CrosSettings::Get(); |   44     CrosSettings* cros_settings = CrosSettings::Get(); | 
|   45     EXPECT_TRUE( |   45     EXPECT_TRUE( | 
|   46       cros_settings->RemoveSettingsProvider(&stub_settings_provider_)); |   46       cros_settings->RemoveSettingsProvider(&stub_settings_provider_)); | 
|   47     cros_settings->AddSettingsProvider(device_settings_provider_); |   47     cros_settings->AddSettingsProvider(device_settings_provider_); | 
|   48   } |   48   } | 
|   49  |   49  | 
|   50   virtual void SetUp() OVERRIDE { |   50   virtual void SetUp() override { | 
|   51     if (!KioskModeSettings::Get()->is_initialized()) { |   51     if (!KioskModeSettings::Get()->is_initialized()) { | 
|   52       KioskModeSettings::Get()->Initialize( |   52       KioskModeSettings::Get()->Initialize( | 
|   53           base::Bind(&KioskModeSettingsTest::SetUp, |   53           base::Bind(&KioskModeSettingsTest::SetUp, | 
|   54                      base::Unretained(this))); |   54                      base::Unretained(this))); | 
|   55       return; |   55       return; | 
|   56     } |   56     } | 
|   57   } |   57   } | 
|   58  |   58  | 
|   59   virtual void TearDown() OVERRIDE { |   59   virtual void TearDown() override { | 
|   60     KioskModeSettings::Get()->set_initialized(false); |   60     KioskModeSettings::Get()->set_initialized(false); | 
|   61   } |   61   } | 
|   62  |   62  | 
|   63   void ReInitialize() { |   63   void ReInitialize() { | 
|   64     KioskModeSettings::Get()->set_initialized(false); |   64     KioskModeSettings::Get()->set_initialized(false); | 
|   65     KioskModeSettings::Get()->Initialize(base::Bind(&base::DoNothing)); |   65     KioskModeSettings::Get()->Initialize(base::Bind(&base::DoNothing)); | 
|   66   } |   66   } | 
|   67  |   67  | 
|   68   void DisableKioskModeSettings() { |   68   void DisableKioskModeSettings() { | 
|   69     KioskModeSettings::Get()->set_initialized(false); |   69     KioskModeSettings::Get()->set_initialized(false); | 
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  157   // Time delta initializes to '0' microseconds. |  157   // Time delta initializes to '0' microseconds. | 
|  158   EXPECT_LT(KioskModeSettings::Get()->GetScreensaverTimeout(), |  158   EXPECT_LT(KioskModeSettings::Get()->GetScreensaverTimeout(), | 
|  159             base::TimeDelta()); |  159             base::TimeDelta()); | 
|  160   EXPECT_LT(KioskModeSettings::Get()->GetIdleLogoutTimeout(), |  160   EXPECT_LT(KioskModeSettings::Get()->GetIdleLogoutTimeout(), | 
|  161             base::TimeDelta()); |  161             base::TimeDelta()); | 
|  162   EXPECT_LT(KioskModeSettings::Get()->GetIdleLogoutWarningDuration(), |  162   EXPECT_LT(KioskModeSettings::Get()->GetIdleLogoutWarningDuration(), | 
|  163             base::TimeDelta()); |  163             base::TimeDelta()); | 
|  164 } |  164 } | 
|  165  |  165  | 
|  166 }  // namespace chromeos |  166 }  // namespace chromeos | 
| OLD | NEW |