| Index: components/zoom/page_zoom_unittests.cc
|
| diff --git a/components/ui/zoom/page_zoom_unittests.cc b/components/zoom/page_zoom_unittests.cc
|
| similarity index 85%
|
| rename from components/ui/zoom/page_zoom_unittests.cc
|
| rename to components/zoom/page_zoom_unittests.cc
|
| index 94c4dddfd12e75182e8ca2fe3ebaa56c09e36595..31e2a09dd8f68ce2b27b552be1f6783f52897f33 100644
|
| --- a/components/ui/zoom/page_zoom_unittests.cc
|
| +++ b/components/zoom/page_zoom_unittests.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 "components/ui/zoom/page_zoom.h"
|
| +#include "components/zoom/page_zoom.h"
|
| #include "content/public/common/page_zoom.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -10,8 +10,7 @@ TEST(PageTestZoom, PresetZoomFactors) {
|
| // Fetch a vector of preset zoom factors, including a custom value that we
|
| // already know is not going to be in the list.
|
| double custom_value = 1.05; // 105%
|
| - std::vector<double> factors =
|
| - ui_zoom::PageZoom::PresetZoomFactors(custom_value);
|
| + std::vector<double> factors = zoom::PageZoom::PresetZoomFactors(custom_value);
|
|
|
| // Expect at least 10 zoom factors.
|
| EXPECT_GE(factors.size(), 10U);
|
| @@ -47,8 +46,7 @@ TEST(PageTestZoom, 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 =
|
| - ui_zoom::PageZoom::PresetZoomLevels(custom_value);
|
| + std::vector<double> levels = zoom::PageZoom::PresetZoomLevels(custom_value);
|
|
|
| // Expect at least 10 zoom levels.
|
| EXPECT_GE(levels.size(), 10U);
|
| @@ -78,21 +76,20 @@ TEST(PageTestZoom, PresetZoomLevels) {
|
|
|
| TEST(PageTestZoom, InvalidCustomFactor) {
|
| double too_low = 0.01;
|
| - std::vector<double> factors = ui_zoom::PageZoom::PresetZoomFactors(too_low);
|
| + std::vector<double> factors = zoom::PageZoom::PresetZoomFactors(too_low);
|
| EXPECT_FALSE(content::ZoomValuesEqual(factors.front(), too_low));
|
|
|
| double too_high = 99.0;
|
| - factors = ui_zoom::PageZoom::PresetZoomFactors(too_high);
|
| + factors = zoom::PageZoom::PresetZoomFactors(too_high);
|
| EXPECT_FALSE(content::ZoomValuesEqual(factors.back(), too_high));
|
| }
|
|
|
| TEST(PageTestZoom, InvalidCustomLevel) {
|
| double too_low = -99.0;
|
| - std::vector<double> levels = ui_zoom::PageZoom::PresetZoomLevels(too_low);
|
| + std::vector<double> levels = zoom::PageZoom::PresetZoomLevels(too_low);
|
| EXPECT_FALSE(content::ZoomValuesEqual(levels.front(), too_low));
|
|
|
| double too_high = 99.0;
|
| - levels = ui_zoom::PageZoom::PresetZoomLevels(too_high);
|
| + levels = zoom::PageZoom::PresetZoomLevels(too_high);
|
| EXPECT_FALSE(content::ZoomValuesEqual(levels.back(), too_high));
|
| }
|
| -
|
|
|