| Index: chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm
|
| index ec3316c10b4987ebf94dc9ea1332220503bbf592..8747fea170a5ff4edab7290d5300674cea8dd9cd 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm
|
| +++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm
|
| @@ -3,8 +3,8 @@
|
| // found in the LICENSE file.
|
|
|
| #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
|
| -#include "chrome/browser/ui/zoom/zoom_controller.h"
|
| #include "chrome/test/base/chrome_render_view_host_test_harness.h"
|
| +#include "components/ui/zoom/zoom_controller.h"
|
|
|
| namespace {
|
|
|
| @@ -15,7 +15,7 @@ class MockZoomDecoration : public ZoomDecoration {
|
| explicit MockZoomDecoration(LocationBarViewMac* owner)
|
| : ZoomDecoration(owner), update_ui_count_(0) {}
|
| bool ShouldShowDecoration() const override { return true; }
|
| - void ShowAndUpdateUI(ZoomController* zoom_controller,
|
| + void ShowAndUpdateUI(ui_zoom::ZoomController* zoom_controller,
|
| NSString* tooltip_string) override {
|
| ++update_ui_count_;
|
| ZoomDecoration::ShowAndUpdateUI(zoom_controller, tooltip_string);
|
| @@ -27,10 +27,10 @@ class MockZoomDecoration : public ZoomDecoration {
|
| DISALLOW_COPY_AND_ASSIGN(MockZoomDecoration);
|
| };
|
|
|
| -class MockZoomController : public ZoomController {
|
| +class MockZoomController : public ui_zoom::ZoomController {
|
| public:
|
| explicit MockZoomController(content::WebContents* web_contents)
|
| - : ZoomController(web_contents) {}
|
| + : ui_zoom::ZoomController(web_contents) {}
|
| int GetZoomPercent() const override { return zoom_percent_; }
|
|
|
| int zoom_percent_;
|
|
|