Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4310)

Unified Diff: chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc

Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc
index 64bd93c3d2d8f1ac4890beb9bd6d5e8daa397b84..dded8f89975a387db8ab94533c0f8ca933d19592 100644
--- a/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc
+++ b/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc
@@ -4,11 +4,11 @@
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
-#include "ash/magnifier/magnifier_constants.h"
#include "ash/test/ash_test_base.h"
#include "base/prefs/pref_service.h"
#include "chrome/test/base/testing_profile.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/chromeos/accessibility_types.h"
namespace chromeos {
namespace {
@@ -25,11 +25,11 @@ bool IsMagnifierEnabled() {
return MagnificationManager::Get()->IsMagnifierEnabled();
}
-ash::MagnifierType GetMagnifierType() {
+ui::MagnifierType GetMagnifierType() {
return MagnificationManager::Get()->GetMagnifierType();
}
-void SetMagnifierType(ash::MagnifierType type) {
+void SetMagnifierType(ui::MagnifierType type) {
return MagnificationManager::Get()->SetMagnifierType(type);
}
@@ -58,19 +58,19 @@ class MagnificationManagerTest : public ash::test::AshTestBase {
TEST_F(MagnificationManagerTest, ChangeType) {
// Set full screen magnifier, and confirm the status is set successfully.
EnableMagnifier();
- SetMagnifierType(ash::MAGNIFIER_FULL);
+ SetMagnifierType(ui::MAGNIFIER_FULL);
EXPECT_TRUE(IsMagnifierEnabled());
- EXPECT_EQ(GetMagnifierType(), ash::MAGNIFIER_FULL);
+ EXPECT_EQ(GetMagnifierType(), ui::MAGNIFIER_FULL);
// Set partial screen magnifier, and confirm the change is ignored.
- SetMagnifierType(ash::MAGNIFIER_PARTIAL);
+ SetMagnifierType(ui::MAGNIFIER_PARTIAL);
EXPECT_TRUE(IsMagnifierEnabled());
- EXPECT_EQ(GetMagnifierType(), ash::MAGNIFIER_FULL);
+ EXPECT_EQ(GetMagnifierType(), ui::MAGNIFIER_FULL);
// Disables magnifier, and confirm the status is set successfully.
DisableMagnifier();
EXPECT_FALSE(IsMagnifierEnabled());
- EXPECT_EQ(GetMagnifierType(), ash::MAGNIFIER_FULL);
+ EXPECT_EQ(GetMagnifierType(), ui::MAGNIFIER_FULL);
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698