1 files changed, 0 insertions, 116 deletions
diff --git a/chromium/ash/screen_ash_unittest.cc b/chromium/ash/screen_ash_unittest.cc
deleted file mode 100644
index 89b0ea82379..00000000000
--- a/chromium/ash/screen_ash_unittest.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-// 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/screen_ash.h"
-
-#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shell.h"
-#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_util.h"
-#include "ui/aura/env.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
-
-namespace ash {
-namespace test {
-
-typedef test::AshTestBase ScreenAshTest;
-
-TEST_F(ScreenAshTest, Bounds) {
-  if (!SupportsMultipleDisplays())
-    return;
-
-  UpdateDisplay("600x600,500x500");
-  Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
-      SetAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-
-  views::Widget* primary = views::Widget::CreateWindowWithContextAndBounds(
-      NULL, CurrentContext(), gfx::Rect(10, 10, 100, 100));
-  primary->Show();
-  views::Widget* secondary = views::Widget::CreateWindowWithContextAndBounds(
-      NULL, CurrentContext(), gfx::Rect(610, 10, 100, 100));
-  secondary->Show();
-
-  // Maximized bounds
-  EXPECT_EQ("0,0 600x597",
-            ScreenAsh::GetMaximizedWindowBoundsInParent(
-                primary->GetNativeView()).ToString());
-  EXPECT_EQ("0,0 500x453",
-            ScreenAsh::GetMaximizedWindowBoundsInParent(
-                secondary->GetNativeView()).ToString());
-
-  // Display bounds
-  EXPECT_EQ("0,0 600x600",
-            ScreenAsh::GetDisplayBoundsInParent(
-                primary->GetNativeView()).ToString());
-  EXPECT_EQ("0,0 500x500",
-            ScreenAsh::GetDisplayBoundsInParent(
-                secondary->GetNativeView()).ToString());
-
-  // Work area bounds
-  EXPECT_EQ("0,0 600x597",
-            ScreenAsh::GetDisplayWorkAreaBoundsInParent(
-                primary->GetNativeView()).ToString());
-  EXPECT_EQ("0,0 500x453",
-            ScreenAsh::GetDisplayWorkAreaBoundsInParent(
-                secondary->GetNativeView()).ToString());
-}
-
-// Test verifies a stable handling of secondary screen widget changes
-// (crbug.com/226132).
-TEST_F(ScreenAshTest, StabilityTest) {
-  if (!SupportsMultipleDisplays())
-    return;
-
-  UpdateDisplay("600x600,500x500");
-  views::Widget* secondary = views::Widget::CreateWindowWithContextAndBounds(
-      NULL, CurrentContext(), gfx::Rect(610, 10, 100, 100));
-  EXPECT_EQ(Shell::GetAllRootWindows()[1],
-      secondary->GetNativeView()->GetRootWindow());
-  secondary->Show();
-  secondary->Maximize();
-  secondary->Show();
-  secondary->SetFullscreen(true);
-  secondary->Hide();
-  secondary->Close();
-}
-
-TEST_F(ScreenAshTest, ConvertRect) {
-  if (!SupportsMultipleDisplays())
-    return;
-
-  UpdateDisplay("600x600,500x500");
-
-  views::Widget* primary = views::Widget::CreateWindowWithContextAndBounds(
-      NULL, CurrentContext(), gfx::Rect(10, 10, 100, 100));
-  primary->Show();
-  views::Widget* secondary = views::Widget::CreateWindowWithContextAndBounds(
-      NULL, CurrentContext(), gfx::Rect(610, 10, 100, 100));
-  secondary->Show();
-
-  EXPECT_EQ(
-      "0,0 100x100",
-      ScreenAsh::ConvertRectFromScreen(
-          primary->GetNativeView(), gfx::Rect(10, 10, 100, 100)).ToString());
-  EXPECT_EQ(
-      "10,10 100x100",
-      ScreenAsh::ConvertRectFromScreen(
-          secondary->GetNativeView(), gfx::Rect(620, 20, 100, 100)).ToString());
-
-  EXPECT_EQ(
-      "40,40 100x100",
-      ScreenAsh::ConvertRectToScreen(
-          primary->GetNativeView(), gfx::Rect(30, 30, 100, 100)).ToString());
-  EXPECT_EQ(
-      "650,50 100x100",
-      ScreenAsh::ConvertRectToScreen(
-          secondary->GetNativeView(), gfx::Rect(40, 40, 100, 100)).ToString());
-}
-
-}  // namespace test
-}  // namespace ash