Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / kiosk_mode / kiosk_mode_settings_unittest.cc

diff --git a/src/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc b/src/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc
index 679fa0f..cf69b93 100644 (file)
--- a/src/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc
+++ b/src/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc
@@ -26,8 +26,7 @@ namespace chromeos {
 class KioskModeSettingsTest : public testing::Test {
  protected:
   KioskModeSettingsTest()
-      : message_loop_(base::MessageLoop::TYPE_UI),
-        ui_thread_(content::BrowserThread::UI, &message_loop_),
+      : ui_thread_(content::BrowserThread::UI, &message_loop_),
         file_thread_(content::BrowserThread::FILE, &message_loop_) {
     CrosSettings* cros_settings = CrosSettings::Get();
 
@@ -48,7 +47,7 @@ class KioskModeSettingsTest : public testing::Test {
     cros_settings->AddSettingsProvider(device_settings_provider_);
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     if (!KioskModeSettings::Get()->is_initialized()) {
       KioskModeSettings::Get()->Initialize(
           base::Bind(&KioskModeSettingsTest::SetUp,
@@ -57,7 +56,7 @@ class KioskModeSettingsTest : public testing::Test {
     }
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     KioskModeSettings::Get()->set_initialized(false);
   }
 
@@ -70,7 +69,7 @@ class KioskModeSettingsTest : public testing::Test {
     KioskModeSettings::Get()->set_initialized(false);
   }
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;