Update To 11.40.268.0

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

diff --git a/src/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/src/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
index cf7b4ca..0114da8 100644 (file)
--- a/src/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
+++ b/src/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
@@ -4,7 +4,6 @@
 
 #include <string>
 
-#include "ash/magnifier/magnifier_constants.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -28,6 +27,7 @@
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/chromeos/accessibility_types.h"
 
 namespace em = enterprise_management;
 
@@ -85,8 +85,8 @@ class LoginScreenDefaultPolicyBrowsertestBase
   virtual ~LoginScreenDefaultPolicyBrowsertestBase();
 
   // DevicePolicyCrosBrowserTest:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpInProcessBrowserTestFixture() override;
+  virtual void SetUpOnMainThread() override;
 
   void RefreshDevicePolicyAndWaitForPrefChange(const char* pref_name);
 
@@ -103,9 +103,9 @@ class LoginScreenDefaultPolicyLoginScreenBrowsertest
   virtual ~LoginScreenDefaultPolicyLoginScreenBrowsertest();
 
   // LoginScreenDefaultPolicyBrowsertestBase:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void SetUpCommandLine(CommandLine* command_line) override;
+  virtual void SetUpOnMainThread() override;
+  virtual void TearDownOnMainThread() override;
 
   void VerifyPrefFollowsRecommendation(const char* pref_name,
                                        const base::Value& recommended_value);
@@ -121,7 +121,7 @@ class LoginScreenDefaultPolicyInSessionBrowsertest
   virtual ~LoginScreenDefaultPolicyInSessionBrowsertest();
 
   // LoginScreenDefaultPolicyBrowsertestBase:
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
 
   void VerifyPrefFollowsDefault(const char* pref_name);
 
@@ -189,11 +189,11 @@ void LoginScreenDefaultPolicyLoginScreenBrowsertest::SetUpOnMainThread() {
       chromeos::ProfileHelper::GetSigninProfile());
 }
 
-void LoginScreenDefaultPolicyLoginScreenBrowsertest::CleanUpOnMainThread() {
+void LoginScreenDefaultPolicyLoginScreenBrowsertest::TearDownOnMainThread() {
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::Bind(&chrome::AttemptExit));
   base::RunLoop().RunUntilIdle();
-  LoginScreenDefaultPolicyBrowsertestBase::CleanUpOnMainThread();
+  LoginScreenDefaultPolicyBrowsertestBase::TearDownOnMainThread();
 }
 
 void LoginScreenDefaultPolicyLoginScreenBrowsertest::
@@ -326,14 +326,14 @@ IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyLoginScreenBrowsertest,
   VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,
                                   base::FundamentalValue(true));
   VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType,
-                                  base::FundamentalValue(ash::MAGNIFIER_FULL));
+                                  base::FundamentalValue(ui::MAGNIFIER_FULL));
 
   // Verify that the full-screen magnifier is enabled.
   chromeos::MagnificationManager* magnification_manager =
       chromeos::MagnificationManager::Get();
   ASSERT_TRUE(magnification_manager);
   EXPECT_TRUE(magnification_manager->IsMagnifierEnabled());
-  EXPECT_EQ(ash::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());
+  EXPECT_EQ(ui::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyInSessionBrowsertest,
@@ -434,7 +434,7 @@ IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyInSessionBrowsertest,
       chromeos::MagnificationManager::Get();
   ASSERT_TRUE(magnification_manager);
   EXPECT_FALSE(magnification_manager->IsMagnifierEnabled());
-  EXPECT_EQ(ash::kDefaultMagnifierType,
+  EXPECT_EQ(ui::kDefaultMagnifierType,
             magnification_manager->GetMagnifierType());
 }