Removes AshTestBase::SupportsHostWindowResize

ash/system/toast/toast_manager_unittest.cc

 // Copyright 2016 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/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
@@ skipping 153 matching lines @@
 
   ShowToast("DUMMY", ToastData::kInfiniteDuration);
   EXPECT_EQ(1, GetToastSerial());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds = wm::GetDisplayBoundsWithShelf(shelf->GetWindow());
 
   EXPECT_TRUE(toast_bounds.Intersects(shelf->GetUserWorkAreaBounds()));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
 
-  if (SupportsHostWindowResize()) {
-    // If host resize is not supported, ShelfLayoutManager::GetIdealBounds()
-    // doesn't return correct value.
-    gfx::Rect shelf_bounds = shelf->GetIdealBounds();
-    EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
-    EXPECT_EQ(shelf_bounds.y() - 5, toast_bounds.bottom());
-    EXPECT_EQ(root_bounds.bottom() - shelf_bounds.height() - 5,
-              toast_bounds.bottom());
-  }
+  // If host resize is not supported, ShelfLayoutManager::GetIdealBounds()

[James Cook, 2016/09/26 19:21:11]

nit: delete this comment

[sky, 2016/09/26 19:26:36]

Done.

+  // doesn't return correct value.
+  gfx::Rect shelf_bounds = shelf->GetIdealBounds();
+  EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
+  EXPECT_EQ(shelf_bounds.y() - 5, toast_bounds.bottom());
+  EXPECT_EQ(root_bounds.bottom() - shelf_bounds.height() - 5,
+            toast_bounds.bottom());
 }
 
 TEST_F(ToastManagerTest, PositionWithAutoHiddenBottomShelf) {
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
 
   WmShelf* shelf = GetPrimaryShelf();
   EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
@@ skipping 35 matching lines @@
   ShowToast("DUMMY", ToastData::kInfiniteDuration);
   EXPECT_EQ(1, GetToastSerial());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::RectF precise_toast_bounds(toast_bounds);
   gfx::Rect root_bounds = wm::GetDisplayBoundsWithShelf(shelf->GetWindow());
 
   EXPECT_TRUE(toast_bounds.Intersects(shelf->GetUserWorkAreaBounds()));
   EXPECT_EQ(root_bounds.bottom() - 5, toast_bounds.bottom());
 
-  if (SupportsHostWindowResize()) {
-    // If host resize is not supported then calling WmShelf::GetIdealBounds()
-    // doesn't return correct value.
-    gfx::Rect shelf_bounds = shelf->GetIdealBounds();
-    EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
-    EXPECT_EQ(round(shelf_bounds.right() +
-                    (root_bounds.width() - shelf_bounds.width()) / 2.0),
-              round(precise_toast_bounds.CenterPoint().x()));
-  }
+  // If host resize is not supported then calling WmShelf::GetIdealBounds()
+  // doesn't return correct value.
+  gfx::Rect shelf_bounds = shelf->GetIdealBounds();
+  EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
+  EXPECT_EQ(round(shelf_bounds.right() +
+                  (root_bounds.width() - shelf_bounds.width()) / 2.0),
+            round(precise_toast_bounds.CenterPoint().x()));
 }
 
 TEST_F(ToastManagerTest, PositionWithUnifiedDesktop) {
   if (!SupportsMultipleDisplays())
     return;
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetUnifiedDesktopEnabled(true);
   UpdateDisplay("1000x500,0+600-100x500");
 
   WmShelf* shelf = GetPrimaryShelf();
   EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
   EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
 
   ShowToast("DUMMY", ToastData::kInfiniteDuration);
   EXPECT_EQ(1, GetToastSerial());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds = wm::GetDisplayBoundsWithShelf(shelf->GetWindow());
 
   EXPECT_TRUE(toast_bounds.Intersects(shelf->GetUserWorkAreaBounds()));
   EXPECT_TRUE(root_bounds.Contains(toast_bounds));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
 
-  if (SupportsHostWindowResize()) {
-    // If host resize is not supported then calling WmShelf::GetIdealBounds()
-    // doesn't return correct value.
-    gfx::Rect shelf_bounds = shelf->GetIdealBounds();
-    EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
-    EXPECT_EQ(shelf_bounds.y() - 5, toast_bounds.bottom());
-    EXPECT_EQ(root_bounds.bottom() - shelf_bounds.height() - 5,
-              toast_bounds.bottom());
-  }
+  // If host resize is not supported then calling WmShelf::GetIdealBounds()
+  // doesn't return correct value.
+  gfx::Rect shelf_bounds = shelf->GetIdealBounds();
+  EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
+  EXPECT_EQ(shelf_bounds.y() - 5, toast_bounds.bottom());
+  EXPECT_EQ(root_bounds.bottom() - shelf_bounds.height() - 5,
+            toast_bounds.bottom());
 }
 
 TEST_F(ToastManagerTest, CancelToast) {
   std::string id1 = ShowToast("TEXT1", ToastData::kInfiniteDuration);
   std::string id2 = ShowToast("TEXT2", ToastData::kInfiniteDuration);
   std::string id3 = ShowToast("TEXT3", ToastData::kInfiniteDuration);
 
   // Confirm that the first toast is shown.
   EXPECT_EQ(base::ASCIIToUTF16("TEXT1"), GetCurrentText());
   // Cancel the queued toast.
   CancelToast(id2);
   // Confirm that the shown toast is still visible.
   EXPECT_EQ(base::ASCIIToUTF16("TEXT1"), GetCurrentText());
   // Cancel the shown toast.
   CancelToast(id1);
   // Confirm that the next toast is visible.
   EXPECT_EQ(base::ASCIIToUTF16("TEXT3"), GetCurrentText());
   // Cancel the shown toast.
   CancelToast(id3);
   // Confirm that the shown toast disappears.
   EXPECT_FALSE(GetCurrentOverlay());
   // Confirm that only 1 toast is shown.
   EXPECT_EQ(2, GetToastSerial());
 }
 
 }  // namespace ash