Replace gfx::ClampToInt with base::saturated_cast.

chrome/browser/ui/views/extensions/bookmark_app_bubble_view.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h"
 
+#include "base/numerics/safe_conversions.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
@@ skipping 11 matching lines @@
 const int kIconSize = extension_misc::EXTENSION_ICON_MEDIUM;
 
 class WebAppInfoImageSource : public gfx::ImageSkiaSource {
  public:
   WebAppInfoImageSource(int dip_size, const WebApplicationInfo& info)
       : dip_size_(dip_size), info_(info) {}
   ~WebAppInfoImageSource() override {}
 
  private:
   gfx::ImageSkiaRep GetImageForScale(float scale) override {
-    int size = gfx::ClampToInt(dip_size_ * scale);
+    int size = base::saturated_cast<int>(dip_size_ * scale);
     for (const auto& icon_info : info_.icons) {
       if (icon_info.width == size) {
         return gfx::ImageSkiaRep(icon_info.data, scale);
       }
     }
     return gfx::ImageSkiaRep();
   }
 
   int dip_size_;
   WebApplicationInfo info_;
@@ skipping 207 matching lines @@
     }
 #endif
     return string_id;
 }
 
 base::string16 BookmarkAppBubbleView::GetTrimmedTitle() {
   base::string16 title(title_tf_->text());
   base::TrimWhitespace(title, base::TRIM_ALL, &title);
   return title;
 }