| Index: ui/views/controls/scroll_view_unittest.cc
|
| diff --git a/ui/views/controls/scroll_view_unittest.cc b/ui/views/controls/scroll_view_unittest.cc
|
| index 23f2c5f4fdaeb42f2e5ddea5b4599b7131383012..575cf999fc96ffd9dd513491f2a0e01013009692 100644
|
| --- a/ui/views/controls/scroll_view_unittest.cc
|
| +++ b/ui/views/controls/scroll_view_unittest.cc
|
| @@ -282,7 +282,7 @@ TEST_F(ScrollViewTest, ViewportSizedToFit) {
|
| TEST_F(ScrollViewTest, BoundedViewportSizedToFit) {
|
| View* contents = InstallContents();
|
| scroll_view_.ClipHeightTo(100, 200);
|
| - scroll_view_.SetBorder(Border::CreateSolidBorder(2, 0));
|
| + scroll_view_.SetBorder(CreateSolidBorder(2, 0));
|
| scroll_view_.Layout();
|
| EXPECT_EQ("2,2 96x96", contents->parent()->bounds().ToString());
|
|
|
| @@ -333,8 +333,8 @@ TEST_F(ScrollViewTest, ScrollBars) {
|
| const int kLeftPadding = 2;
|
| const int kBottomPadding = 3;
|
| const int kRightPadding = 4;
|
| - scroll_view_.SetBorder(Border::CreateEmptyBorder(
|
| - kTopPadding, kLeftPadding, kBottomPadding, kRightPadding));
|
| + scroll_view_.SetBorder(CreateEmptyBorder(kTopPadding, kLeftPadding,
|
| + kBottomPadding, kRightPadding));
|
| contents->SetBounds(0, 0, 50, 400);
|
| scroll_view_.Layout();
|
| EXPECT_EQ(
|
|
|