Fix broken shelf layout manager tests

In ShelfLayoutManagerTest::ShelfUpdatedWhenStatusAreaChangesSize,
it assumes that the shelf view fills the display space. It will be
incorrect under new specs. In ShelfLayoutManagerTest::RtlPlacement,
the test fails to reset the RTL setting. This CL fixes these two tests.

Bug: 1002576
Change-Id: I9dc2a82f5dab18c33e6947e21112af5aa4913f0e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1796118
Commit-Queue: Andrew Xu <andrewxu@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695259}

ash/shelf/shelf_layout_manager_unittest.cc

@@ -1073,8 +1073,11 @@ TEST_F(ShelfLayoutManagerTest, ShelfUpdatedWhenStatusAreaChangesSize) {
           .width();
   const int nav_width =
       shelf_widget->navigation_widget()->GetWindowBoundsInScreen().width();
-  const int hotseat_width =
-      GetPrimaryShelf()->GetShelfViewForTesting()->width();
+  const int hotseat_width = GetPrimaryShelf()
+                                ->shelf_widget()
+                                ->hotseat_widget()
+                                ->GetWindowBoundsInScreen()
+                                .width();
   const int margins = ShelfConfig::Get()->home_button_edge_spacing() +
                       ShelfConfig::Get()->app_icon_group_margin();
   EXPECT_EQ(200, total_width - nav_width - hotseat_width - margins);
@@ -3095,10 +3098,15 @@ TEST_F(ShelfLayoutManagerTest, RtlPlacement) {
         rtl_right_position);
   };
 
+  const std::string locale = base::i18n::GetConfiguredLocale();
+
   ShelfWidget* shelf_widget = GetPrimaryShelf()->shelf_widget();
   check_mirrored_placement(shelf_widget->navigation_widget());
   check_mirrored_placement(shelf_widget->status_area_widget());
   check_mirrored_placement(shelf_widget);
+
+  // Reset the lauguage setting.
+  base::i18n::SetICUDefaultLocale(locale);
 }
 
 class ShelfLayoutManagerKeyboardTest : public AshTestBase {