Simplify ash shelf layout code.

ash/shelf/shelf_view_unittest.cc

 // Copyright (c) 2012 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 "ash/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 207 matching lines @@
   shelf_view_test()->RunMessageLoopUntilAnimationsDone();
   EXPECT_TRUE(observer()->change_notified());
   EXPECT_TRUE(second_observer.change_notified());
 
   observer()->Reset();
   second_observer.Reset();
 }
 
 TEST_F(ShelfViewIconObserverTest, BoundsChanged) {
   ShelfWidget* widget = Shell::GetPrimaryRootWindowController()->shelf();
-  Shelf* shelf = Shelf::ForPrimaryDisplay();
-  gfx::Size shelf_size = widget->GetWindowBoundsInScreen().size();
-  shelf_size.set_width(shelf_size.width() / 2);
-  ASSERT_GT(shelf_size.width(), 0);
-  shelf->SetShelfViewBounds(gfx::Rect(shelf_size));
+  gfx::Rect shelf_bounds = widget->GetWindowBoundsInScreen();
+  shelf_bounds.set_width(shelf_bounds.width() / 2);
+  ASSERT_GT(shelf_bounds.width(), 0);
+  widget->SetBounds(shelf_bounds);
   // No animation happens for ShelfView bounds change.
   EXPECT_TRUE(observer()->change_notified());
   observer()->Reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfView tests.
 
 // A ShelfDelegate test double that will always convert between ShelfIDs and app
 // ids. This does not support pinning and unpinning operations and the return
@@ skipping 1715 matching lines @@
   test_api_->RunMessageLoopUntilAnimationsDone();
   CheckAllItemsAreInBounds();
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, ShelfViewTextDirectionTest, testing::Bool());
 INSTANTIATE_TEST_CASE_P(VisibleBounds, ShelfViewVisibleBoundsTest,
     testing::Bool());
 
 }  // namespace test
 }  // namespace ash