Replace inlined instances of GetContentsBounds()

Bug: None
Change-Id: Ic53917460d7cc0e68868e5c37a94df42ee930a65
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1725007Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682135}

ash/display/touch_calibrator_view.cc

@@ -327,8 +327,7 @@ HintBox::HintBox(const gfx::Rect& bounds, int border_radius)
             bounds.width() + 2 * base_border_ + arrow_width_,
             bounds.height() + 2 * base_border_);
 
-  rounded_rect_bounds_ = GetLocalBounds();
-  rounded_rect_bounds_.Inset(GetInsets());
+  rounded_rect_bounds_ = GetContentsBounds();
 
   flags_.setColor(SK_ColorWHITE);
   flags_.setStyle(cc::PaintFlags::kFill_Style);
@@ -352,8 +351,7 @@ HintBox::~HintBox() = default;
 
 void HintBox::UpdateWidth(int updated_width) {
   SetSize(gfx::Size(updated_width + 2 * base_border_ + arrow_width_, height()));
-  rounded_rect_bounds_ = GetLocalBounds();
-  rounded_rect_bounds_.Inset(GetInsets());
+  rounded_rect_bounds_ = GetContentsBounds();
 }
 
 void HintBox::SetLabel(const base::string16& text, const SkColor& color) {

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

@@ -77,8 +77,7 @@ void MediaGalleryCheckboxView::Layout() {
   if (!secondary_text_->GetVisible())
     secondary_text_width = 0;
 
-  gfx::Rect area(GetLocalBounds());
-  area.Inset(GetInsets());
+  gfx::Rect area = GetContentsBounds();
 
   if (secondary_text_width > area.width() / 2) {
     secondary_text_width =

chrome/browser/ui/views/passwords/credentials_item_view.cc

@@ -158,8 +158,7 @@ int CredentialsItemView::GetHeightForWidth(int w) const {
 }
 
 void CredentialsItemView::Layout() {
-  gfx::Rect child_area(GetLocalBounds());
-  child_area.Inset(GetInsets());
+  gfx::Rect child_area = GetContentsBounds();
 
   gfx::Size image_size(image_view_->GetPreferredSize());
   image_size.SetToMin(child_area.size());

ui/views/examples/multiline_example.cc

@@ -111,9 +111,7 @@ class MultilineExample::RenderTextView : public View {
 
  private:
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override {
-    gfx::Rect bounds = GetLocalBounds();
-    bounds.Inset(GetInsets());
-    render_text_->SetDisplayRect(bounds);
+    render_text_->SetDisplayRect(GetContentsBounds());
   }
 
   std::unique_ptr<gfx::RenderText> render_text_;