gfx: Rename canvas SaveAndUnscale to UnscaleTheDeviceScaleFactor.

chrome/browser/ui/views/location_bar/location_bar_view.cc

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index f177fed7c86a912ebb1687e77af1460469ea1dd9..2167e217edffe8e0bd374c635bd74ae968b58935 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -1289,7 +1289,8 @@ void LocationBarView::PaintChildren(const ui::PaintContext& context) {
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
     gfx::Canvas* canvas = recorder.canvas();
-    const float scale = canvas->SaveAndUnscale();
+    gfx::ScopedCanvas scoped_canvas(canvas);
+    const float scale = canvas->UndoDeviceScaleFactor();
 
     SkPaint paint;
     paint.setStyle(SkPaint::Style::kStroke_Style);
@@ -1306,7 +1307,6 @@ void LocationBarView::PaintChildren(const ui::PaintContext& context) {
     const SkScalar kCornerRadius = SkDoubleToScalar(2.5f * scale);
     canvas->sk_canvas()->drawRoundRect(gfx::RectFToSkRect(border_rect_f),
                                        kCornerRadius, kCornerRadius, paint);
-    recorder.canvas()->Restore();
   } else {
     views::Painter::PaintPainterAt(recorder.canvas(), border_painter_.get(),
                                    border_rect);