Make ShelfLayoutManagerTest.ShelfLayoutInUnifiedDesktop font config independent

ash/shelf/shelf_layout_manager_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_layout_manager.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 2307 matching lines @@
   // would normally cause the ShelfLayoutManager to update its state. However
   // during shutdown we want to handle this without crashing.
   delete window1;
 }
 
 TEST_F(ShelfLayoutManagerTest, ShelfLayoutInUnifiedDesktop) {
   if (!SupportsMultipleDisplays())
     return;
   Shell::GetInstance()->display_manager()->SetUnifiedDesktopEnabled(true);
 
-  UpdateDisplay("500x500, 500x500");
+  UpdateDisplay("500x400, 500x400");

[James Cook, 2016/04/07 15:27:09]

Hooray for different width and height!

 
   StatusAreaWidget* status_area_widget =
       Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget();
   EXPECT_TRUE(status_area_widget->IsVisible());
   // Shelf should be in the first display's area.
-  // TODO: make this test more robust against changes in font, font size.
-  EXPECT_EQ("353,453 147x47",
-            status_area_widget->GetWindowBoundsInScreen().ToString());
+  gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen());
+  EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds));
+  EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right());
 }
 
 }  // namespace ash