Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / policy / recommendation_restorer_unittest.cc

diff --git a/src/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc b/src/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
index 03018ce..c33f645 100644 (file)
--- a/src/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
+++ b/src/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/chromeos/policy/recommendation_restorer.h"
 
-#include "ash/magnifier/magnifier_constants.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_notifier_impl.h"
 #include "base/prefs/testing_pref_store.h"
@@ -28,6 +27,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/chromeos/accessibility_types.h"
 
 namespace policy {
 
@@ -41,7 +41,7 @@ class RecommendationRestorerTest : public testing::Test {
   RecommendationRestorerTest();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   void RegisterUserProfilePrefs();
   void RegisterLoginProfilePrefs();
@@ -129,7 +129,7 @@ void RecommendationRestorerTest::SetUserSettings() {
   prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled, true);
   prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true);
   prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType,
-                     ash::MAGNIFIER_FULL);
+                     ui::MAGNIFIER_FULL);
   prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true);
 }
 
@@ -186,7 +186,7 @@ void RecommendationRestorerTest::VerifyPrefsFollowUser() const {
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
                         base::FundamentalValue(true));
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
-                        base::FundamentalValue(ash::MAGNIFIER_FULL));
+                        base::FundamentalValue(ui::MAGNIFIER_FULL));
   VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled,
                         base::FundamentalValue(true));
 }
@@ -323,7 +323,7 @@ TEST_F(RecommendationRestorerTest, RestoreOnRecommendationChangeOnLoginScreen) {
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
                         base::FundamentalValue(true));
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
-                        base::FundamentalValue(ash::MAGNIFIER_FULL));
+                        base::FundamentalValue(ui::MAGNIFIER_FULL));
   VerifyTimerIsRunning();
   runner_->RunUntilIdle();
   VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,
@@ -378,7 +378,7 @@ TEST_F(RecommendationRestorerTest, RestoreOnRecommendationChangeInUserSession) {
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
                         base::FundamentalValue(true));
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
-                        base::FundamentalValue(ash::MAGNIFIER_FULL));
+                        base::FundamentalValue(ui::MAGNIFIER_FULL));
   recommended_prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled,
                                  false);
   recommended_prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, 0);
@@ -426,11 +426,11 @@ TEST_F(RecommendationRestorerTest, DoNothingOnUserChange) {
 
   prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true);
   prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType,
-                     ash::MAGNIFIER_FULL);
+                     ui::MAGNIFIER_FULL);
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
                         base::FundamentalValue(true));
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
-                        base::FundamentalValue(ash::MAGNIFIER_FULL));
+                        base::FundamentalValue(ui::MAGNIFIER_FULL));
   VerifyTimerIsStopped();
 
   prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true);
@@ -478,11 +478,11 @@ TEST_F(RecommendationRestorerTest, RestoreOnUserChange) {
   VerifyTimerIsStopped();
   prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true);
   prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType,
-                     ash::MAGNIFIER_FULL);
+                     ui::MAGNIFIER_FULL);
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
                         base::FundamentalValue(true));
   VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
-                        base::FundamentalValue(ash::MAGNIFIER_FULL));
+                        base::FundamentalValue(ui::MAGNIFIER_FULL));
   VerifyTimerIsRunning();
   runner_->RunUntilIdle();
   VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,