| Index: chrome/browser/chrome_page_zoom_unittest.cc
|
| diff --git a/chrome/browser/chrome_page_zoom_unittest.cc b/chrome/browser/chrome_page_zoom_unittest.cc
|
| index 5784819a9e3edeab5849eefd360a73dbfe05e38c..3fd583376838ac1b30f6310699498f88e6a4c4f0 100644
|
| --- a/chrome/browser/chrome_page_zoom_unittest.cc
|
| +++ b/chrome/browser/chrome_page_zoom_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/chrome_page_zoom.h"
|
| +#include "components/ui/zoom/page_zoom.h"
|
| #include "content/public/common/page_zoom.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -11,7 +11,7 @@ TEST(ChromePageZoomTest, PresetZoomFactors) {
|
| // already know is not going to be in the list.
|
| double custom_value = 1.05; // 105%
|
| std::vector<double> factors =
|
| - chrome_page_zoom::PresetZoomFactors(custom_value);
|
| + ui_zoom::PageZoom::PresetZoomFactors(custom_value);
|
|
|
| // Expect at least 10 zoom factors.
|
| EXPECT_GE(factors.size(), 10U);
|
| @@ -47,7 +47,8 @@ TEST(ChromePageZoomTest, PresetZoomLevels) {
|
| // Fetch a vector of preset zoom levels, including a custom value that we
|
| // already know is not going to be in the list.
|
| double custom_value = 0.1;
|
| - std::vector<double> levels = chrome_page_zoom::PresetZoomLevels(custom_value);
|
| + std::vector<double> levels =
|
| + ui_zoom::PageZoom::PresetZoomLevels(custom_value);
|
|
|
| // Expect at least 10 zoom levels.
|
| EXPECT_GE(levels.size(), 10U);
|
| @@ -77,21 +78,21 @@ TEST(ChromePageZoomTest, PresetZoomLevels) {
|
|
|
| TEST(ChromePageZoomTest, InvalidCustomFactor) {
|
| double too_low = 0.01;
|
| - std::vector<double> factors = chrome_page_zoom::PresetZoomFactors(too_low);
|
| + std::vector<double> factors = ui_zoom::PageZoom::PresetZoomFactors(too_low);
|
| EXPECT_FALSE(content::ZoomValuesEqual(factors.front(), too_low));
|
|
|
| double too_high = 99.0;
|
| - factors = chrome_page_zoom::PresetZoomFactors(too_high);
|
| + factors = ui_zoom::PageZoom::PresetZoomFactors(too_high);
|
| EXPECT_FALSE(content::ZoomValuesEqual(factors.back(), too_high));
|
| }
|
|
|
| TEST(ChromePageZoomTest, InvalidCustomLevel) {
|
| double too_low = -99.0;
|
| - std::vector<double> levels = chrome_page_zoom::PresetZoomLevels(too_low);
|
| + std::vector<double> levels = ui_zoom::PageZoom::PresetZoomLevels(too_low);
|
| EXPECT_FALSE(content::ZoomValuesEqual(levels.front(), too_low));
|
|
|
| double too_high = 99.0;
|
| - levels = chrome_page_zoom::PresetZoomLevels(too_high);
|
| + levels = ui_zoom::PageZoom::PresetZoomLevels(too_high);
|
| EXPECT_FALSE(content::ZoomValuesEqual(levels.back(), too_high));
|
| }
|
|
|
|
|